Initial implementation of Cronet Async API.

components/cronet/android/cronet_url_request_context_adapter.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // 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 "components/cronet/android/cronet_url_request_context_adapter.h"
 
 #include "base/bind.h"
 #include "base/files/file_util.h"
 #include "base/single_thread_task_runner.h"
 #include "components/cronet/url_request_context_config.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_log_logger.h"
 #include "net/cert/cert_verifier.h"
 #include "net/http/http_auth_handler_factory.h"
 #include "net/http/http_network_layer.h"
@@ skipping 82 matching lines @@
       const net::URLRequest& request) const OVERRIDE {
     return false;
   }
 
   virtual int OnBeforeSocketStreamConnect(
       net::SocketStream* stream,
       const net::CompletionCallback& callback) OVERRIDE {
     return net::OK;
   }
 
   DISALLOW_COPY_AND_ASSIGN(BasicNetworkDelegate);

[xunjieli, 2014/10/01 14:40:37]

nit: include "base/macros.h".

[mef, 2014/10/01 20:41:31]

Hmm, I think it is not necessary as long as it is included in matching .h file.

 };
 
 }  // namespace
 
 namespace cronet {
 
-URLRequestContextAdapter::URLRequestContextAdapter(
-    URLRequestContextAdapterDelegate* delegate,
-    std::string user_agent) {
+CronetURLRequestContextAdapter::CronetURLRequestContextAdapter(
+    CronetURLRequestContextAdapterDelegate* delegate) {
   delegate_ = delegate;
-  user_agent_ = user_agent;
 }
 
-void URLRequestContextAdapter::Initialize(
+void CronetURLRequestContextAdapter::Initialize(
     scoped_ptr<URLRequestContextConfig> config) {
   network_thread_ = new base::Thread("network");
   base::Thread::Options options;
   options.message_loop_type = base::MessageLoop::TYPE_IO;
   network_thread_->StartWithOptions(options);
 
   GetNetworkTaskRunner()->PostTask(
       FROM_HERE,
-      base::Bind(&URLRequestContextAdapter::InitializeURLRequestContext,
+      base::Bind(&CronetURLRequestContextAdapter::InitializeURLRequestContext,
                  this,
                  Passed(&config)));
 }
 
-void URLRequestContextAdapter::InitializeURLRequestContext(
+void CronetURLRequestContextAdapter::InitializeURLRequestContext(
     scoped_ptr<URLRequestContextConfig> 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(
       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) {
     context_->http_server_properties()
         ->SetAlternateProtocolProbabilityThreshold(0.0f);
     for (size_t hint = 0; hint < config->quic_hints.size(); ++hint) {
       const URLRequestContextConfig::QuicHint& quic_hint =
           *config->quic_hints[hint];
       if (quic_hint.host.empty()) {
         LOG(ERROR) << "Empty 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;
       }
 
       if (quic_hint.alternate_port <= std::numeric_limits<uint16>::min() ||
           quic_hint.alternate_port > std::numeric_limits<uint16>::max()) {
         LOG(ERROR) << "Invalid QUIC hint alternate port: "
                    << quic_hint.alternate_port;
         continue;
       }
 
       net::HostPortPair quic_hint_host_port_pair(quic_hint.host,
                                                  quic_hint.port);
       context_->http_server_properties()->SetAlternateProtocol(
           quic_hint_host_port_pair,
           static_cast<uint16>(quic_hint.alternate_port),
           net::AlternateProtocol::QUIC,
           1.0f);
     }
   }
-
-  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);
-  }
+  user_agent_ = config->user_agent;
 
   delegate_->OnContextInitialized(this);
 }
 
-URLRequestContextAdapter::~URLRequestContextAdapter() {
-  if (net_log_observer_) {
-    context_->net_log()->RemoveThreadSafeObserver(net_log_observer_.get());
-    net_log_observer_.reset();
-  }
+CronetURLRequestContextAdapter::~CronetURLRequestContextAdapter() {
   StopNetLog();
   // TODO(mef): Ensure that |network_thread_| is destroyed properly.
 }
 
-const std::string& URLRequestContextAdapter::GetUserAgent(
+const std::string& CronetURLRequestContextAdapter::GetUserAgent(
     const GURL& url) const {
   return user_agent_;
 }
 
-net::URLRequestContext* URLRequestContextAdapter::GetURLRequestContext() {
+net::URLRequestContext* CronetURLRequestContextAdapter::GetURLRequestContext() {
   if (!context_) {
     LOG(ERROR) << "URLRequestContext is not set up";
   }
   return context_.get();
 }
 
 scoped_refptr<base::SingleThreadTaskRunner>
-URLRequestContextAdapter::GetNetworkTaskRunner() const {
+CronetURLRequestContextAdapter::GetNetworkTaskRunner() const {
   return network_thread_->message_loop_proxy();
 }
 
-void URLRequestContextAdapter::StartNetLogToFile(const std::string& file_name) {
+void CronetURLRequestContextAdapter::StartNetLogToFile(
+    const std::string& file_name) {
   // Do nothing if already logging to a file.
   if (net_log_logger_)
     return;
 
   base::FilePath file_path(file_name);
   FILE* file = base::OpenFile(file_path, "w");
   if (!file)
     return;
 
   scoped_ptr<base::Value> constants(net::NetLogLogger::GetConstants());
   net_log_logger_.reset(new net::NetLogLogger(file, *constants));
   net_log_logger_->StartObserving(context_->net_log());
 }
 
-void URLRequestContextAdapter::StopNetLog() {
+void CronetURLRequestContextAdapter::StopNetLog() {
   if (net_log_logger_) {
     net_log_logger_->StopObserving();
     net_log_logger_.reset();
   }
 }
-
-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