Reland 2 of Unify application context usage.

components/cronet/android/java/src/org/chromium/net/CronetLibraryLoader.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;
 
 import android.content.Context;
 import android.os.Handler;
 import android.os.Looper;
 
@@ skipping 17 matching lines @@
     /**
      * Ensure that native library is loaded and initialized. Can be called from
      * any thread, the load and initialization is performed on main thread.
      */
     static void ensureInitialized(final Context context, final CronetEngine.Builder builder) {
         synchronized (sLoadLock) {
             if (sInitStarted) {
                 return;
             }
             sInitStarted = true;
+            ContextUtils.initApplicationContext(context.getApplicationContext());
             builder.loadLibrary();
+            ContextUtils.initApplicationContextForNative();
             if (!Version.CRONET_VERSION.equals(nativeGetCronetVersion())) {
                 throw new RuntimeException(String.format(
                       "Expected Cronet version number %s, "
                               + "actual version number %s.",
                       Version.CRONET_VERSION,
                       nativeGetCronetVersion()));
             }
             Log.i(TAG, "Cronet version: %s, arch: %s",
                     Version.CRONET_VERSION, System.getProperty("os.arch"));
-            ContextUtils.initApplicationContext(context.getApplicationContext());
             // Init native Chromium CronetEngine on Main UI thread.
             Runnable task = new Runnable() {
+                @Override
                 public void run() {
                     ensureInitializedOnMainThread(context);
                 }
             };
             // Run task immediately or post it to the UI thread.
             if (Looper.getMainLooper() == Looper.myLooper()) {
                 task.run();
             } else {
                 // The initOnMainThread will complete on the main thread prior
                 // to other tasks posted to the main thread.
@@ skipping 25 matching lines @@
         // the undesired initial network change observer notification, which
         // will cause active requests to fail with ERR_NETWORK_CHANGED.
         nativeCronetInitOnMainThread();
         sMainThreadInitDone = true;
     }
 
     // Native methods are implemented in cronet_library_loader.cc.
     private static native void nativeCronetInitOnMainThread();
     private static native String nativeGetCronetVersion();
 }