Remove app context init from LibraryLoader.

content/public/android/javatests/src/org/chromium/content/browser/InterfaceRegistryTest.java

 // Copyright 2014 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.test.suitebuilder.annotation.SmallTest;
 
+import org.chromium.base.ContextUtils;
 import org.chromium.base.library_loader.LibraryLoader;
 import org.chromium.base.library_loader.LibraryProcessType;
 import org.chromium.base.test.util.DisabledTest;
 import org.chromium.base.test.util.RetryOnFailure;
 import org.chromium.content.browser.InterfaceRegistry.ImplementationFactory;
 import org.chromium.content_shell.ShellMojoTestUtils;
 import org.chromium.content_shell_apk.ContentShellTestBase;
 import org.chromium.mojo.bindings.ConnectionErrorHandler;
 import org.chromium.mojo.bindings.InterfaceRequest;
 import org.chromium.mojo.bindings.test.mojom.math.Calculator;
 import org.chromium.mojo.system.MojoException;
 import org.chromium.mojo.system.Pair;
 import org.chromium.mojo.system.impl.CoreImpl;
 
 import java.io.Closeable;
 import java.util.ArrayList;
 import java.util.List;
 
 /**
  * Instrumentation tests for InterfaceRegistry.
  */
 public class InterfaceRegistryTest extends ContentShellTestBase {
 
     private static final long RUN_LOOP_TIMEOUT_MS = 25;
 
-    private final List<Closeable> mCloseablesToClose = new ArrayList<Closeable>();
+    private final List<Closeable> mCloseablesToClose = new ArrayList<>();
     private long mNativeTestEnvironment;
 
     static class CalcConnectionErrorHandler implements ConnectionErrorHandler {
 
         MojoException mLastMojoException;
 
         @Override
         public void onConnectionError(MojoException e) {
             mLastMojoException = e;
         }
@@ skipping 47 matching lines @@
         @Override
         public Calculator createImpl() {
             return new CalculatorImpl();
         }
     }
 
 
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        LibraryLoader.get(LibraryProcessType.PROCESS_BROWSER).ensureInitialized(
-                getInstrumentation().getTargetContext());
+        ContextUtils.initApplicationContext(
+                getInstrumentation().getTargetContext().getApplicationContext());
+        LibraryLoader.get(LibraryProcessType.PROCESS_BROWSER).ensureInitialized();
         launchContentShellWithUrl("about://blank");
         mNativeTestEnvironment = ShellMojoTestUtils.setupTestEnvironment();
     }
 
     @Override
     protected void tearDown() throws Exception {
         for (Closeable c : mCloseablesToClose) {
             c.close();
         }
         ShellMojoTestUtils.tearDownTestEnvironment(mNativeTestEnvironment);
@@ skipping 85 matching lines @@
         calculator.getProxyHandler().setErrorHandler(errorHandler);
         mCloseablesToClose.add(calculator);
         provider.getInterface(Calculator.MANAGER, requestPair.second);
 
         // Spin the message loop and verify that an error occured.
         assertNull(errorHandler.mLastMojoException);
         ShellMojoTestUtils.runLoop(RUN_LOOP_TIMEOUT_MS);
         assertNotNull(errorHandler.mLastMojoException);
     }
 }