| Index: components/cronet/android/cronet_library_loader.cc
|
| diff --git a/components/cronet/android/cronet_library_loader.cc b/components/cronet/android/cronet_library_loader.cc
|
| index 6d4d11730c8c0cd7adb5e4f8711007a5841d9e15..a04ddc858e1fefb4ec4adadf3725c252d74745f2 100644
|
| --- a/components/cronet/android/cronet_library_loader.cc
|
| +++ b/components/cronet/android/cronet_library_loader.cc
|
| @@ -22,6 +22,7 @@
|
| #include "components/cronet/android/cronet_upload_data_stream_adapter.h"
|
| #include "components/cronet/android/cronet_url_request_adapter.h"
|
| #include "components/cronet/android/cronet_url_request_context_adapter.h"
|
| +#include "components/cronet/android/network_change_notifier_initer.h"
|
| #include "components/cronet/version.h"
|
| #include "jni/CronetLibraryLoader_jni.h"
|
| #include "net/android/net_jni_registrar.h"
|
| @@ -50,14 +51,13 @@ const base::android::RegistrationMethod kCronetRegisteredMethods[] = {
|
| {"CronetUrlRequestContextAdapter",
|
| CronetUrlRequestContextAdapterRegisterJni},
|
| {"NetAndroid", net::android::RegisterJni},
|
| + {"NetworkChangeNotifierIniter", NetworkChangeNotifierIniterRegisterJni},
|
| };
|
|
|
| // 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;
|
| -
|
| bool RegisterJNI(JNIEnv* env) {
|
| return base::android::RegisterNativeMethods(
|
| env, kCronetRegisteredMethods, arraysize(kCronetRegisteredMethods));
|
| @@ -100,10 +100,6 @@ void CronetInitOnMainThread(JNIEnv* env, const JavaParamRef<jclass>& jcaller) {
|
| 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();
|
| }
|
|
|
| ScopedJavaLocalRef<jstring> GetCronetVersion(
|
|
|