Remove app context init from LibraryLoader.

content/public/android/java/src/org/chromium/content/browser/BrowserStartupController.java

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.content.browser;
 
 import android.content.Context;
 import android.os.Handler;
 import android.os.StrictMode;
 
+import org.chromium.base.ContextUtils;
 import org.chromium.base.Log;
 import org.chromium.base.ResourceExtractor;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
 import org.chromium.base.library_loader.LibraryLoader;
 import org.chromium.base.library_loader.LibraryProcessType;
 import org.chromium.base.library_loader.LoaderErrors;
 import org.chromium.base.library_loader.ProcessInitException;
@@ skipping 90 matching lines @@
 
     // This field is set after startup has been completed based on whether the startup was a success
     // or not. It is used when later requests to startup come in that happen after the initial set
     // of enqueued callbacks have been executed.
     private boolean mStartupSuccess;
 
     private int mLibraryProcessType;
 
     BrowserStartupController(Context context, int libraryProcessType) {
         mContext = context.getApplicationContext();
-        mAsyncStartupCallbacks = new ArrayList<StartupCallback>();
+        mAsyncStartupCallbacks = new ArrayList<>();
         mLibraryProcessType = libraryProcessType;
     }
 
     /**
      * Get BrowserStartupController instance, create a new one if no existing.
      *
      * @param context the application context.
      * @param libraryProcessType the type of process the shared library is loaded. it must be
      *                           LibraryProcessType.PROCESS_BROWSER or
      *                           LibraryProcessType.PROCESS_WEBVIEW.
@@ skipping 148 matching lines @@
             }
         });
     }
 
     @VisibleForTesting
     void prepareToStartBrowserProcess(
             final boolean singleProcess, final Runnable completionCallback)
                     throws ProcessInitException {
         Log.i(TAG, "Initializing chromium process, singleProcess=%b", singleProcess);
 
+        ContextUtils.initApplicationContext(mContext.getApplicationContext());

[Ted C, 2016/09/21 18:36:51]

Why is this needed?  With this here, isn't chrome calling initApplicationContext
multiple times.

And now thinking about it, isn't the change in ChildProcessServiceImpl.java also
resulting in chrome calling it multiple times.  Is this for webview since they
don't have an Application to initialize it?  Everything but ContentProviders
should have this set for them by default in the Application creation time.

Should we just move up ContextUtils#initApplicationContext to
BaseChromiumApplication?

It would really be nice to just have two calls to initApplicationContext, one
for webview and one for things where we can control the application.  But in the
multi-process webview case, do we have a hook to initialize the renderer's app
context early enough?

[Torne, 2016/09/26 09:21:35]

We want to get rid of BaseChromiumApplication entirely. It's caused a lot of
code to get introduced in base and content that doesn't work for WebView. Only
things in the chrome layer should be assuming they have a custom Application
subclass.

[Peter Wen, 2016/09/28 15:55:16]

Right, this should not be necessary here.

+
         // Normally Main.java will have kicked this off asynchronously for Chrome. But other
         // ContentView apps like tests also need them so we make sure we've extracted resources
         // here. We can still make it a little async (wait until the library is loaded).
         ResourceExtractor resourceExtractor = ResourceExtractor.get(mContext);
         resourceExtractor.startExtractingResources();
 
         // This strictmode exception is to cover the case where the browser process is being started
         // asynchronously but not in the main browser flow.  The main browser flow will trigger
         // library loading earlier and this will be a no-op, but in the other cases this will need
         // to block on loading libraries.
         // This applies to tests and ManageSpaceActivity, which can be launched from Settings.
         StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskReads();
         try {
             // Normally Main.java will have already loaded the library asynchronously, we only need
             // to load it here if we arrived via another flow, e.g. bookmark access & sync setup.
-            LibraryLoader.get(mLibraryProcessType).ensureInitialized(mContext);
+            LibraryLoader.get(mLibraryProcessType).ensureInitialized();
         } finally {
             StrictMode.setThreadPolicy(oldPolicy);
         }
 
         Runnable postResourceExtraction = new Runnable() {
             @Override
             public void run() {
                 if (!mPostResourceExtractionTasksCompleted) {
                     // TODO(yfriedman): Remove dependency on a command line flag for this.
                     DeviceUtils.addDeviceSpecificUserAgentSwitch(mContext);
@@ skipping 32 matching lines @@
 
     private static native void nativeSetCommandLineFlags(
             boolean singleProcess, String pluginDescriptor);
 
     // Is this an official build of Chrome? Only native code knows for sure. Official build
     // knowledge is needed very early in process startup.
     private static native boolean nativeIsOfficialBuild();
 
     private static native boolean nativeIsPluginEnabled();
 }