Revert 51877, since SpdyNetworkTransactionTest.CorruptFrameSessionErr…

…or started failing after this check-in (but only on vista modules builder).

BUG=48588

Original CL description:

Add the capability to run multiple proxy PAC scripts in parallel.

Refactors SingleThreadedProxyResolver into MultiThreadedProxyResolver.

New threads are created lazily on demand, up to a fixed maximum.

Note that this CL does NOT change the policy in Chrome -- it will continue to use a single thread for proxy resolving, but using the new code to do so.

BUG=11079
Review URL: http://codereview.chromium.org/2822043

TBR=eroman@chromium.org
Review URL: http://codereview.chromium.org/2945004

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

net/base/host_resolver.h

@@ -177,9 +177,6 @@ class HostResolver : public base::RefCounted<HostResolver> {
   // additional functionality on the about:net-internals page.
   virtual HostResolverImpl* GetAsHostResolverImpl() { return NULL; }
 
-  // Does additional cleanup prior to destruction.
-  virtual void Shutdown() {}
-
  protected:
   friend class base::RefCounted<HostResolver>;
 

net/base/host_resolver_impl.h

@@ -99,7 +99,7 @@ class HostResolverImpl : public HostResolver,
   virtual HostResolverImpl* GetAsHostResolverImpl() { return this; }
 
   // TODO(eroman): hack for http://crbug.com/15513
-  virtual void Shutdown();
+  void Shutdown();
 
   // Returns the cache this resolver uses, or NULL if caching is disabled.
   HostCache* cache() { return cache_.get(); }

net/base/net_log_event_type_list.h

@@ -110,18 +110,9 @@ EVENT_TYPE(PROXY_RESOLVER_V8_DNS_RESOLVE)
 // Measures the time taken to execute the "dnsResolveEx()" javascript binding.
 EVENT_TYPE(PROXY_RESOLVER_V8_DNS_RESOLVE_EX)
 
-// Measures the time that a proxy resolve request was stalled waiting for a
+// Measures the time that a proxy resolve request was stalled waiting for the
 // proxy resolver thread to free-up.
-EVENT_TYPE(WAITING_FOR_PROXY_RESOLVER_THREAD)
-
-// This event is emitted just before a PAC request is bound to a thread. It
-// contains these parameters:
-//
-//   {
-//     "thread_number": <Identifier for the PAC thread that is going to
-//                       run this request>
-//   }
-EVENT_TYPE(SUBMITTED_TO_RESOLVER_THREAD)
+EVENT_TYPE(WAITING_FOR_SINGLE_PROXY_RESOLVER_THREAD)
 
 // ------------------------------------------------------------------------
 // ClientSocket

net/net.gyp

@@ -396,8 +396,6 @@
         'ocsp/nss_ocsp.h',
         'proxy/init_proxy_resolver.cc',
         'proxy/init_proxy_resolver.h',
-        'proxy/multi_threaded_proxy_resolver.cc',
-        'proxy/multi_threaded_proxy_resolver.h',
         'proxy/proxy_bypass_rules.cc',
         'proxy/proxy_bypass_rules.h',
         'proxy/proxy_config.cc',
@@ -433,6 +431,8 @@
         'proxy/proxy_server.h',
         'proxy/proxy_service.cc',
         'proxy/proxy_service.h',
+        'proxy/single_threaded_proxy_resolver.cc',
+        'proxy/single_threaded_proxy_resolver.h',
         'proxy/sync_host_resolver_bridge.cc',
         'proxy/sync_host_resolver_bridge.h',
         'socket/client_socket.h',
@@ -723,7 +723,6 @@
         'http/url_security_manager_unittest.cc',
         'proxy/init_proxy_resolver_unittest.cc',
         'proxy/mock_proxy_resolver.h',
-        'proxy/multi_threaded_proxy_resolver_unittest.cc',
         'proxy/proxy_bypass_rules_unittest.cc',
         'proxy/proxy_config_service_linux_unittest.cc',
         'proxy/proxy_config_service_win_unittest.cc',
@@ -734,6 +733,7 @@
         'proxy/proxy_script_fetcher_unittest.cc',
         'proxy/proxy_server_unittest.cc',
         'proxy/proxy_service_unittest.cc',
+        'proxy/single_threaded_proxy_resolver_unittest.cc',
         'proxy/sync_host_resolver_bridge_unittest.cc',
         'socket/client_socket_pool_base_unittest.cc',
         'socket/socks5_client_socket_unittest.cc',