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}

2 files changed, 5 insertions, 6 deletions

diff --git a/blimp/client/android/blimp_library_loader.cc b/blimp/client/android/blimp_library_loader.cc
index 495d9d1..9668850 100644
--- a/blimp/client/android/blimp_library_loader.cc
+++ b/blimp/client/android/blimp_library_loader.cc
@@ -60,10 +60,7 @@ bool RegisterJni(JNIEnv* env) {
 namespace blimp {
 
 static jboolean InitializeBlimp(JNIEnv* env,
-                                const JavaParamRef<jclass>& clazz,
-                                const JavaParamRef<jobject>& jcontext) {
-  base::android::InitApplicationContext(env, jcontext);
-
+                                const JavaParamRef<jclass>& clazz) {
   // TODO(dtrainor): Start the runner?
   return true;
 }
diff --git a/blimp/client/android/java/src/org/chromium/blimp/BlimpLibraryLoader.java b/blimp/client/android/java/src/org/chromium/blimp/BlimpLibraryLoader.java
index 7166e2b..7d6f22a 100644
--- a/blimp/client/android/java/src/org/chromium/blimp/BlimpLibraryLoader.java
+++ b/blimp/client/android/java/src/org/chromium/blimp/BlimpLibraryLoader.java
@@ -7,6 +7,7 @@ package org.chromium.blimp;
 import android.content.Context;
 import android.os.Handler;
 
+import org.chromium.base.ContextUtils;
 import org.chromium.base.ObserverList;
 import org.chromium.base.ResourceExtractor;
 import org.chromium.base.ThreadUtils;
@@ -90,7 +91,8 @@ public final class BlimpLibraryLoader {
         extractor.addCompletionCallback(new Runnable() {
             @Override
             public void run() {
-                final boolean initResult = nativeInitializeBlimp(context.getApplicationContext());
+                ContextUtils.initApplicationContext(context.getApplicationContext());
+                final boolean initResult = nativeInitializeBlimp();
                 new Handler().post(new Runnable() {
                     @Override
                     public void run() {
@@ -126,6 +128,6 @@ public final class BlimpLibraryLoader {
     }
 
     // Native methods.
-    private static native boolean nativeInitializeBlimp(Context context);
+    private static native boolean nativeInitializeBlimp();
     private static native boolean nativeStartBlimp();
 }