Remove app context init from LibraryLoader.

net/test/android/javatests/src/org/chromium/net/test/EmbeddedTestServerImpl.java

 // Copyright 2015 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.net.test;
 
 import android.content.Context;
 import android.os.Build;
 import android.os.Handler;
 import android.os.HandlerThread;
 
+import org.chromium.base.ContextUtils;
 import org.chromium.base.Log;
 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.ProcessInitException;
 import org.chromium.base.test.util.UrlUtils;
 
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
@@ skipping 15 matching lines @@
     private Handler mHandler;
     private HandlerThread mHandlerThread;
     private long mNativeEmbeddedTestServer;
 
     /** Create an uninitialized EmbeddedTestServer. */
     public EmbeddedTestServerImpl(Context context) {
         mContext = context;
     }
 
     private <V> V runOnHandlerThread(Callable<V> c) {
-        FutureTask<V> t = new FutureTask<V>(c);
+        FutureTask<V> t = new FutureTask<>(c);
         mHandler.post(t);
         try {
             return t.get();
         } catch (ExecutionException e) {
             Log.e(TAG, "Exception raised from native EmbeddedTestServer", e);
         } catch (InterruptedException e) {
             Log.e(TAG, "Interrupted while waiting for native EmbeddedTestServer", e);
         }
         return null;
     }
 
     /** Initialize the native EmbeddedTestServer object.
      *
      *  @return Whether the native object was successfully initialized.
      */
     @Override
     public boolean initializeNative() {
+        // This is necessary as EmbeddedTestServerImpl is in a different process than the tests
+        // using it, so it needs to initialize its own application context.
+        ContextUtils.initApplicationContext(mContext.getApplicationContext());
         try {
-            LibraryLoader libraryLoader = LibraryLoader.get(LibraryProcessType.PROCESS_BROWSER);
-            libraryLoader.ensureInitialized(mContext);
+            LibraryLoader.get(LibraryProcessType.PROCESS_BROWSER).ensureInitialized();
         } catch (ProcessInitException e) {
             Log.e(TAG, "Failed to load native libraries.", e);
             return false;
         }
 
         mHandlerThread = new HandlerThread("EmbeddedTestServer" + sCount.getAndIncrement());
         mHandlerThread.start();
         mHandler = new Handler(mHandlerThread.getLooper());
 
         runOnHandlerThread(new Callable<Void>() {
@@ skipping 131 matching lines @@
     private native void nativeInit(String testDataDir);
     private native void nativeDestroy(long nativeEmbeddedTestServerAndroid);
     private native boolean nativeStart(long nativeEmbeddedTestServerAndroid);
     private native boolean nativeShutdownAndWaitUntilComplete(long nativeEmbeddedTestServerAndroid);
     private native String nativeGetURL(long nativeEmbeddedTestServerAndroid, String relativeUrl);
     private native void nativeAddDefaultHandlers(
             long nativeEmbeddedTestServerAndroid, String directoryPath);
     private native void nativeServeFilesFromDirectory(
             long nativeEmbeddedTestServerAndroid, String directoryPath);
 }