Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / testing / android / native_test_launcher.cc

diff --git a/src/testing/android/native_test_launcher.cc b/src/testing/android/native_test_launcher.cc
index 300efc9..63e389a 100644 (file)
--- a/src/testing/android/native_test_launcher.cc
+++ b/src/testing/android/native_test_launcher.cc
@@ -20,13 +20,13 @@
 #include "base/at_exit.h"
 #include "base/base_switches.h"
 #include "base/command_line.h"
-#include "base/file_util.h"
 #include "base/files/file_path.h"
+#include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "gtest/gtest.h"
+#include "jni/ChromeNativeTestActivity_jni.h"
 #include "testing/android/native_test_util.h"
-#include "testing/jni/ChromeNativeTestActivity_jni.h"
 
 using testing::native_test_util::ArgsToArgv;
 using testing::native_test_util::ParseArgsFromCommandLineFile;
@@ -128,7 +128,7 @@ static void RunTests(JNIEnv* env,
   // Set the application context in base.
   base::android::ScopedJavaLocalRef<jobject> scoped_context(
       env, env->NewLocalRef(app_context));
-  base::android::InitApplicationContext(scoped_context);
+  base::android::InitApplicationContext(env, scoped_context);
   base::android::RegisterJni(env);
 
   std::vector<std::string> args;