Remove app context init from LibraryLoader.

content/public/android/java/src/org/chromium/content/app/ChildProcessServiceImpl.java

 // Copyright 2016 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.app;
 
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.SurfaceTexture;
 import android.os.Binder;
@@ skipping 47 matching lines @@
     private String[] mCommandLineParams;
     private int mCpuCount;
     private long mCpuFeatures;
     // File descriptors that should be registered natively.
     private FileDescriptorInfo[] mFdInfos;
     // Linker-specific parameters for this child process service.
     private ChromiumLinkerParams mLinkerParams;
     // Child library process type.
     private int mLibraryProcessType;
 
-    private static AtomicReference<Context> sContext = new AtomicReference<Context>(null);
+    private static AtomicReference<Context> sContext = new AtomicReference<>(null);
     private boolean mLibraryInitialized = false;
     // Becomes true once the service is bound. Access must synchronize around mMainThread.
     private boolean mIsBound = false;
 
     /**
      * If >= 0 enables "validation of caller of {@link mBinder}'s methods". A RemoteException
      * is thrown when an application with a uid other than {@link mAuthorizedCallerUid} calls
      * {@link mBinder}'s methods.
      */
     private int mAuthorizedCallerUid;
@@ skipping 45 matching lines @@
     // The ClassLoader for the host browser context.
     private ClassLoader mHostClassLoader;
 
     /* package */ static Context getContext() {
         return sContext.get();
     }
 
     /**
      * Loads Chrome's native libraries and initializes a ChildProcessServiceImpl.
      * @param context The application context.
-     * @param hostBrowserContext The context of the host browser (i.e. Chrome).
+     * @param hostContext The context of the host browser (i.e. Chrome).

[Ted C, 2016/09/28 17:27:46]

I would drop browser from the comment as well.

I think this would be fine to say:

The host context the library should be loaded with.

[Peter Wen, 2016/09/29 18:41:38]

Done.

      */
-    public void create(final Context context, final Context hostBrowserContext) {
-        mHostClassLoader = hostBrowserContext.getClassLoader();
+    public void create(final Context context, final Context hostContext) {
+        mHostClassLoader = hostContext.getClassLoader();
         Log.i(TAG, "Creating new ChildProcessService pid=%d", Process.myPid());
         if (sContext.get() != null) {
             throw new RuntimeException("Illegal child process reuse.");
         }
         sContext.set(context);
 
         // Initialize the context for the application that owns this ChildProcessServiceImpl object.
         ContextUtils.initApplicationContext(context);
 
         mMainThread = new Thread(new Runnable() {
@@ skipping 26 matching lines @@
                         }
                     }
                     boolean isLoaded = false;
                     if (CommandLine.getInstance().hasSwitch(
                             BaseSwitches.RENDERER_WAIT_FOR_JAVA_DEBUGGER)) {
                         android.os.Debug.waitForDebugger();
                     }
 
                     boolean loadAtFixedAddressFailed = false;
                     try {
-                        LibraryLoader.get(mLibraryProcessType).loadNow(hostBrowserContext);
+                        LibraryLoader.get(mLibraryProcessType)
+                                .loadNowOverrideApplicationContext(hostContext);
                         isLoaded = true;
                     } catch (ProcessInitException e) {
                         if (requestedSharedRelro) {
                             Log.w(TAG, "Failed to load native library with shared RELRO, "
                                     + "retrying without");
                             loadAtFixedAddressFailed = true;
                         } else {
                             Log.e(TAG, "Failed to load native library", e);
                         }
                     }
                     if (!isLoaded && requestedSharedRelro) {
                         linker.disableSharedRelros();
                         try {
-                            LibraryLoader.get(mLibraryProcessType).loadNow(hostBrowserContext);
+                            LibraryLoader.get(mLibraryProcessType)
+                                    .loadNowOverrideApplicationContext(hostContext);
                             isLoaded = true;
                         } catch (ProcessInitException e) {
                             Log.e(TAG, "Failed to load native library on retry", e);
                         }
                     }
                     if (!isLoaded) {
                         System.exit(-1);
                     }
                     LibraryLoader.get(mLibraryProcessType)
                             .registerRendererProcessHistogram(requestedSharedRelro,
@@ skipping 263 matching lines @@
     private static native void nativeInitChildProcessImpl(
             ChildProcessServiceImpl serviceImpl, int cpuCount, long cpuFeatures);
 
     /**
      * Force the child process to exit.
      */
     private static native void nativeExitChildProcess();
 
     private native void nativeShutdownMainThread();
 }