summaryrefslogtreecommitdiffstats
path: root/net/http/http_response_body_drainer_unittest.cc
diff options
context:
space:
mode:
authorjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-07 08:10:14 +0000
committerjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-07 08:10:14 +0000
commit0107e570df7dece5fee0c34cc023c311dd7a5799 (patch)
tree020653e32f95df1033b6f4ce45c7170f142da684 /net/http/http_response_body_drainer_unittest.cc
parente088e2922e961659768eb406714cac79e021e5fc (diff)
downloadchromium_src-0107e570df7dece5fee0c34cc023c311dd7a5799.zip
chromium_src-0107e570df7dece5fee0c34cc023c311dd7a5799.tar.gz
chromium_src-0107e570df7dece5fee0c34cc023c311dd7a5799.tar.bz2
Revert 77075 - Don't block on stream requests on Alternate-Protocol.
Basically, after we get an HTTP header giving an Alternate-Protocol, we'll end up in a state where we're probably going to issue more HTTP requests. We have the already warm single HTTP connection. We probably don't have a SPDY session open. Previously, once we notice Alternate-Protocol, we'd block on trying to set up the new SPDY session, even though we still have the HTTP connection. Change this so we keep using HTTP until the SPDY session on the Alternate-Protocol becomes available, then we switch over to it. BUG=69688,75000 TEST=Browse to belshe.com. Examine net-internals to make sure it works. Test over a variety of connections (direct / various proxy types). Review URL: http://codereview.chromium.org/6610034 TBR=willchan@chromium.org Review URL: http://codereview.chromium.org/6621040 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77117 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http/http_response_body_drainer_unittest.cc')
-rw-r--r--net/http/http_response_body_drainer_unittest.cc2
1 files changed, 0 insertions, 2 deletions
diff --git a/net/http/http_response_body_drainer_unittest.cc b/net/http/http_response_body_drainer_unittest.cc
index ea9d299..5745865 100644
--- a/net/http/http_response_body_drainer_unittest.cc
+++ b/net/http/http_response_body_drainer_unittest.cc
@@ -111,8 +111,6 @@ class MockHttpStream : public HttpStream {
virtual bool IsResponseBodyComplete() const { return is_complete_; }
- virtual bool IsSpdyHttpStream() const { return false; }
-
// Methods to tweak/observer mock behavior:
void StallReadsForever() { stall_reads_forever_ = true; }