Initial implementation of Cronet 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/url_request_context_adapter.cc b/components/cronet/android/cronet_url_request_context_adapter.cc
similarity index 54%
copy from components/cronet/android/url_request_context_adapter.cc
copy to components/cronet/android/cronet_url_request_context_adapter.cc
index baec6e8f4b21a14b8685f56caca36bfb0ead9c40..8c98a892c633879ba71067c39f1bf8c1ff8822e2 100644
--- a/components/cronet/android/url_request_context_adapter.cc
+++ b/components/cronet/android/cronet_url_request_context_adapter.cc
@@ -2,39 +2,29 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/cronet/android/url_request_context_adapter.h"
-
-#include <limits>
+#include "components/cronet/android/cronet_url_request_context_adapter.h"
 
 #include "base/bind.h"
 #include "base/files/file_util.h"
-#include "base/message_loop/message_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "components/cronet/url_request_context_config.h"
-#include "net/android/network_change_notifier_factory_android.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_log_logger.h"
-#include "net/base/net_util.h"
-#include "net/base/network_change_notifier.h"
 #include "net/cert/cert_verifier.h"
 #include "net/http/http_auth_handler_factory.h"
 #include "net/http/http_network_layer.h"
 #include "net/http/http_server_properties.h"
+#include "net/proxy/proxy_config_service_fixed.h"
 #include "net/proxy/proxy_service.h"
 #include "net/ssl/ssl_config_service_defaults.h"
 #include "net/url_request/static_http_user_agent_settings.h"
