summaryrefslogtreecommitdiffstats
path: root/net/websockets
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-30 02:58:29 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-30 02:58:29 +0000
commit714384c0a2fd6009b24f047de6ffa47a8d709c65 (patch)
tree66f0df2f4ea03183c125c8c6643ca8e457810004 /net/websockets
parent13a571ebab723825adf866bfe8b0fd952b338339 (diff)
downloadchromium_src-714384c0a2fd6009b24f047de6ffa47a8d709c65.zip
chromium_src-714384c0a2fd6009b24f047de6ffa47a8d709c65.tar.gz
chromium_src-714384c0a2fd6009b24f047de6ffa47a8d709c65.tar.bz2
Revert 214289 "[SPDY] Add strings and constants for HTTP/2 draft 04"
> [SPDY] Add strings and constants for HTTP/2 draft 04 > > There are still differences between SPDY/4 and HTTP/2 draft 04; those > will be ironed out in upcoming CLs. > > Add kProtoHTTP2Draft04 to SPDY NextProto-parametrized tests. > > Move NextProto -> SpdyMajorVersion conversion to buffered_spdy_framer.h. > > Remove unused SpdyMajorVersion -> NextProto conversion. > > Clean up HttpResponseInfo::ConnectionInfo a bit and add a TODO to > remove it. > > Parametrize SSLClientSocketPoolTest on NextProto. > > BUG=265615 > R=darin@chromium.org, rch@chromium.org > > Review URL: https://codereview.chromium.org/21131002 TBR=akalin@chromium.org Review URL: https://codereview.chromium.org/21202002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@214296 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/websockets')
-rw-r--r--net/websockets/websocket_handshake_handler_spdy_unittest.cc3
-rw-r--r--net/websockets/websocket_job_unittest.cc3
2 files changed, 2 insertions, 4 deletions
diff --git a/net/websockets/websocket_handshake_handler_spdy_unittest.cc b/net/websockets/websocket_handshake_handler_spdy_unittest.cc
index a8276cd..83c519d 100644
--- a/net/websockets/websocket_handshake_handler_spdy_unittest.cc
+++ b/net/websockets/websocket_handshake_handler_spdy_unittest.cc
@@ -28,8 +28,7 @@ class WebSocketHandshakeHandlerSpdyTest
INSTANTIATE_TEST_CASE_P(
NextProto,
WebSocketHandshakeHandlerSpdyTest,
- testing::Values(kProtoSPDY2, kProtoSPDY3, kProtoSPDY31, kProtoSPDY4a2,
- kProtoHTTP2Draft04));
+ testing::Values(kProtoSPDY2, kProtoSPDY3, kProtoSPDY31, kProtoSPDY4a2));
TEST_P(WebSocketHandshakeHandlerSpdyTest, RequestResponse) {
WebSocketHandshakeRequestHandler request_handler;
diff --git a/net/websockets/websocket_job_unittest.cc b/net/websockets/websocket_job_unittest.cc
index 434796d..4ee0132 100644
--- a/net/websockets/websocket_job_unittest.cc
+++ b/net/websockets/websocket_job_unittest.cc
@@ -597,8 +597,7 @@ void WebSocketJobTest::TestSlowHandshake() {
INSTANTIATE_TEST_CASE_P(
NextProto,
WebSocketJobTest,
- testing::Values(kProtoSPDY2, kProtoSPDY3, kProtoSPDY31, kProtoSPDY4a2,
- kProtoHTTP2Draft04));
+ testing::Values(kProtoSPDY2, kProtoSPDY3, kProtoSPDY31, kProtoSPDY4a2));
TEST_P(WebSocketJobTest, DelayedCookies) {
WebSocketJob::set_websocket_over_spdy_enabled(true);