Add an option ProxyService::Create() to disable use of proxy auto-config....

chrome_frame/metrics_service.cc

 // Copyright (c) 2010 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.
 
 
 //------------------------------------------------------------------------------
 // Description of the life cycle of a instance of MetricsService.
 //
 //  OVERVIEW
 //
@@ skipping 113 matching lines @@
     g_metrics_upload_thread_(base::LINKER_INITIALIZED);
 
 Lock g_metrics_service_lock;
 
 extern base::LazyInstance<StatisticsRecorder> g_statistics_recorder_;
 
 // This class provides HTTP request context information for metrics upload
 // requests initiated by ChromeFrame.
 class ChromeFrameUploadRequestContext : public URLRequestContext {
  public:
-  ChromeFrameUploadRequestContext(MessageLoop* io_loop)
+  explicit ChromeFrameUploadRequestContext(MessageLoop* io_loop)
       : io_loop_(io_loop) {
     Initialize();
   }
 
   ~ChromeFrameUploadRequestContext() {
     DLOG(INFO) << __FUNCTION__;
     delete http_transaction_factory_;
     delete http_auth_handler_factory_;
   }
 
   void Initialize() {
     user_agent_ = http_utils::GetDefaultUserAgent();
     user_agent_ = http_utils::AddChromeFrameToUserAgentValue(
       user_agent_);
 
     host_resolver_ =
         net::CreateSystemHostResolver(net::HostResolver::kDefaultParallelism,
                                       NULL);
     net::ProxyConfigService* proxy_config_service =
         net::ProxyService::CreateSystemProxyConfigService(NULL, NULL);
     DCHECK(proxy_config_service);
 
     const size_t kNetLogBound = 50u;
     net_log_.reset(new net::CapturingNetLog(kNetLogBound));
 
-    proxy_service_ = net::ProxyService::Create(proxy_config_service, false, 0,
-                                               this, net_log_.get(), io_loop_);
+    proxy_service_ = net::ProxyService::CreateUsingSystemProxyResolver(
+        proxy_config_service, 0, net_log_.get());
     DCHECK(proxy_service_);
 
     ssl_config_service_ = new net::SSLConfigServiceDefaults;
 
     url_security_manager_.reset(
         net::URLSecurityManager::Create(NULL, NULL));
 
     std::string csv_auth_schemes = "basic,digest,ntlm,negotiate";
     std::vector<std::string> supported_schemes;
     SplitString(csv_auth_schemes, ',', &supported_schemes);
@@ skipping 21 matching lines @@
   std::string user_agent_;
   MessageLoop* io_loop_;
   scoped_ptr<net::NetLog> net_log_;
   scoped_ptr<net::URLSecurityManager> url_security_manager_;
 };
 
 // This class provides an interface to retrieve the URL request context for
 // metrics HTTP upload requests initiated by ChromeFrame.
 class ChromeFrameUploadRequestContextGetter : public URLRequestContextGetter {
  public:
-  ChromeFrameUploadRequestContextGetter(MessageLoop* io_loop)
+  explicit ChromeFrameUploadRequestContextGetter(MessageLoop* io_loop)
       : io_loop_(io_loop) {}
 
   virtual URLRequestContext* GetURLRequestContext() {
     if (!context_)
       context_ = new ChromeFrameUploadRequestContext(io_loop_);
     return context_;
   }
 
   virtual scoped_refptr<base::MessageLoopProxy> GetIOMessageLoopProxy() {
     if (!io_message_loop_proxy_.get()) {
@@ skipping 385 matching lines @@
     version += "-F";
     if (!version_info.IsOfficialBuild())
       version.append("-devel");
     return version;
   } else {
     NOTREACHED() << "Unable to retrieve version string.";
   }
 
   return std::string();
 }