summaryrefslogtreecommitdiffstats
path: root/testing/android
diff options
context:
space:
mode:
authortorne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-11 20:29:31 +0000
committertorne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-11 20:29:31 +0000
commit69ad2d3c39d10d85f7cba748a4272fe397742e88 (patch)
treef83f237848092142d5c736ff50ba5f0bcf0cae01 /testing/android
parentb895cc531472fc5392ee3ed1414c6a95b5c4c4b8 (diff)
downloadchromium_src-69ad2d3c39d10d85f7cba748a4272fe397742e88.zip
chromium_src-69ad2d3c39d10d85f7cba748a4272fe397742e88.tar.gz
chromium_src-69ad2d3c39d10d85f7cba748a4272fe397742e88.tar.bz2
Android: Allow duplicate calls to InitApplicationContext.
Allow InitApplicationContext to be called more than once as long as the same context is passed each time. This will make it possible for AwCookieManager to make use of certain JNI functions before Chromium has been initialised without needing to keep track of whether it's already passed the application context to native or not. BUG=304813 NOTRY=true Review URL: https://codereview.chromium.org/54923002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234271 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'testing/android')
-rw-r--r--testing/android/native_test_launcher.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/testing/android/native_test_launcher.cc b/testing/android/native_test_launcher.cc
index 300efc9..50b213e 100644
--- a/testing/android/native_test_launcher.cc
+++ b/testing/android/native_test_launcher.cc
@@ -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;