[cronet] Fix race to call InitApplicationContext

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

Index: components/cronet/android/java/src/org/chromium/net/ChromiumUrlRequestContext.java
diff --git a/components/cronet/android/java/src/org/chromium/net/ChromiumUrlRequestContext.java b/components/cronet/android/java/src/org/chromium/net/ChromiumUrlRequestContext.java
index 474f944c7565801619c51f634207b0a2b98ddd3c..f0207ec822c77549706197060b93ad19e373af9a 100644
--- a/components/cronet/android/java/src/org/chromium/net/ChromiumUrlRequestContext.java
+++ b/components/cronet/android/java/src/org/chromium/net/ChromiumUrlRequestContext.java
@@ -31,10 +31,11 @@ public class ChromiumUrlRequestContext {
     /**
      * Constructor.
      */
-    protected ChromiumUrlRequestContext(final Context context, String userAgent,
-            String config) {
-        mChromiumUrlRequestContextAdapter = nativeCreateRequestContextAdapter(
-                context.getApplicationContext(), userAgent, getLoggingLevel(), config);
+    protected ChromiumUrlRequestContext(
+            final Context context, String userAgent, UrlRequestContextConfig config) {
+        CronetLibraryLoader.ensureInitialized(context, config);
+        mChromiumUrlRequestContextAdapter =
+                nativeCreateRequestContextAdapter(userAgent, getLoggingLevel(), config.toString());
         if (mChromiumUrlRequestContextAdapter == 0) {
             throw new NullPointerException("Context Adapter creation failed");
         }
@@ -44,12 +45,6 @@ public class ChromiumUrlRequestContext {
         // API to handle the case where we are already on main thread.
         Runnable task = new Runnable() {
             public void run() {
-                NetworkChangeNotifier.init(context);
-                // 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();
                 nativeInitRequestContextOnMainThread(
                         mChromiumUrlRequestContextAdapter);
             }
@@ -135,7 +130,7 @@ public class ChromiumUrlRequestContext {
     // Returns an instance ChromiumUrlRequestContextAdapter to be stored in
     // mChromiumUrlRequestContextAdapter.
     private native long nativeCreateRequestContextAdapter(
-            Context appContext, String userAgent, int loggingLevel, String config);
+            String userAgent, int loggingLevel, String config);

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

Can we also remove the not used appContext argument in
nativeCreateRequestContextAdapter of CronetUrlRequestContext.java ? Thanks!

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

Done.

 
     private native void nativeReleaseRequestContextAdapter(
             long chromiumUrlRequestContextAdapter);