| Index: net/websockets/websocket_net_log_params_test.cc
|
| diff --git a/net/websockets/websocket_net_log_params_test.cc b/net/websockets/websocket_net_log_params_test.cc
|
| index d6d2a0d3ff536c11bd07f777c163658ac9583def..bcae758c1cb91a2f574396e3c521822e764e942d 100644
|
| --- a/net/websockets/websocket_net_log_params_test.cc
|
| +++ b/net/websockets/websocket_net_log_params_test.cc
|
| @@ -19,32 +19,31 @@ TEST(NetLogWebSocketHandshakeParameterTest, ToValue) {
|
| list->Append(new base::StringValue("Sec-WebSocket-Key2: 12998 5 Y3 1 .P00"));
|
| list->Append(new base::StringValue("Sec-WebSocket-Protocol: sample"));
|
| list->Append(new base::StringValue("Upgrade: WebSocket"));
|
| - list->Append(new base::StringValue(
|
| - "Sec-WebSocket-Key1: 4 @1 46546xW%0l 1 5"));
|
| + list->Append(
|
| + new base::StringValue("Sec-WebSocket-Key1: 4 @1 46546xW%0l 1 5"));
|
| list->Append(new base::StringValue("Origin: http://example.com"));
|
| list->Append(new base::StringValue(std::string()));
|
| - list->Append(new base::StringValue(
|
| - "\\x00\\x01\\x0a\\x0d\\xff\\xfe\\x0d\\x0a"));
|
| + list->Append(
|
| + new base::StringValue("\\x00\\x01\\x0a\\x0d\\xff\\xfe\\x0d\\x0a"));
|
|
|
| base::DictionaryValue expected;
|
| expected.Set("headers", list);
|
|
|
| const std::string key("\x00\x01\x0a\x0d\xff\xfe\x0d\x0a", 8);
|
| const std::string testInput =
|
| - "GET /demo HTTP/1.1\r\n"
|
| - "Host: example.com\r\n"
|
| - "Connection: Upgrade\r\n"
|
| - "Sec-WebSocket-Key2: 12998 5 Y3 1 .P00\r\n"
|
| - "Sec-WebSocket-Protocol: sample\r\n"
|
| - "Upgrade: WebSocket\r\n"
|
| - "Sec-WebSocket-Key1: 4 @1 46546xW%0l 1 5\r\n"
|
| - "Origin: http://example.com\r\n"
|
| - "\r\n" +
|
| - key;
|
| + "GET /demo HTTP/1.1\r\n"
|
| + "Host: example.com\r\n"
|
| + "Connection: Upgrade\r\n"
|
| + "Sec-WebSocket-Key2: 12998 5 Y3 1 .P00\r\n"
|
| + "Sec-WebSocket-Protocol: sample\r\n"
|
| + "Upgrade: WebSocket\r\n"
|
| + "Sec-WebSocket-Key1: 4 @1 46546xW%0l 1 5\r\n"
|
| + "Origin: http://example.com\r\n"
|
| + "\r\n" +
|
| + key;
|
|
|
| scoped_ptr<base::Value> actual(
|
| - net::NetLogWebSocketHandshakeCallback(&testInput,
|
| - net::NetLog::LOG_ALL));
|
| + net::NetLogWebSocketHandshakeCallback(&testInput, net::NetLog::LOG_ALL));
|
|
|
| EXPECT_TRUE(expected.Equals(actual.get()));
|
| }
|
|
|