| Index: net/websockets/websocket_handshake_handler_test.cc
|
| diff --git a/net/websockets/websocket_handshake_handler_test.cc b/net/websockets/websocket_handshake_handler_test.cc
|
| index e59a982bf16a6e1ac384883ef12d3ac890722b2e..048950668682ed642949865ff5d05548e79d6760 100644
|
| --- a/net/websockets/websocket_handshake_handler_test.cc
|
| +++ b/net/websockets/websocket_handshake_handler_test.cc
|
| @@ -18,13 +18,9 @@
|
|
|
| namespace {
|
|
|
| -const char* const kCookieHeaders[] = {
|
| - "cookie", "cookie2"
|
| -};
|
| +const char* const kCookieHeaders[] = {"cookie", "cookie2"};
|
|
|
| -const char* const kSetCookieHeaders[] = {
|
| - "set-cookie", "set-cookie2"
|
| -};
|
| +const char* const kSetCookieHeaders[] = {"set-cookie", "set-cookie2"};
|
|
|
| } // namespace
|
|
|
| @@ -195,11 +191,11 @@ TEST(WebSocketHandshakeHandlerTest, HttpRequestResponse) {
|
| std::string value;
|
| EXPECT_TRUE(request_info.extra_headers.GetHeader("Host", &value));
|
| EXPECT_EQ("example.com", value);
|
| - EXPECT_TRUE(request_info.extra_headers.GetHeader("Sec-WebSocket-Origin",
|
| - &value));
|
| + EXPECT_TRUE(
|
| + request_info.extra_headers.GetHeader("Sec-WebSocket-Origin", &value));
|
| EXPECT_EQ("http://example.com", value);
|
| - EXPECT_TRUE(request_info.extra_headers.GetHeader("Sec-WebSocket-Protocol",
|
| - &value));
|
| + EXPECT_TRUE(
|
| + request_info.extra_headers.GetHeader("Sec-WebSocket-Protocol", &value));
|
| EXPECT_EQ("sample", value);
|
|
|
| EXPECT_EQ("dGhlIHNhbXBsZSBub25jZQ==", challenge);
|
| @@ -208,14 +204,13 @@ TEST(WebSocketHandshakeHandlerTest, HttpRequestResponse) {
|
| "HTTP/1.1 101 Switching Protocols\r\n"
|
| "Sec-WebSocket-Protocol: sample\r\n";
|
|
|
| - std::string raw_headers =
|
| - HttpUtil::AssembleRawHeaders(kHandshakeResponseHeader,
|
| - strlen(kHandshakeResponseHeader));
|
| + std::string raw_headers = HttpUtil::AssembleRawHeaders(
|
| + kHandshakeResponseHeader, strlen(kHandshakeResponseHeader));
|
| HttpResponseInfo response_info;
|
| response_info.headers = new HttpResponseHeaders(raw_headers);
|
|
|
| - EXPECT_TRUE(StartsWithASCII(response_info.headers->GetStatusLine(),
|
| - "HTTP/1.1 101 ", false));
|
| + EXPECT_TRUE(StartsWithASCII(
|
| + response_info.headers->GetStatusLine(), "HTTP/1.1 101 ", false));
|
| EXPECT_FALSE(response_info.headers->HasHeader("Upgrade"));
|
| EXPECT_FALSE(response_info.headers->HasHeader("Connection"));
|
| EXPECT_FALSE(response_info.headers->HasHeader("Sec-WebSocket-Accept"));
|
|
|