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

components/cronet/android/cronet_loader.cc

Index: components/cronet/android/cronet_loader.cc
diff --git a/components/cronet/android/cronet_loader.cc b/components/cronet/android/cronet_loader.cc
index 3929b6cb516af3639a92de51f03f51aabe0fdc02..cb3a8af1922deff092992462fd56b72731abca6c 100644
--- a/components/cronet/android/cronet_loader.cc
+++ b/components/cronet/android/cronet_loader.cc
@@ -2,16 +2,23 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <jni.h>
+
 #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/logging.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"
 
@@ -24,16 +31,22 @@ namespace {
 
 const base::android::RegistrationMethod kCronetRegisteredMethods[] = {
     {"BaseAndroid", base::android::RegisterJni},
-    {"ChromiumUrlRequest", cronet::ChromiumUrlRequestRegisterJni},
-    {"ChromiumUrlRequestContext", cronet::ChromiumUrlRequestContextRegisterJni},
-    {"CronetUrlRequest", cronet::CronetUrlRequestRegisterJni},
-    {"CronetUrlRequestContext", cronet::CronetUrlRequestContextRegisterJni},
-    {"HistogramManager", cronet::HistogramManagerRegisterJni},
+    {"ChromiumUrlRequest", ChromiumUrlRequestRegisterJni},
+    {"ChromiumUrlRequestContext", ChromiumUrlRequestContextRegisterJni},
+    {"CronetLibraryLoader", RegisterNativesImpl},
+    {"CronetUrlRequest", CronetUrlRequestRegisterJni},
+    {"CronetUrlRequestContext", CronetUrlRequestContextRegisterJni},
+    {"HistogramManager", 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;

[pauljensen, 2015/02/04 14:33:20]

g_network_change_notifier is redundant,
NetworkChangeNotifier::NetworkChangeNotifier() already does this DCHECK:
https://code.google.com/p/chromium/codesearch#chromium/src/net/base/network_c...

[mmenke, 2015/02/04 16:18:25]

I prefer to keep g_network_change_notifier here, myself, to make it clearer
we're leaking the NCN.

Don't have strong feelings about it, though.

[mef, 2015/02/04 17:35:00]

The comment to NCN::Create
https://code.google.com/p/chromium/codesearch#chromium/src/net/base/network_c...
says that 'caller owns the returned pointer', so I guess formally we should hold
on to it.

 
 }  // namespace
 
@@ -53,10 +66,6 @@ jint CronetOnLoad(JavaVM* vm, void* reserved) {
 
   g_at_exit_manager = new base::AtExitManager();
 
-#if !defined(USE_ICU_ALTERNATIVES_ON_ANDROID)
-  base::i18n::InitializeICU();
-#endif
-
   url::Initialize();
 
   return JNI_VERSION_1_6;
@@ -69,4 +78,25 @@ void CronetOnUnLoad(JavaVM* jvm, void* reserved) {
   }
 }
 
+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();
+#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();
+
+  return 0;
+}
+
 }  // namespace cronet