WebSocket over SPDY: handshake support for both of SPDY/2 and SPDY/3

net/websockets/websocket_handshake_handler_unittest.cc

Index: net/websockets/websocket_handshake_handler_unittest.cc
diff --git a/net/websockets/websocket_handshake_handler_unittest.cc b/net/websockets/websocket_handshake_handler_unittest.cc
index 48884011c44c340b8a61823f5aa73d06ea49a5ae..80a0d76bd4aab0c386e6a6c837675e77634b8adc 100644
--- a/net/websockets/websocket_handshake_handler_unittest.cc
+++ b/net/websockets/websocket_handshake_handler_unittest.cc
@@ -466,151 +466,4 @@ TEST(WebSocketHandshakeHandlerTest, HttpRequestResponseHybi06Handshake) {
   EXPECT_EQ(kHandshakeResponseExpectedMessage, response_handler.GetResponse());
 }
 
-TEST(WebSocketHandshakeHandlerTest, SpdyRequestResponse) {
-  WebSocketHandshakeRequestHandler request_handler;
-
-  static const char kHandshakeRequestMessage[] =
-      "GET /demo HTTP/1.1\r\n"
-      "Host: example.com\r\n"
-      "Upgrade: websocket\r\n"
-      "Connection: Upgrade\r\n"
-      "Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\n"
-      "Origin: http://example.com\r\n"
-      "Sec-WebSocket-Protocol: sample\r\n"
-      "Sec-WebSocket-Extensions: foo\r\n"
-      "Sec-WebSocket-Version: 13\r\n"
-      "\r\n";
-
-  EXPECT_TRUE(request_handler.ParseRequest(kHandshakeRequestMessage,
-                                           strlen(kHandshakeRequestMessage)));
-  EXPECT_EQ(13, request_handler.protocol_version());
-
-  GURL url("ws://example.com/demo");
-  std::string challenge;
-  SpdyHeaderBlock headers;
-  ASSERT_TRUE(request_handler.GetRequestHeaderBlock(url, &headers, &challenge));
-
-  EXPECT_EQ(url.path(), headers["path"]);
-  EXPECT_TRUE(headers.find("upgrade") == headers.end());
-  EXPECT_TRUE(headers.find("Upgrade") == headers.end());
-  EXPECT_TRUE(headers.find("connection") == headers.end());
-  EXPECT_TRUE(headers.find("Connection") == headers.end());
-  EXPECT_TRUE(headers.find("Sec-WebSocket-Key") == headers.end());
-  EXPECT_TRUE(headers.find("sec-websocket-key") == headers.end());
-  EXPECT_TRUE(headers.find("Sec-WebSocket-Version") == headers.end());
-  EXPECT_TRUE(headers.find("sec-webSocket-version") == headers.end());
-  EXPECT_EQ("example.com", headers["host"]);
-  EXPECT_EQ("http://example.com", headers["origin"]);
-  EXPECT_EQ("sample", headers["sec-websocket-protocol"]);
-  EXPECT_EQ("foo", headers["sec-websocket-extensions"]);
-  EXPECT_EQ("ws", headers["scheme"]);
-  EXPECT_EQ("WebSocket/13", headers["version"]);
-
-  const char expected_challenge[] = "dGhlIHNhbXBsZSBub25jZQ==";
-
-  EXPECT_EQ(expected_challenge, challenge);
-
-  headers.clear();
-
-  headers["status"] = "101 Switching Protocols";
-  headers["sec-websocket-protocol"] = "sample";
-  headers["sec-websocket-extensions"] = "foo";
-
-  WebSocketHandshakeResponseHandler response_handler;
-  response_handler.set_protocol_version(13);
-  EXPECT_TRUE(response_handler.ParseResponseHeaderBlock(headers, challenge));
-  EXPECT_TRUE(response_handler.HasResponse());
-
-  // Note that order of sec-websocket-* is sensitive with hash_map order.
-  static const char kHandshakeResponseExpectedMessage[] =
-      "HTTP/1.1 101 Switching Protocols\r\n"
-      "Upgrade: websocket\r\n"
-      "Connection: Upgrade\r\n"
-      "Sec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\n"
-      "sec-websocket-extensions: foo\r\n"
-      "sec-websocket-protocol: sample\r\n"
-      "\r\n";
-
-  EXPECT_EQ(kHandshakeResponseExpectedMessage, response_handler.GetResponse());
-}
-
-TEST(WebSocketHandshakeHandlerTest, SpdyRequestResponseWithCookies) {
-  WebSocketHandshakeRequestHandler request_handler;
-
-  // Note that websocket won't use multiple headers in request now.
-  static const char kHandshakeRequestMessage[] =
-      "GET /demo HTTP/1.1\r\n"
-      "Host: example.com\r\n"
-      "Upgrade: websocket\r\n"
-      "Connection: Upgrade\r\n"
-      "Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\n"
-      "Origin: http://example.com\r\n"
-      "Sec-WebSocket-Protocol: sample\r\n"
-      "Sec-WebSocket-Extensions: foo\r\n"
-      "Sec-WebSocket-Version: 13\r\n"
-      "Cookie: WK-websocket-test=1; WK-websocket-test-httponly=1\r\n"
-      "\r\n";
-
-  EXPECT_TRUE(request_handler.ParseRequest(kHandshakeRequestMessage,
-                                           strlen(kHandshakeRequestMessage)));
-  EXPECT_EQ(13, request_handler.protocol_version());
-
-  GURL url("ws://example.com/demo");
-  std::string challenge;
-  SpdyHeaderBlock headers;
-  ASSERT_TRUE(request_handler.GetRequestHeaderBlock(url, &headers, &challenge));
-
-  EXPECT_EQ(url.path(), headers["path"]);
-  EXPECT_TRUE(headers.find("upgrade") == headers.end());
-  EXPECT_TRUE(headers.find("Upgrade") == headers.end());
-  EXPECT_TRUE(headers.find("connection") == headers.end());
-  EXPECT_TRUE(headers.find("Connection") == headers.end());
-  EXPECT_TRUE(headers.find("Sec-WebSocket-Key") == headers.end());
-  EXPECT_TRUE(headers.find("sec-websocket-key") == headers.end());
-  EXPECT_TRUE(headers.find("Sec-WebSocket-Version") == headers.end());
-  EXPECT_TRUE(headers.find("sec-webSocket-version") == headers.end());
-  EXPECT_EQ("example.com", headers["host"]);
-  EXPECT_EQ("http://example.com", headers["origin"]);
-  EXPECT_EQ("sample", headers["sec-websocket-protocol"]);
-  EXPECT_EQ("foo", headers["sec-websocket-extensions"]);
-  EXPECT_EQ("ws", headers["scheme"]);
-  EXPECT_EQ("WebSocket/13", headers["version"]);
-  EXPECT_EQ("WK-websocket-test=1; WK-websocket-test-httponly=1",
-            headers["cookie"]);
-
-  const char expected_challenge[] = "dGhlIHNhbXBsZSBub25jZQ==";
-
-  EXPECT_EQ(expected_challenge, challenge);
-
-  headers.clear();
-
-  headers["status"] = "101 Switching Protocols";
-  headers["sec-websocket-protocol"] = "sample";
-  headers["sec-websocket-extensions"] = "foo";
-  std::string cookie = "WK-websocket-test=1";
-  cookie.append(1, '\0');
-  cookie += "WK-websocket-test-httponly=1; HttpOnly";
-  headers["set-cookie"] = cookie;
-
-
-  WebSocketHandshakeResponseHandler response_handler;
-  response_handler.set_protocol_version(13);
-  EXPECT_TRUE(response_handler.ParseResponseHeaderBlock(headers, challenge));
-  EXPECT_TRUE(response_handler.HasResponse());
-
-  // Note that order of sec-websocket-* is sensitive with hash_map order.
-  static const char kHandshakeResponseExpectedMessage[] =
-      "HTTP/1.1 101 Switching Protocols\r\n"
-      "Upgrade: websocket\r\n"
-      "Connection: Upgrade\r\n"
-      "Sec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\n"
-      "sec-websocket-extensions: foo\r\n"
-      "sec-websocket-protocol: sample\r\n"
-      "set-cookie: WK-websocket-test=1\r\n"
-      "set-cookie: WK-websocket-test-httponly=1; HttpOnly\r\n"
-      "\r\n";
-
-  EXPECT_EQ(kHandshakeResponseExpectedMessage, response_handler.GetResponse());
-}
-
 }  // namespace net