From 961a488f6a5d8c82b576444054f5d26b3f8a6877 Mon Sep 17 00:00:00 2001
From: torne <torne@chromium.org>
Date: Tue, 24 Nov 2015 02:30:58 -0800
Subject: Define a Java-side global application context.

Instead of each user of base setting the native-side global app context
separately, introduce a Java-side global app context, which is always
in sync with the native-side one. Switch most callers to setting
it on the Java side, except where this is problematic.

Callers of ApplicationStatus.getApplicationContext will be updated
incrementally in followup CLs once it's been verified that they only
require a Context and not a BaseChromiumApplication.

BUG=552419

Review URL: https://codereview.chromium.org/1407233017

Cr-Commit-Position: refs/heads/master@{#361306}
---
 mojo/android/javatests/mojo_test_case.cc                       | 5 +----
 mojo/android/javatests/src/org/chromium/mojo/MojoTestCase.java | 7 ++++---
 2 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'mojo/android')

diff --git a/mojo/android/javatests/mojo_test_case.cc b/mojo/android/javatests/mojo_test_case.cc
index 22a08ff..631cf976 100644
--- a/mojo/android/javatests/mojo_test_case.cc
+++ b/mojo/android/javatests/mojo_test_case.cc
@@ -30,10 +30,7 @@ struct TestEnvironment {
 namespace mojo {
 namespace android {
 
-static void InitApplicationContext(JNIEnv* env,
-                                   const JavaParamRef<jobject>& jcaller,
-                                   const JavaParamRef<jobject>& context) {
-  base::android::InitApplicationContext(env, context);
+static void Init(JNIEnv* env, const JavaParamRef<jobject>& jcaller) {
   base::InitAndroidTestMessageLoop();
 }
 
diff --git a/mojo/android/javatests/src/org/chromium/mojo/MojoTestCase.java b/mojo/android/javatests/src/org/chromium/mojo/MojoTestCase.java
index 4e96de2..3e81b7a 100644
--- a/mojo/android/javatests/src/org/chromium/mojo/MojoTestCase.java
+++ b/mojo/android/javatests/src/org/chromium/mojo/MojoTestCase.java
@@ -4,9 +4,9 @@
 
 package org.chromium.mojo;
 
-import android.content.Context;
 import android.test.InstrumentationTestCase;
 
+import org.chromium.base.ContextUtils;
 import org.chromium.base.annotations.JNINamespace;
 import org.chromium.base.library_loader.LibraryLoader;
 import org.chromium.base.library_loader.LibraryProcessType;
@@ -27,7 +27,8 @@ public class MojoTestCase extends InstrumentationTestCase {
         super.setUp();
         LibraryLoader.get(LibraryProcessType.PROCESS_BROWSER)
                 .ensureInitialized(getInstrumentation().getTargetContext());
-        nativeInitApplicationContext(getInstrumentation().getTargetContext());
+        ContextUtils.initApplicationContext(getInstrumentation().getTargetContext());
+        nativeInit();
         mTestEnvironmentPointer = nativeSetupTestEnvironment();
     }
 
@@ -54,7 +55,7 @@ public class MojoTestCase extends InstrumentationTestCase {
         nativeRunLoop(0);
     }
 
-    private native void nativeInitApplicationContext(Context context);
+    private native void nativeInit();
 
     private native long nativeSetupTestEnvironment();
 
-- 
cgit v1.1