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

components/cronet/android/cronet_url_request_context_adapter.cc

Index: components/cronet/android/cronet_url_request_context_adapter.cc
diff --git a/components/cronet/android/cronet_url_request_context_adapter.cc b/components/cronet/android/cronet_url_request_context_adapter.cc
index 1e02bc06c439c5d2fc84ece9836474cf8cb95240..3187f7c79e7bb68200e078ccc38f90f9e00588a4 100644
--- a/components/cronet/android/cronet_url_request_context_adapter.cc
+++ b/components/cronet/android/cronet_url_request_context_adapter.cc
@@ -108,8 +108,15 @@ class BasicNetworkDelegate : public net::NetworkDelegateImpl {
 
 namespace cronet {
 
-CronetURLRequestContextAdapter::CronetURLRequestContextAdapter()
-    : default_load_flags_(0) {
+CronetURLRequestContextAdapter::CronetURLRequestContextAdapter(
+    scoped_ptr<URLRequestContextConfig> context_config)
+    : network_thread_(new base::Thread("network")),
+      is_context_initialized_(false),
+      default_load_flags_(0) {

[mmenke, 2015/01/23 20:41:41]

LOAD_NORMAL

[mef, 2015/01/28 21:32:28]

Done.

+  context_config_.reset(context_config.release());

[mmenke, 2015/01/23 20:41:41]

Should be in initializer list, and should use Pass instead of release.

[mef, 2015/01/28 21:32:27]

Done.

+  base::Thread::Options options;
+  options.message_loop_type = base::MessageLoop::TYPE_IO;
+  network_thread_->StartWithOptions(options);
 }
 
 CronetURLRequestContextAdapter::~CronetURLRequestContextAdapter() {
@@ -117,19 +124,15 @@ CronetURLRequestContextAdapter::~CronetURLRequestContextAdapter() {
   StopNetLogOnNetworkThread();
 }
 
-void CronetURLRequestContextAdapter::Initialize(
-    scoped_ptr<URLRequestContextConfig> config,
+void CronetURLRequestContextAdapter::InitRequestContextOnMainThread(
     const base::Closure& java_init_network_thread) {
-  network_thread_ = new base::Thread("network");
-  base::Thread::Options options;
-  options.message_loop_type = base::MessageLoop::TYPE_IO;
-  network_thread_->StartWithOptions(options);
-
+  proxy_config_service_.reset(net::ProxyService::CreateSystemProxyConfigService(
+      GetNetworkTaskRunner(), NULL));

[mmenke, 2015/01/23 20:41:41]

nullptr is preferred now, I believe.

[mef, 2015/01/28 21:32:28]

Done.

   GetNetworkTaskRunner()->PostTask(
       FROM_HERE,
       base::Bind(&CronetURLRequestContextAdapter::InitializeOnNetworkThread,
                  base::Unretained(this),
-                 Passed(&config),
+                 Passed(&context_config_),
                  java_init_network_thread));
 }
 
@@ -196,6 +199,12 @@ void CronetURLRequestContextAdapter::InitializeOnNetworkThread(
   }
 
   java_init_network_thread.Run();
+
+  is_context_initialized_ = true;
+  while (!tasks_waiting_for_context_.empty()) {
+    tasks_waiting_for_context_.front().Run();
+    tasks_waiting_for_context_.pop();
+  }
 }
 
 void CronetURLRequestContextAdapter::Destroy() {
@@ -215,6 +224,25 @@ net::URLRequestContext* CronetURLRequestContextAdapter::GetURLRequestContext() {
   return context_.get();
 }
 
+void CronetURLRequestContextAdapter::PostTaskToNetworkThread(
+    const tracked_objects::Location& posted_from,
+    const RunAfterContextInitTask& callback) {
+  GetNetworkTaskRunner()->PostTask(
+      posted_from, base::Bind(&CronetURLRequestContextAdapter::
+                                  RunTaskAfterContextInitOnNetworkThread,
+                              base::Unretained(this), callback));
+}
+
+void CronetURLRequestContextAdapter::RunTaskAfterContextInitOnNetworkThread(
+    const RunAfterContextInitTask& callback) {
+  DCHECK(GetNetworkTaskRunner()->BelongsToCurrentThread());
+  if (is_context_initialized_) {
+    callback.Run();
+    return;
+  }
+  tasks_waiting_for_context_.push(callback);
+}
+
 scoped_refptr<base::SingleThreadTaskRunner>
 CronetURLRequestContextAdapter::GetNetworkTaskRunner() const {
   return network_thread_->task_runner();