From 733b7a6d83ad1c1394408f1c089cee2068135d44 Mon Sep 17 00:00:00 2001 From: "eroman@chromium.org" Date: Wed, 25 Aug 2010 01:38:43 +0000 Subject: Make sure the key into the spdy session pool identifies the actual proxy used, and not the full list of possible proxies for the URL. BUG=52668 TEST=SpdyNetworkTransactionTest.DirectConnectProxyReconnect Review URL: http://codereview.chromium.org/3192011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57274 0039d316-1c4b-4281-b951-d872f2087c98 --- net/proxy/proxy_service.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'net/proxy/proxy_service.h') diff --git a/net/proxy/proxy_service.h b/net/proxy/proxy_service.h index 3a3f7da..8f30327 100644 --- a/net/proxy/proxy_service.h +++ b/net/proxy/proxy_service.h @@ -178,8 +178,16 @@ class ProxyService : public base::RefCountedThreadSafe, // Creates a proxy service that always fails to fetch the proxy configuration, // so it falls back to direct connect. + // TODO(eroman): Rename to CreateDirect(). static ProxyService* CreateNull(); + // This method is used by tests to create a ProxyService that returns a + // hardcoded proxy fallback list (|pac_string|) for every URL. + // + // |pac_string| is a list of proxy servers, in the format that a PAC script + // would return it. For example, "PROXY foobar:99; SOCKS fml:2; DIRECT" + static ProxyService* CreateFixedFromPacResult(const std::string& pac_string); + // Creates a config service appropriate for this platform that fetches the // system proxy settings. static ProxyConfigService* CreateSystemProxyConfigService( -- cgit v1.1