summaryrefslogtreecommitdiffstats
path: root/net/spdy/spdy_test_util.cc
diff options
context:
space:
mode:
authorerikchen@google.com <erikchen@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-02 19:13:24 +0000
committererikchen@google.com <erikchen@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-02 19:13:24 +0000
commitb261d0ea539baa5c3d997f0d98936fcaf319773c (patch)
tree0ab9d2069840fe98b67878fcab414bc0937c5544 /net/spdy/spdy_test_util.cc
parentfa038d558eb0ec799555d7433e9768d6de860968 (diff)
downloadchromium_src-b261d0ea539baa5c3d997f0d98936fcaf319773c.zip
chromium_src-b261d0ea539baa5c3d997f0d98936fcaf319773c.tar.gz
chromium_src-b261d0ea539baa5c3d997f0d98936fcaf319773c.tar.bz2
SpdySessionPool now identifies SpdySessions by both HostPortPair and proxy settings.
This ensures SpdySessions are not improperly reused. TEST=net_unittests BUG=49874 Review URL: http://codereview.chromium.org/3047032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54577 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/spdy/spdy_test_util.cc')
-rw-r--r--net/spdy/spdy_test_util.cc8
1 files changed, 8 insertions, 0 deletions
diff --git a/net/spdy/spdy_test_util.cc b/net/spdy/spdy_test_util.cc
index 94b9889..aa566d1 100644
--- a/net/spdy/spdy_test_util.cc
+++ b/net/spdy/spdy_test_util.cc
@@ -599,4 +599,12 @@ int CombineFrames(const spdy::SpdyFrame** frames, int num_frames,
return total_len;
}
+// This creates a proxy for testing purposes.
+// |proxy| should be in the form "myproxy:70".
+ProxyService* SpdyCreateFixedProxyService(const std::string& proxy) {
+ net::ProxyConfig proxy_config;
+ proxy_config.proxy_rules().ParseFromString(proxy);
+ return ProxyService::CreateFixed(proxy_config);
+}
+
} // namespace net