Turn off the network proxy for mac and win in DRT

webkit/tools/test_shell/test_shell_request_context.cc

Index: webkit/tools/test_shell/test_shell_request_context.cc
diff --git a/webkit/tools/test_shell/test_shell_request_context.cc b/webkit/tools/test_shell/test_shell_request_context.cc
index 5bdf4c954e30ae1433277232c9cc006522ea8d58..d6fb0f5ded10e09b2d1cd0a7f7f432870bde2a34 100644
--- a/webkit/tools/test_shell/test_shell_request_context.cc
+++ b/webkit/tools/test_shell/test_shell_request_context.cc
@@ -80,23 +80,10 @@ void TestShellRequestContext::Init(
 
   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(