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

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

1 files changed, 1 insertions, 18 deletions

diff --git a/net/proxy/sync_host_resolver_bridge.h b/net/proxy/sync_host_resolver_bridge.h
index 4d25b4d..b02d496 100644
--- a/net/proxy/sync_host_resolver_bridge.h
+++ b/net/proxy/sync_host_resolver_bridge.h
@@ -7,7 +7,6 @@
 
 #include "base/scoped_ptr.h"
 #include "net/base/host_resolver.h"
-#include "net/proxy/single_threaded_proxy_resolver.h"
 
 class MessageLoop;
 
@@ -35,7 +34,7 @@ class SyncHostResolverBridge : public HostResolver {
   // The Shutdown() method should be called prior to destruction, from
   // |host_resolver_loop_|. It aborts any in progress synchronous resolves, to
   // prevent deadlocks from happening.
-  void Shutdown();
+  virtual void Shutdown();
 
  private:
   class Core;
@@ -44,22 +43,6 @@ class SyncHostResolverBridge : public HostResolver {
   scoped_refptr<Core> core_;
 };
 
-// Subclass of SingleThreadedProxyResolver that additionally calls
-// |bridged_host_resolver_->Shutdown()| during its destructor.
-class SingleThreadedProxyResolverUsingBridgedHostResolver
-    : public SingleThreadedProxyResolver {
- public:
-  SingleThreadedProxyResolverUsingBridgedHostResolver(
-      ProxyResolver* proxy_resolver,
-      SyncHostResolverBridge* bridged_host_resolver);
-
-  virtual ~SingleThreadedProxyResolverUsingBridgedHostResolver();
-
- private:
-  scoped_refptr<SyncHostResolverBridge> bridged_host_resolver_;
-};
-
-
 }  // namespace net
 
 #endif  // NET_PROXY_SYNC_HOST_RESOLVER_BRIDGE_H_