[Cronet] Hook up library loader, system proxy and network change notifier to async api.

components/cronet/android/cronet_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 "base/android/base_jni_registrar.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_registrar.h"
 #include "base/at_exit.h"
+#include "base/message_loop/message_loop.h"
 #include "components/cronet/android/chromium_url_request.h"
 #include "components/cronet/android/chromium_url_request_context.h"
 #include "components/cronet/android/cronet_url_request.h"
 #include "components/cronet/android/cronet_url_request_context.h"
 #include "components/cronet/android/histogram_manager.h"
+#include "jni/CronetLibraryLoader_jni.h"
 #include "net/android/net_jni_registrar.h"
+#include "net/android/network_change_notifier_factory_android.h"
+#include "net/base/network_change_notifier.h"
 #include "url/android/url_jni_registrar.h"
 #include "url/url_util.h"
 
 #if !defined(USE_ICU_ALTERNATIVES_ON_ANDROID)
 #include "base/i18n/icu_util.h"
 #endif
 
 namespace cronet {
 namespace {
 
 const base::android::RegistrationMethod kCronetRegisteredMethods[] = {
     {"BaseAndroid", base::android::RegisterJni},
     {"ChromiumUrlRequest", cronet::ChromiumUrlRequestRegisterJni},

[mmenke, 2015/01/23 20:41:41]

We're in the cronet namespace.  All of these cronet::'s aren't needed, including
the new one.

[mef, 2015/01/28 21:32:27]

Done.

     {"ChromiumUrlRequestContext", cronet::ChromiumUrlRequestContextRegisterJni},
+    {"CronetLibraryLoader", cronet::RegisterNativesImpl},
     {"CronetUrlRequest", cronet::CronetUrlRequestRegisterJni},
     {"CronetUrlRequestContext", cronet::CronetUrlRequestContextRegisterJni},
     {"HistogramManager", cronet::HistogramManagerRegisterJni},
     {"NetAndroid", net::android::RegisterJni},
     {"UrlAndroid", url::android::RegisterJni},
 };
 
 base::AtExitManager* g_at_exit_manager = NULL;
+// MessageLoop on the main thread, which is where objects that receive Java
+// notifications generally live.
+base::MessageLoop* g_main_message_loop = nullptr;
+
+net::NetworkChangeNotifier* g_network_change_notifier = nullptr;
 
 }  // namespace
 
 // Checks the available version of JNI. Also, caches Java reflection artifacts.
 jint CronetOnLoad(JavaVM* vm, void* reserved) {
   JNIEnv* env;
   if (vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6) != JNI_OK) {
     return -1;
   }
 
@@ skipping 15 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;
   }
 }
 
+jlong CronetInitOnMainThread(JNIEnv* env, jclass jcaller, jobject jcontext) {
+  // Set application context.
+  base::android::ScopedJavaLocalRef<jobject> scoped_context(env, jcontext);
+  base::android::InitApplicationContext(env, scoped_context);
+#if !defined(USE_ICU_ALTERNATIVES_ON_ANDROID)
+  base::i18n::InitializeICU();

[mmenke, 2015/01/23 20:41:41]

I don't think we need to initialize this both here and in onload.

[mef, 2015/01/28 21:32:27]

Done.

[mef, 2015/01/28 22:30:57]

It turns out that initializing it here instead of OnLoad fixes the crash on
startup observed in regular Android builds due to InitializeICU expecting
initialized application context, so I've removed it from CronetOnLoad instead.

+#endif
+
+  if (!base::MessageLoop::current()) {

[mmenke, 2015/01/23 20:41:41]

Is there any case where this will have been initialized?

[mef, 2015/01/28 21:32:27]

I can't think of any reason to call this method twice. Done.

+    DCHECK(!g_main_message_loop);
+    g_main_message_loop = new base::MessageLoopForUI();
+    base::MessageLoopForUI::current()->Start();
+  }
+  DCHECK_EQ(g_main_message_loop, base::MessageLoop::current());
+  if (!g_network_change_notifier) {
+    net::NetworkChangeNotifier::SetFactory(
+        new net::NetworkChangeNotifierFactoryAndroid());
+    g_network_change_notifier = net::NetworkChangeNotifier::Create();
+  }
+
+  return 0;
+}
+
 }  // namespace cronet