Reland r254672.

Replace the custom ProxyConfigServiceDirect class with the equivalent
net::ProxyConfigServiceFixed class.

Original code review: https://codereview.chromium.org/180283003

TBR=eroman@chromium.org,stgao@chromium.org,rlarocque@chromium.org
BUG=none
TEST=none

Review URL: https://codereview.chromium.org/185993009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@255160 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 19 deletions

diff --git a/sync/test/accounts_client/url_request_context_getter.cc b/sync/test/accounts_client/url_request_context_getter.cc
index 161b57d..11e1cc2 100644
--- a/sync/test/accounts_client/url_request_context_getter.cc
+++ b/sync/test/accounts_client/url_request_context_getter.cc
@@ -6,27 +6,10 @@
 
 #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) {
@@ -40,7 +23,8 @@ net::URLRequestContext* URLRequestContextGetter::GetURLRequestContext() {
     builder.set_user_agent("sync-test-accounts-client");
     builder.DisableHttpCache();
 #if defined(OS_LINUX) || defined(OS_ANDROID)
-    builder.set_proxy_config_service(new ProxyConfigServiceDirect());
+    builder.set_proxy_config_service(
+        new net::ProxyConfigServiceFixed(net::ProxyConfig::CreateDirect()));
 #endif
     url_request_context_.reset(builder.Build());
   }