Index: net/websockets/websocket_handshake_handler_spdy_test.cc |
diff --git a/net/websockets/websocket_handshake_handler_spdy_test.cc b/net/websockets/websocket_handshake_handler_spdy_test.cc |
index 064bdcfb36021265a74979d9439480cdf239ade7..2451c6aab2cd8fff9c1521fb94b4a002c89a2113 100644 |
--- a/net/websockets/websocket_handshake_handler_spdy_test.cc |
+++ b/net/websockets/websocket_handshake_handler_spdy_test.cc |
@@ -25,11 +25,12 @@ class WebSocketHandshakeHandlerSpdyTest |
SpdyWebSocketTestUtil spdy_util_; |
}; |
-INSTANTIATE_TEST_CASE_P( |
- NextProto, |
- WebSocketHandshakeHandlerSpdyTest, |
- testing::Values(kProtoDeprecatedSPDY2, |
- kProtoSPDY3, kProtoSPDY31, kProtoSPDY4)); |
+INSTANTIATE_TEST_CASE_P(NextProto, |
+ WebSocketHandshakeHandlerSpdyTest, |
+ testing::Values(kProtoDeprecatedSPDY2, |
+ kProtoSPDY3, |
+ kProtoSPDY31, |
+ kProtoSPDY4)); |
TEST_P(WebSocketHandshakeHandlerSpdyTest, RequestResponse) { |
WebSocketHandshakeRequestHandler request_handler; |
@@ -52,10 +53,8 @@ TEST_P(WebSocketHandshakeHandlerSpdyTest, RequestResponse) { |
GURL url("ws://example.com/demo"); |
std::string challenge; |
SpdyHeaderBlock headers; |
- ASSERT_TRUE(request_handler.GetRequestHeaderBlock(url, |
- &headers, |
- &challenge, |
- spdy_util_.spdy_version())); |
+ ASSERT_TRUE(request_handler.GetRequestHeaderBlock( |
+ url, &headers, &challenge, spdy_util_.spdy_version())); |
EXPECT_EQ(url.path(), spdy_util_.GetHeader(headers, "path")); |
EXPECT_TRUE(spdy_util_.GetHeader(headers, "upgrade").empty()); |
@@ -124,10 +123,8 @@ TEST_P(WebSocketHandshakeHandlerSpdyTest, RequestResponseWithCookies) { |
GURL url("ws://example.com/demo"); |
std::string challenge; |
SpdyHeaderBlock headers; |
- ASSERT_TRUE(request_handler.GetRequestHeaderBlock(url, |
- &headers, |
- &challenge, |
- spdy_util_.spdy_version())); |
+ ASSERT_TRUE(request_handler.GetRequestHeaderBlock( |
+ url, &headers, &challenge, spdy_util_.spdy_version())); |
EXPECT_EQ(url.path(), spdy_util_.GetHeader(headers, "path")); |
EXPECT_TRUE(spdy_util_.GetHeader(headers, "upgrade").empty()); |
@@ -161,7 +158,6 @@ TEST_P(WebSocketHandshakeHandlerSpdyTest, RequestResponseWithCookies) { |
cookie += "WK-websocket-test-httponly=1; HttpOnly"; |
headers["set-cookie"] = cookie; |
- |
WebSocketHandshakeResponseHandler response_handler; |
EXPECT_TRUE(response_handler.ParseResponseHeaderBlock( |
headers, challenge, spdy_util_.spdy_version())); |