Reland r254672.

chrome/test/chromedriver/net/url_request_context_getter.cc

 // Copyright (c) 2012 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 "chrome/test/chromedriver/net/url_request_context_getter.h"
 
 #include <string>
 
-#include "net/proxy/proxy_config_service.h"
+#include "net/proxy/proxy_config_service_fixed.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_builder.h"
 
-namespace {
-
-// Config getter that always returns direct settings.
-class ProxyConfigServiceDirect : public net::ProxyConfigService {
- public:
-  // Overridden from ProxyConfigService:
-  virtual void AddObserver(Observer* observer) OVERRIDE {}
-  virtual void RemoveObserver(Observer* observer) OVERRIDE {}
-  virtual ConfigAvailability GetLatestProxyConfig(
-      net::ProxyConfig* config) OVERRIDE {
-    *config = net::ProxyConfig::CreateDirect();
-    return CONFIG_VALID;
-  }
-};
-
-}  // namespace
-
 URLRequestContextGetter::URLRequestContextGetter(
     scoped_refptr<base::SingleThreadTaskRunner> network_task_runner)
     : network_task_runner_(network_task_runner) {
 }
 
 net::URLRequestContext* URLRequestContextGetter::GetURLRequestContext() {
   CHECK(network_task_runner_->BelongsToCurrentThread());
   if (!url_request_context_) {
     net::URLRequestContextBuilder builder;
     // net::HttpServer fails to parse headers if user-agent header is blank.
     builder.set_user_agent("chromedriver");
     builder.DisableHttpCache();
-    builder.set_proxy_config_service(new ProxyConfigServiceDirect());
+    builder.set_proxy_config_service(
+        new net::ProxyConfigServiceFixed(net::ProxyConfig::CreateDirect()));
     url_request_context_.reset(builder.Build());
   }
   return url_request_context_.get();
 }
 
 scoped_refptr<base::SingleThreadTaskRunner>
     URLRequestContextGetter::GetNetworkTaskRunner() const {
   return network_task_runner_;
 }
 
 URLRequestContextGetter::~URLRequestContextGetter() {}