Turn off the network proxy for mac and win in DRT

webkit/tools/test_shell/test_shell_request_context.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 "webkit/tools/test_shell/test_shell_request_context.h"
 
 #include "build/build_config.h"
 
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
@@ skipping 62 matching lines @@
     const FilePath& cache_path,
     net::HttpCache::Mode cache_mode,
     bool no_proxy) {
   storage_.set_cookie_store(new net::CookieMonster(NULL, NULL));
   storage_.set_server_bound_cert_service(new net::ServerBoundCertService(
       new net::DefaultServerBoundCertStore(NULL),
       base::WorkerPool::GetTaskRunner(true)));
 
   storage_.set_http_user_agent_settings(new TestShellHttpUserAgentSettings);
 
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
-  // Use no proxy to avoid ProxyConfigServiceLinux.
-  // Enabling use of the ProxyConfigServiceLinux requires:
-  // -Calling from a thread with a TYPE_UI MessageLoop,
-  // -If at all possible, passing in a pointer to the IO thread's MessageLoop,
-  // -Keep in mind that proxy auto configuration is also
-  //  non-functional on linux in this context because of v8 threading
-  //  issues.
-  // TODO(port): rename "linux" to some nonspecific unix.
+  // Use no proxy; it's not needed for testing and just breaks things.
   scoped_ptr<net::ProxyConfigService> proxy_config_service(
       new net::ProxyConfigServiceFixed(net::ProxyConfig()));
-#else
-  // Use the system proxy settings.
-  scoped_ptr<net::ProxyConfigService> proxy_config_service(
-      net::ProxyService::CreateSystemProxyConfigService(
-          base::ThreadTaskRunnerHandle::Get(), NULL));
-#endif
+
   storage_.set_host_resolver(net::HostResolver::CreateDefaultResolver(NULL));
   storage_.set_cert_verifier(net::CertVerifier::CreateDefault());
   storage_.set_proxy_service(net::ProxyService::CreateUsingSystemProxyResolver(
       proxy_config_service.release(), 0, NULL));
   storage_.set_ssl_config_service(
       new net::SSLConfigServiceDefaults);
 
   storage_.set_http_auth_handler_factory(
       net::HttpAuthHandlerFactory::CreateDefault(host_resolver()));
   storage_.set_http_server_properties(
@@ skipping 36 matching lines @@
           file_system_context_,
           SimpleResourceLoaderBridge::GetIoThread()));
   job_factory->SetProtocolHandler(
       "filesystem",
       fileapi::CreateFileSystemProtocolHandler(file_system_context_.get()));
   storage_.set_job_factory(job_factory);
 }
 
 TestShellRequestContext::~TestShellRequestContext() {
 }