[cronet] Fix race to call InitApplicationContext

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 14 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.
      */
     public static void ensureInitialized(
             final Context context, final UrlRequestContextConfig config) {
         synchronized (sLoadLock) {
             if (sInitTaskPosted) {
                 return;
             }
             System.loadLibrary(config.libraryName());
+            nativeCronetInitApplicationContext(context.getApplicationContext());
             // Init native Chromium URLRequestContext on Main UI thread.
             Runnable task = new Runnable() {
                 public void run() {
                     initOnMainThread(context);
                 }
             };
             // Run task immediately or post it to the UI thread.
             if (Looper.getMainLooper() == Looper.myLooper()) {
                 task.run();
             } else {
@@ skipping 10 matching lines @@
         // Registers to always receive network notifications. Note
         // that this call is fine for Cronet because Cronet
         // embedders do not have API access to create network change
         // observers. Existing observers in the net stack do not
         // perform expensive work.
         NetworkChangeNotifier.registerToReceiveNotificationsAlways();
         // registerToReceiveNotificationsAlways() is called before the native
         // NetworkChangeNotifierAndroid is created, so as to avoid receiving
         // the undesired initial network change observer notification, which
         // will cause active requests to fail with ERR_NETWORK_CHANGED.
-        nativeCronetInitOnMainThread(context.getApplicationContext());
+        nativeCronetInitOnMainThread();
     }
 
     // Native methods are implemented in cronet_loader.cc.
-    private static native void nativeCronetInitOnMainThread(Context appContext);
+    private static native void nativeCronetInitOnMainThread();
+    private static native void nativeCronetInitApplicationContext(Context appContext);

[xunjieli, 2015/03/09 18:13:21]

nit: I feel that there are too many "Cronet" in the method names. A little
redundant. How about just using nativeInitOnMainThread and
nativeInitApplicationContext ?

[pauljensen, 2015/03/09 19:04:36]

I didn't want to use InitApplicationContext as that might overlap with the real
base::android::InitApplicationContext.

[xunjieli, 2015/03/09 19:37:51]

But this two are in cronet namespace, so there won't be an overlap right?
Anyway, I am fine with not changing it.

 }