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

Unified Diff: components/cronet/android/url_request_context_adapter.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: Address Matt's comments. Created 5 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: components/cronet/android/url_request_context_adapter.cc
diff --git a/components/cronet/android/url_request_context_adapter.cc b/components/cronet/android/url_request_context_adapter.cc
index 0b478bbf1e25e891efd5ef39d35483d5243220e4..19651b124257cb6ae744f1c9e1b4cc34f405eea2 100644
--- a/components/cronet/android/url_request_context_adapter.cc
+++ b/components/cronet/android/url_request_context_adapter.cc
@@ -30,12 +30,6 @@
namespace {
-// 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;
-
class BasicNetworkDelegate : public net::NetworkDelegateImpl {
public:
BasicNetworkDelegate() {}
@@ -120,7 +114,7 @@ namespace cronet {
URLRequestContextAdapter::URLRequestContextAdapter(
URLRequestContextAdapterDelegate* delegate,
- std::string user_agent) {
+ std::string user_agent) : is_context_initialized_(false) {
delegate_ = delegate;
user_agent_ = user_agent;
}
@@ -135,17 +129,6 @@ void URLRequestContextAdapter::Initialize(
}
void URLRequestContextAdapter::InitRequestContextOnMainThread() {
- if (!base::MessageLoop::current()) {
- 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();
- }
proxy_config_service_.reset(net::ProxyService::CreateSystemProxyConfigService(
GetNetworkTaskRunner(), NULL));
GetNetworkTaskRunner()->PostTask(

Powered by Google App Engine
This is Rietveld 408576698