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

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

Issue 2110803002: Initialize base::FeatureList on Cronet init (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "components/cronet/android/cronet_library_loader.h" 5 #include "components/cronet/android/cronet_library_loader.h"
6 6
7 #include <jni.h> 7 #include <jni.h>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/android/base_jni_onload.h" 10 #include "base/android/base_jni_onload.h"
11 #include "base/android/base_jni_registrar.h" 11 #include "base/android/base_jni_registrar.h"
12 #include "base/android/jni_android.h" 12 #include "base/android/jni_android.h"
13 #include "base/android/jni_registrar.h" 13 #include "base/android/jni_registrar.h"
14 #include "base/android/jni_utils.h" 14 #include "base/android/jni_utils.h"
15 #include "base/android/library_loader/library_loader_hooks.h" 15 #include "base/android/library_loader/library_loader_hooks.h"
16 #include "base/command_line.h" 16 #include "base/command_line.h"
17 #include "base/feature_list.h"
17 #include "base/logging.h" 18 #include "base/logging.h"
18 #include "base/macros.h" 19 #include "base/macros.h"
19 #include "base/message_loop/message_loop.h" 20 #include "base/message_loop/message_loop.h"
20 #include "components/cronet/android/chromium_url_request.h" 21 #include "components/cronet/android/chromium_url_request.h"
21 #include "components/cronet/android/chromium_url_request_context.h" 22 #include "components/cronet/android/chromium_url_request_context.h"
22 #include "components/cronet/android/cronet_bidirectional_stream_adapter.h" 23 #include "components/cronet/android/cronet_bidirectional_stream_adapter.h"
23 #include "components/cronet/android/cronet_upload_data_stream_adapter.h" 24 #include "components/cronet/android/cronet_upload_data_stream_adapter.h"
24 #include "components/cronet/android/cronet_url_request_adapter.h" 25 #include "components/cronet/android/cronet_url_request_adapter.h"
25 #include "components/cronet/android/cronet_url_request_context_adapter.h" 26 #include "components/cronet/android/cronet_url_request_context_adapter.h"
26 #include "components/cronet/version.h" 27 #include "components/cronet/version.h"
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 91
91 void CronetOnUnLoad(JavaVM* jvm, void* reserved) { 92 void CronetOnUnLoad(JavaVM* jvm, void* reserved) {
92 base::android::LibraryLoaderExitHook(); 93 base::android::LibraryLoaderExitHook();
93 } 94 }
94 95
95 void CronetInitOnMainThread(JNIEnv* env, const JavaParamRef<jclass>& jcaller) { 96 void CronetInitOnMainThread(JNIEnv* env, const JavaParamRef<jclass>& jcaller) {
96 #if !BUILDFLAG(USE_PLATFORM_ICU_ALTERNATIVES) 97 #if !BUILDFLAG(USE_PLATFORM_ICU_ALTERNATIVES)
97 base::i18n::InitializeICU(); 98 base::i18n::InitializeICU();
98 #endif 99 #endif
99 100
101 base::FeatureList::InitializeInstance(std::string(), std::string());
100 // TODO(bengr): Remove once Data Reduction Proxy no longer needs this for 102 // TODO(bengr): Remove once Data Reduction Proxy no longer needs this for
101 // configuration information. 103 // configuration information.
102 base::CommandLine::Init(0, nullptr); 104 base::CommandLine::Init(0, nullptr);
103 DCHECK(!base::MessageLoop::current()); 105 DCHECK(!base::MessageLoop::current());
104 DCHECK(!g_main_message_loop); 106 DCHECK(!g_main_message_loop);
105 g_main_message_loop = new base::MessageLoopForUI(); 107 g_main_message_loop = new base::MessageLoopForUI();
106 base::MessageLoopForUI::current()->Start(); 108 base::MessageLoopForUI::current()->Start();
107 DCHECK(!g_network_change_notifier); 109 DCHECK(!g_network_change_notifier);
108 net::NetworkChangeNotifier::SetFactory( 110 net::NetworkChangeNotifier::SetFactory(
109 new net::NetworkChangeNotifierFactoryAndroid()); 111 new net::NetworkChangeNotifierFactoryAndroid());
110 g_network_change_notifier = net::NetworkChangeNotifier::Create(); 112 g_network_change_notifier = net::NetworkChangeNotifier::Create();
111 } 113 }
112 114
113 ScopedJavaLocalRef<jstring> GetCronetVersion( 115 ScopedJavaLocalRef<jstring> GetCronetVersion(
114 JNIEnv* env, 116 JNIEnv* env,
115 const JavaParamRef<jclass>& jcaller) { 117 const JavaParamRef<jclass>& jcaller) {
116 return base::android::ConvertUTF8ToJavaString(env, CRONET_VERSION); 118 return base::android::ConvertUTF8ToJavaString(env, CRONET_VERSION);
117 } 119 }
118 120
119 } // namespace cronet 121 } // namespace cronet
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698