diff options
| author | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-25 01:38:43 +0000 |
|---|---|---|
| committer | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-25 01:38:43 +0000 |
| commit | 733b7a6d83ad1c1394408f1c089cee2068135d44 (patch) | |
| tree | b1ef08e4d72977d440a63045dfff94047b063ee4 /net/proxy/proxy_service.h | |
| parent | 7a7a13b4d8ff1e790da262addcdeb84232539ebe (diff) | |
| download | chromium_src-733b7a6d83ad1c1394408f1c089cee2068135d44.zip chromium_src-733b7a6d83ad1c1394408f1c089cee2068135d44.tar.gz chromium_src-733b7a6d83ad1c1394408f1c089cee2068135d44.tar.bz2 | |
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
Diffstat (limited to 'net/proxy/proxy_service.h')
| -rw-r--r-- | net/proxy/proxy_service.h | 8 |
1 files changed, 8 insertions, 0 deletions
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<ProxyService>, // 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( |