Setup ProxyConfigServiceAndroid in Cronet

components/cronet/android/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 "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/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"
 #include "net/http/http_server_properties.h"
-#include "net/proxy/proxy_config_service_fixed.h"
+#include "net/proxy/proxy_config_service.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_builder.h"
 #include "net/url_request/url_request_context_storage.h"
 #include "net/url_request/url_request_job_factory_impl.h"
 
 namespace {
 
 class BasicNetworkDelegate : public net::NetworkDelegate {
@@ skipping 73 matching lines @@
 
   virtual int OnBeforeSocketStreamConnect(
       net::SocketStream* stream,
       const net::CompletionCallback& callback) override {
     return net::OK;
   }
 
   DISALLOW_COPY_AND_ASSIGN(BasicNetworkDelegate);
 };
 
+// Android specific UI MessageLoop.
+base::MessageLoop* g_main_message_loop = nullptr;
+
 }  // namespace
 
 namespace cronet {
 
 URLRequestContextAdapter::URLRequestContextAdapter(
     URLRequestContextAdapterDelegate* delegate,
     std::string user_agent) {
   delegate_ = delegate;
   user_agent_ = user_agent;
 }
 
 void URLRequestContextAdapter::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);
+  config_ = config.Pass();
+}
 
+void URLRequestContextAdapter::InitRequestContextOnUIThread() {
+  if (!base::MessageLoop::current()) {
+    DCHECK(!g_main_message_loop);
+    g_main_message_loop = new base::MessageLoopForUI;
+    base::MessageLoopForUI::current()->Start();
+  }
+
+  net::ProxyConfigService* service =
+      net::ProxyService::CreateSystemProxyConfigService(GetNetworkTaskRunner(),
+                                                        NULL);
+  proxy_config_service_.reset(service);
   GetNetworkTaskRunner()->PostTask(
       FROM_HERE,
       base::Bind(&URLRequestContextAdapter::InitializeURLRequestContext,

[mef, 2014/10/10 21:20:37]

I'd rename this InitRequestContextOnNetworkThread to clearly distinguish from
InitRequestContextOnUIThread. 

[xunjieli, 2014/10/14 19:14:48]

Done. Good idea! Thanks!

                  this,
-                 Passed(&config)));
+                 Passed(&config_)));
 }
 
 void URLRequestContextAdapter::InitializeURLRequestContext(
     scoped_ptr<URLRequestContextConfig> config) {
   DCHECK(GetNetworkTaskRunner()->BelongsToCurrentThread());
   // 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()));
+  context_builder.set_proxy_config_service(proxy_config_service_.get());
   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 =
@@ skipping 19 matching lines @@
 
       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);
     }
     is_context_initialized_ = true;
     while (!tasks_waiting_for_context_.empty()) {

[mef, 2014/10/10 21:20:37]

this seems to be inside of 'if (config->enable_quic)', which is wrong.

[xunjieli, 2014/10/14 19:14:48]

Done. This is very bad. thanks for catching it!

       tasks_waiting_for_context_.front().Run();
       tasks_waiting_for_context_.pop();
     }
   }
 
   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);
   }
@@ skipping 86 matching lines @@
     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