+#include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_builder.h"
 #include "net/url_request/url_request_context_storage.h"
 #include "net/url_request/url_request_job_factory_impl.h"
 
 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::NetworkDelegate {
  public:
   BasicNetworkDelegate() {}
@@ -71,15 +61,15 @@ class BasicNetworkDelegate : public net::NetworkDelegate {
 
   void OnResponseStarted(net::URLRequest* request) override {}
 
-  void OnRawBytesRead(const net::URLRequest& request,
-                      int bytes_read) override {}
+  void OnRawBytesRead(const net::URLRequest& request, int bytes_read) override {
+  }
 
   void OnCompleted(net::URLRequest* request, bool started) override {}
 
   void OnURLRequestDestroyed(net::URLRequest* request) override {}
 
-  void OnPACScriptError(int line_number,
-                        const base::string16& error) override {}
+  void OnPACScriptError(int line_number, const base::string16& error) override {
+  }
 
   NetworkDelegate::AuthRequiredResponse OnAuthRequired(
       net::URLRequest* request,
@@ -105,8 +95,7 @@ class BasicNetworkDelegate : public net::NetworkDelegate {
     return false;
   }
 
-  bool OnCanThrottleRequest(
-      const net::URLRequest& request) const override {
+  bool OnCanThrottleRequest(const net::URLRequest& request) const override {
     return false;
   }
 
@@ -123,77 +112,53 @@ class BasicNetworkDelegate : public net::NetworkDelegate {
 
 namespace cronet {
 
-URLRequestContextAdapter::URLRequestContextAdapter(
-    URLRequestContextAdapterDelegate* delegate,
-    std::string user_agent) {
-  delegate_ = delegate;
-  user_agent_ = user_agent;
+CronetURLRequestContextAdapter::CronetURLRequestContextAdapter() {
 }
 
-void URLRequestContextAdapter::Initialize(
-    scoped_ptr<URLRequestContextConfig> config) {
+void CronetURLRequestContextAdapter::Initialize(
+    scoped_ptr<URLRequestContextConfig> config,
+    const base::Closure& init_java_network_thread) {
   network_thread_ = new base::Thread("network");
   base::Thread::Options options;
   options.message_loop_type = base::MessageLoop::TYPE_IO;
   network_thread_->StartWithOptions(options);
-  config_ = config.Pass();
-}
 
-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(
       FROM_HERE,
-      base::Bind(&URLRequestContextAdapter::InitRequestContextOnNetworkThread,
-                 this));
+      base::Bind(&CronetURLRequestContextAdapter::InitializeOnNetworkThread,
+                 base::Unretained(this),
+                 Passed(&config),
+                 init_java_network_thread));
 }
 
-void URLRequestContextAdapter::InitRequestContextOnNetworkThread() {
+void CronetURLRequestContextAdapter::InitializeOnNetworkThread(
+    scoped_ptr<URLRequestContextConfig> config,
+    const base::Closure& init_java_network_thread) {

[mmenke, 2014/10/31 15:49:22]

optional:  Maybe java_init_network_thread?  (It's more of a C++ thread that
we're initializing stuff on with a Java call, than a Java network thread we're
initing stuff on).  Or maybe init_network_thread_java...

Alternatively, there's nothing in this class that really depends on java.  Could
just get rid of the java.  Anyhow, up to you, don't feel strongly about this.

[mef, 2014/10/31 20:39:15]

Done.

   DCHECK(GetNetworkTaskRunner()->BelongsToCurrentThread());
-  DCHECK(config_);
   // TODO(mmenke):  Add method to have the builder enable SPDY.
   net::URLRequestContextBuilder context_builder;
   context_builder.set_network_delegate(new BasicNetworkDelegate());
-  context_builder.set_proxy_config_service(proxy_config_service_.get());
-  config_->ConfigureURLRequestContextBuilder(&context_builder);
+  context_builder.set_proxy_config_service(
+      new net::ProxyConfigServiceFixed(net::ProxyConfig()));
+  config->ConfigureURLRequestContextBuilder(&context_builder);
 
   context_.reset(context_builder.Build());
 
   // Currently (circa M39) enabling QUIC requires setting probability threshold.
-  if (config_->enable_quic) {
+  if (config->enable_quic) {
     context_->http_server_properties()
         ->SetAlternateProtocolProbabilityThreshold(0.0f);
-    for (size_t hint = 0; hint < config_->quic_hints.size(); ++hint) {
+    for (size_t hint = 0; hint < config->quic_hints.size(); ++hint) {
       const URLRequestContextConfig::QuicHint& quic_hint =
-          *config_->quic_hints[hint];
+          *config->quic_hints[hint];
       if (quic_hint.host.empty()) {
         LOG(ERROR) << "Empty QUIC hint host: " << quic_hint.host;
         continue;
       }
 
-      url::CanonHostInfo host_info;
-      std::string canon_host(net::CanonicalizeHost(quic_hint.host, &host_info));
-      if (!host_info.IsIPAddress() &&
-          !net::IsCanonicalizedHostCompliant(canon_host)) {
-        LOG(ERROR) << "Invalid QUIC hint host: " << quic_hint.host;
-        continue;
-      }
-
       if (quic_hint.port <= std::numeric_limits<uint16>::min() ||
           quic_hint.port > std::numeric_limits<uint16>::max()) {
-        LOG(ERROR) << "Invalid QUIC hint port: "
-                   << quic_hint.port;
+        LOG(ERROR) << "Invalid QUIC hint port: " << quic_hint.port;
         continue;
       }
 
@@ -204,7 +169,7 @@ void URLRequestContextAdapter::InitRequestContextOnNetworkThread() {
         continue;
       }
 
-      net::HostPortPair quic_hint_host_port_pair(canon_host,
+      net::HostPortPair quic_hint_host_port_pair(quic_hint.host,
                                                  quic_hint.port);
       context_->http_server_properties()->SetAlternateProtocol(
           quic_hint_host_port_pair,
@@ -213,61 +178,24 @@ void URLRequestContextAdapter::InitRequestContextOnNetworkThread() {
           1.0f);
     }
   }
-  config_.reset(NULL);
-
-  if (VLOG_IS_ON(2)) {
-    net_log_observer_.reset(new NetLogObserver());
-    context_->net_log()->AddThreadSafeObserver(net_log_observer_.get(),
-                                               net::NetLog::LOG_ALL_BUT_BYTES);
-  }
-
-  is_context_initialized_ = true;
-  while (!tasks_waiting_for_context_.empty()) {
-    tasks_waiting_for_context_.front().Run();
-    tasks_waiting_for_context_.pop();
-  }
-
-  delegate_->OnContextInitialized(this);
-}
 
-void URLRequestContextAdapter::PostTaskToNetworkThread(
-    const tracked_objects::Location& posted_from,
-    const RunAfterContextInitTask& callback) {
-  GetNetworkTaskRunner()->PostTask(
-      posted_from,
-      base::Bind(
-          &URLRequestContextAdapter::RunTaskAfterContextInitOnNetworkThread,
-          this,
-          callback));
+  init_java_network_thread.Run();
 }
 
-void URLRequestContextAdapter::RunTaskAfterContextInitOnNetworkThread(
-    const RunAfterContextInitTask& callback) {
-  DCHECK(GetNetworkTaskRunner()->BelongsToCurrentThread());
-  if (is_context_initialized_) {
-    callback.Run();
-    return;
-  }
-  tasks_waiting_for_context_.push(callback);
+void CronetURLRequestContextAdapter::Destroy() {
+  DCHECK(!GetNetworkTaskRunner()->BelongsToCurrentThread());
+  GetNetworkTaskRunner()->DeleteSoon(FROM_HERE, this);
+  // Deleting thread stops it after all tasks are completed.
+  delete network_thread_;
 }
 
-URLRequestContextAdapter::~URLRequestContextAdapter() {
+CronetURLRequestContextAdapter::~CronetURLRequestContextAdapter() {
   DCHECK(GetNetworkTaskRunner()->BelongsToCurrentThread());
-  if (net_log_observer_) {
-    context_->net_log()->RemoveThreadSafeObserver(net_log_observer_.get());
-    net_log_observer_.reset();
-  }
-  StopNetLogHelper();
-  // TODO(mef): Ensure that |network_thread_| is destroyed properly.
-}
-
-const std::string& URLRequestContextAdapter::GetUserAgent(
-    const GURL& url) const {
-  return user_agent_;
+  StopNetLog();

[mmenke, 2014/10/31 15:49:22]

StopNetLogOnNetworkThread() (And should test that)

[mef, 2014/10/31 20:39:16]

Done.

+  context_.reset();

[mmenke, 2014/10/31 15:49:22]

Not needed, since it's in a scoped_ptr.

[mef, 2014/10/31 20:39:16]

Done.

 }
 
-net::URLRequestContext* URLRequestContextAdapter::GetURLRequestContext() {
-  DCHECK(GetNetworkTaskRunner()->BelongsToCurrentThread());
+net::URLRequestContext* CronetURLRequestContextAdapter::GetURLRequestContext() {
   if (!context_) {
     LOG(ERROR) << "URLRequestContext is not set up";
   }
@@ -275,23 +203,28 @@ net::URLRequestContext* URLRequestContextAdapter::GetURLRequestContext() {
 }
 
 scoped_refptr<base::SingleThreadTaskRunner>
-URLRequestContextAdapter::GetNetworkTaskRunner() const {
+CronetURLRequestContextAdapter::GetNetworkTaskRunner() const {
   return network_thread_->message_loop_proxy();
 }
 
-void URLRequestContextAdapter::StartNetLogToFile(const std::string& file_name) {
-  PostTaskToNetworkThread(
+void CronetURLRequestContextAdapter::StartNetLogToFile(
+    const std::string& file_name) {
+  GetNetworkTaskRunner()->PostTask(
       FROM_HERE,
       base::Bind(
-          &URLRequestContextAdapter::StartNetLogToFileHelper, this, file_name));
+          &CronetURLRequestContextAdapter::StartNetLogToFileOnNetworkThread,
+          base::Unretained(this),
+          file_name));
 }
 
-void URLRequestContextAdapter::StopNetLog() {
-  PostTaskToNetworkThread(
-      FROM_HERE, base::Bind(&URLRequestContextAdapter::StopNetLogHelper, this));
+void CronetURLRequestContextAdapter::StopNetLog() {
+  GetNetworkTaskRunner()->PostTask(
+      FROM_HERE,
+      base::Bind(&CronetURLRequestContextAdapter::StopNetLogOnNetworkThread,
+                 base::Unretained(this)));
 }
 
-void URLRequestContextAdapter::StartNetLogToFileHelper(
+void CronetURLRequestContextAdapter::StartNetLogToFileOnNetworkThread(
     const std::string& file_name) {
   DCHECK(GetNetworkTaskRunner()->BelongsToCurrentThread());
   // Do nothing if already logging to a file.
@@ -308,7 +241,7 @@ void URLRequestContextAdapter::StartNetLogToFileHelper(
   net_log_logger_->StartObserving(context_->net_log());
 }
 
-void URLRequestContextAdapter::StopNetLogHelper() {
+void CronetURLRequestContextAdapter::StopNetLogOnNetworkThread() {
   DCHECK(GetNetworkTaskRunner()->BelongsToCurrentThread());
   if (net_log_logger_) {
     net_log_logger_->StopObserving();
@@ -316,9 +249,4 @@ void URLRequestContextAdapter::StopNetLogHelper() {
   }
 }
 
-void NetLogObserver::OnAddEntry(const net::NetLog::Entry& entry) {
-  VLOG(2) << "Net log entry: type=" << entry.type()
-          << ", source=" << entry.source().type << ", phase=" << entry.phase();
-}
-
 }  // namespace cronet