[cronet] Fix race to call InitApplicationContext

components/cronet/android/cronet_library_loader.cc

 // 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.
 
 #include "components/cronet/android/cronet_library_loader.h"
 
 #include <jni.h>
 
 #include "base/android/base_jni_registrar.h"
 #include "base/android/jni_android.h"
@@ skipping 69 matching lines @@
   return JNI_VERSION_1_6;
 }
 
 void CronetOnUnLoad(JavaVM* jvm, void* reserved) {
   if (g_at_exit_manager) {
     delete g_at_exit_manager;
     g_at_exit_manager = NULL;
   }
 }
 
-void CronetInitOnMainThread(JNIEnv* env, jclass jcaller, jobject japp_context) {
+void CronetInitApplicationContext(JNIEnv* env,
+                                  jclass jcaller,
+                                  jobject japp_context) {
   // Set application context.
   base::android::ScopedJavaLocalRef<jobject> scoped_app_context(env,
                                                                 japp_context);
   base::android::InitApplicationContext(env, scoped_app_context);
+}
 
+void CronetInitOnMainThread(JNIEnv* env, jclass jcaller) {
 #if !defined(USE_ICU_ALTERNATIVES_ON_ANDROID)
   base::i18n::InitializeICU();

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

Should we move this to CronetOnLoad and maybe after url::Initialize() ? I am not
sure if this has to be on the main thread.

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

How about in another CL?  This seems orthogonal to the race condition goal this
CL is trying to address.

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

SGTM

 #endif
 
   DCHECK(!base::MessageLoop::current());
   DCHECK(!g_main_message_loop);
   g_main_message_loop = new base::MessageLoopForUI();
   base::MessageLoopForUI::current()->Start();
   DCHECK(!g_network_change_notifier);
   net::NetworkChangeNotifier::SetFactory(
       new net::NetworkChangeNotifierFactoryAndroid());
   g_network_change_notifier = net::NetworkChangeNotifier::Create();
 }
 
 }  // namespace cronet