Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(34)

Side by Side Diff: net/websockets/websocket_net_log_params_unittest.cc

Issue 13145003: Rewrite std::string("") to std::string(), Linux edition. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Ugh Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « net/url_request/url_request_unittest.cc ('k') | ppapi/cpp/dev/text_input_dev.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/websockets/websocket_net_log_params.h" 5 #include "net/websockets/websocket_net_log_params.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
11 #include "base/values.h" 11 #include "base/values.h"
12 #include "testing/gtest/include/gtest/gtest.h" 12 #include "testing/gtest/include/gtest/gtest.h"
13 13
14 TEST(NetLogWebSocketHandshakeParameterTest, ToValue) { 14 TEST(NetLogWebSocketHandshakeParameterTest, ToValue) {
15 ListValue* list = new ListValue(); 15 ListValue* list = new ListValue();
16 list->Append(new StringValue("GET /demo HTTP/1.1")); 16 list->Append(new StringValue("GET /demo HTTP/1.1"));
17 list->Append(new StringValue("Host: example.com")); 17 list->Append(new StringValue("Host: example.com"));
18 list->Append(new StringValue("Connection: Upgrade")); 18 list->Append(new StringValue("Connection: Upgrade"));
19 list->Append(new StringValue("Sec-WebSocket-Key2: 12998 5 Y3 1 .P00")); 19 list->Append(new StringValue("Sec-WebSocket-Key2: 12998 5 Y3 1 .P00"));
20 list->Append(new StringValue("Sec-WebSocket-Protocol: sample")); 20 list->Append(new StringValue("Sec-WebSocket-Protocol: sample"));
21 list->Append(new StringValue("Upgrade: WebSocket")); 21 list->Append(new StringValue("Upgrade: WebSocket"));
22 list->Append(new StringValue("Sec-WebSocket-Key1: 4 @1 46546xW%0l 1 5")); 22 list->Append(new StringValue("Sec-WebSocket-Key1: 4 @1 46546xW%0l 1 5"));
23 list->Append(new StringValue("Origin: http://example.com")); 23 list->Append(new StringValue("Origin: http://example.com"));
24 list->Append(new StringValue("")); 24 list->Append(new StringValue(std::string()));
25 list->Append(new StringValue("\\x00\\x01\\x0a\\x0d\\xff\\xfe\\x0d\\x0a")); 25 list->Append(new StringValue("\\x00\\x01\\x0a\\x0d\\xff\\xfe\\x0d\\x0a"));
26 26
27 DictionaryValue expected; 27 DictionaryValue expected;
28 expected.Set("headers", list); 28 expected.Set("headers", list);
29 29
30 const std::string key("\x00\x01\x0a\x0d\xff\xfe\x0d\x0a", 8); 30 const std::string key("\x00\x01\x0a\x0d\xff\xfe\x0d\x0a", 8);
31 const std::string testInput = 31 const std::string testInput =
32 "GET /demo HTTP/1.1\r\n" 32 "GET /demo HTTP/1.1\r\n"
33 "Host: example.com\r\n" 33 "Host: example.com\r\n"
34 "Connection: Upgrade\r\n" 34 "Connection: Upgrade\r\n"
35 "Sec-WebSocket-Key2: 12998 5 Y3 1 .P00\r\n" 35 "Sec-WebSocket-Key2: 12998 5 Y3 1 .P00\r\n"
36 "Sec-WebSocket-Protocol: sample\r\n" 36 "Sec-WebSocket-Protocol: sample\r\n"
37 "Upgrade: WebSocket\r\n" 37 "Upgrade: WebSocket\r\n"
38 "Sec-WebSocket-Key1: 4 @1 46546xW%0l 1 5\r\n" 38 "Sec-WebSocket-Key1: 4 @1 46546xW%0l 1 5\r\n"
39 "Origin: http://example.com\r\n" 39 "Origin: http://example.com\r\n"
40 "\r\n" + 40 "\r\n" +
41 key; 41 key;
42 42
43 scoped_ptr<Value> actual( 43 scoped_ptr<Value> actual(
44 net::NetLogWebSocketHandshakeCallback(&testInput, 44 net::NetLogWebSocketHandshakeCallback(&testInput,
45 net::NetLog::LOG_BASIC)); 45 net::NetLog::LOG_BASIC));
46 46
47 EXPECT_TRUE(expected.Equals(actual.get())); 47 EXPECT_TRUE(expected.Equals(actual.get()));
48 } 48 }
OLDNEW
« no previous file with comments | « net/url_request/url_request_unittest.cc ('k') | ppapi/cpp/dev/text_input_dev.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698