Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1084)

Side by Side Diff: components/cronet/android/cronet_loader.cc

Issue 726013002: [Cronet] Hook up library loader, system proxy and network change notifier to async api. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix unit tests. Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <jni.h>
6
5 #include "base/android/base_jni_registrar.h" 7 #include "base/android/base_jni_registrar.h"
6 #include "base/android/jni_android.h" 8 #include "base/android/jni_android.h"
7 #include "base/android/jni_registrar.h" 9 #include "base/android/jni_registrar.h"
8 #include "base/at_exit.h" 10 #include "base/at_exit.h"
11 #include "base/logging.h"
12 #include "base/message_loop/message_loop.h"
9 #include "components/cronet/android/chromium_url_request.h" 13 #include "components/cronet/android/chromium_url_request.h"
10 #include "components/cronet/android/chromium_url_request_context.h" 14 #include "components/cronet/android/chromium_url_request_context.h"
11 #include "components/cronet/android/cronet_url_request.h" 15 #include "components/cronet/android/cronet_url_request.h"
12 #include "components/cronet/android/cronet_url_request_context.h" 16 #include "components/cronet/android/cronet_url_request_context.h"
13 #include "components/cronet/android/histogram_manager.h" 17 #include "components/cronet/android/histogram_manager.h"
18 #include "jni/CronetLibraryLoader_jni.h"
14 #include "net/android/net_jni_registrar.h" 19 #include "net/android/net_jni_registrar.h"
20 #include "net/android/network_change_notifier_factory_android.h"
21 #include "net/base/network_change_notifier.h"
15 #include "url/android/url_jni_registrar.h" 22 #include "url/android/url_jni_registrar.h"
16 #include "url/url_util.h" 23 #include "url/url_util.h"
17 24
18 #if !defined(USE_ICU_ALTERNATIVES_ON_ANDROID) 25 #if !defined(USE_ICU_ALTERNATIVES_ON_ANDROID)
19 #include "base/i18n/icu_util.h" 26 #include "base/i18n/icu_util.h"
20 #endif 27 #endif
21 28
22 namespace cronet { 29 namespace cronet {
23 namespace { 30 namespace {
24 31
25 const base::android::RegistrationMethod kCronetRegisteredMethods[] = { 32 const base::android::RegistrationMethod kCronetRegisteredMethods[] = {
26 {"BaseAndroid", base::android::RegisterJni}, 33 {"BaseAndroid", base::android::RegisterJni},
27 {"ChromiumUrlRequest", cronet::ChromiumUrlRequestRegisterJni}, 34 {"ChromiumUrlRequest", ChromiumUrlRequestRegisterJni},
28 {"ChromiumUrlRequestContext", cronet::ChromiumUrlRequestContextRegisterJni}, 35 {"ChromiumUrlRequestContext", ChromiumUrlRequestContextRegisterJni},
29 {"CronetUrlRequest", cronet::CronetUrlRequestRegisterJni}, 36 {"CronetLibraryLoader", RegisterNativesImpl},
30 {"CronetUrlRequestContext", cronet::CronetUrlRequestContextRegisterJni}, 37 {"CronetUrlRequest", CronetUrlRequestRegisterJni},
31 {"HistogramManager", cronet::HistogramManagerRegisterJni}, 38 {"CronetUrlRequestContext", CronetUrlRequestContextRegisterJni},
39 {"HistogramManager", HistogramManagerRegisterJni},
32 {"NetAndroid", net::android::RegisterJni}, 40 {"NetAndroid", net::android::RegisterJni},
33 {"UrlAndroid", url::android::RegisterJni}, 41 {"UrlAndroid", url::android::RegisterJni},
34 }; 42 };
35 43
36 base::AtExitManager* g_at_exit_manager = NULL; 44 base::AtExitManager* g_at_exit_manager = NULL;
45 // MessageLoop on the main thread, which is where objects that receive Java
46 // notifications generally live.
47 base::MessageLoop* g_main_message_loop = nullptr;
48
49 net::NetworkChangeNotifier* g_network_change_notifier = nullptr;
37 50
38 } // namespace 51 } // namespace
39 52
40 // Checks the available version of JNI. Also, caches Java reflection artifacts. 53 // Checks the available version of JNI. Also, caches Java reflection artifacts.
41 jint CronetOnLoad(JavaVM* vm, void* reserved) { 54 jint CronetOnLoad(JavaVM* vm, void* reserved) {
42 JNIEnv* env; 55 JNIEnv* env;
43 if (vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6) != JNI_OK) { 56 if (vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6) != JNI_OK) {
44 return -1; 57 return -1;
45 } 58 }
46 59
47 base::android::InitVM(vm); 60 base::android::InitVM(vm);
48 61
49 if (!base::android::RegisterNativeMethods( 62 if (!base::android::RegisterNativeMethods(
50 env, kCronetRegisteredMethods, arraysize(kCronetRegisteredMethods))) { 63 env, kCronetRegisteredMethods, arraysize(kCronetRegisteredMethods))) {
51 return -1; 64 return -1;
52 } 65 }
53 66
54 g_at_exit_manager = new base::AtExitManager(); 67 g_at_exit_manager = new base::AtExitManager();
55 68
56 #if !defined(USE_ICU_ALTERNATIVES_ON_ANDROID)
57 base::i18n::InitializeICU();
58 #endif
59
60 url::Initialize(); 69 url::Initialize();
61 70
62 return JNI_VERSION_1_6; 71 return JNI_VERSION_1_6;
63 } 72 }
64 73
65 void CronetOnUnLoad(JavaVM* jvm, void* reserved) { 74 void CronetOnUnLoad(JavaVM* jvm, void* reserved) {
66 if (g_at_exit_manager) { 75 if (g_at_exit_manager) {
67 delete g_at_exit_manager; 76 delete g_at_exit_manager;
68 g_at_exit_manager = NULL; 77 g_at_exit_manager = NULL;
69 } 78 }
70 } 79 }
71 80
81 void CronetInitOnMainThread(JNIEnv* env, jclass jcaller, jobject jcontext) {
82 // Set application context.
83 base::android::ScopedJavaLocalRef<jobject> scoped_context(env, jcontext);
84 base::android::InitApplicationContext(env, scoped_context);
85
86 #if !defined(USE_ICU_ALTERNATIVES_ON_ANDROID)
87 base::i18n::InitializeICU();
88 #endif
89
90 DCHECK(!base::MessageLoop::current());
91 DCHECK(!g_main_message_loop);
92 g_main_message_loop = new base::MessageLoopForUI();
93 base::MessageLoopForUI::current()->Start();
94 DCHECK(!g_network_change_notifier);
95 net::NetworkChangeNotifier::SetFactory(
96 new net::NetworkChangeNotifierFactoryAndroid());
97 g_network_change_notifier = net::NetworkChangeNotifier::Create();
98 }
99
72 } // namespace cronet 100 } // namespace cronet
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698