[cronet] Fix race to call InitApplicationContext

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

 // Copyright 2014 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;
 import android.os.Process;
@@ skipping 13 matching lines @@
     static final String LOG_TAG = "ChromiumNetwork";
 
     /**
      * Native adapter object, owned by ChromiumUrlRequestContext.
      */
     private long mChromiumUrlRequestContextAdapter;
 
     /**
      * 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");
         }
         // Post a task to UI thread to init native Chromium URLRequestContext.
         // TODO(xunjieli): This constructor is not supposed to be invoked on
         // the main thread. Consider making the following code into a blocking
         // 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);
             }
         };
         new Handler(Looper.getMainLooper()).post(task);
     }
 
     /**
      * Returns the version of this network stack formatted as N.N.N.N/X where
      * N.N.N.N is the version of Chromium and X is the revision number.
@@ skipping 65 matching lines @@
             loggingLevel = LOG_DEBUG;
         } else {
             loggingLevel = LOG_NONE;
         }
         return loggingLevel;
     }
 
     // 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);
 
     private native void nativeReleaseRequestContextAdapter(
             long chromiumUrlRequestContextAdapter);
 
     private native void nativeInitializeStatistics();
 
     private native String nativeGetStatisticsJSON(String filter);
 
     private native void nativeStartNetLogToFile(
             long chromiumUrlRequestContextAdapter, String fileName);
 
     private native void nativeStopNetLog(long chromiumUrlRequestContextAdapter);
 
     private native void nativeInitRequestContextOnMainThread(
             long chromiumUrlRequestContextAdapter);
 }