[cronet] Fix race to call InitApplicationContext

components/cronet/android/java/src/org/chromium/net/CronetLibraryLoader.java

Index: components/cronet/android/java/src/org/chromium/net/CronetLibraryLoader.java
diff --git a/components/cronet/android/java/src/org/chromium/net/CronetLibraryLoader.java b/components/cronet/android/java/src/org/chromium/net/CronetLibraryLoader.java
index 383d94698a1bfcd151eec69c9c0295901fd7e444..2cf9b16a2d3bd83808631e418b161cbfb621577a 100644
--- a/components/cronet/android/java/src/org/chromium/net/CronetLibraryLoader.java
+++ b/components/cronet/android/java/src/org/chromium/net/CronetLibraryLoader.java
@@ -32,6 +32,7 @@ class CronetLibraryLoader {
                 return;
             }
             System.loadLibrary(config.libraryName());
+            nativeCronetInitApplicationContext(context.getApplicationContext());
             // Init native Chromium URLRequestContext on Main UI thread.
             Runnable task = new Runnable() {
                 public void run() {
@@ -62,9 +63,10 @@ class CronetLibraryLoader {
         // 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.

 }