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

Unified Diff: net/websockets/websocket_net_log_params_unittest.cc

Issue 15662008: Make net and ipc explicitly use the base namespace for Values. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/websockets/websocket_net_log_params.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/websockets/websocket_net_log_params_unittest.cc
diff --git a/net/websockets/websocket_net_log_params_unittest.cc b/net/websockets/websocket_net_log_params_unittest.cc
index 0519390f17002ab9159ba17f2a903c8f8f39417b..b1c98570402d18dc96210c119d722a0f3dddd89f 100644
--- a/net/websockets/websocket_net_log_params_unittest.cc
+++ b/net/websockets/websocket_net_log_params_unittest.cc
@@ -12,19 +12,21 @@
#include "testing/gtest/include/gtest/gtest.h"
TEST(NetLogWebSocketHandshakeParameterTest, ToValue) {
- ListValue* list = new ListValue();
- list->Append(new StringValue("GET /demo HTTP/1.1"));
- list->Append(new StringValue("Host: example.com"));
- list->Append(new StringValue("Connection: Upgrade"));
- list->Append(new StringValue("Sec-WebSocket-Key2: 12998 5 Y3 1 .P00"));
- list->Append(new StringValue("Sec-WebSocket-Protocol: sample"));
- list->Append(new StringValue("Upgrade: WebSocket"));
- list->Append(new StringValue("Sec-WebSocket-Key1: 4 @1 46546xW%0l 1 5"));
- list->Append(new StringValue("Origin: http://example.com"));
- list->Append(new StringValue(std::string()));
- list->Append(new StringValue("\\x00\\x01\\x0a\\x0d\\xff\\xfe\\x0d\\x0a"));
-
- DictionaryValue expected;
+ base::ListValue* list = new base::ListValue();
+ list->Append(new base::StringValue("GET /demo HTTP/1.1"));
+ list->Append(new base::StringValue("Host: example.com"));
+ list->Append(new base::StringValue("Connection: Upgrade"));
+ 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("Origin: http://example.com"));
+ list->Append(new base::StringValue(std::string()));
+ 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);
@@ -40,7 +42,7 @@ TEST(NetLogWebSocketHandshakeParameterTest, ToValue) {
"\r\n" +
key;
- scoped_ptr<Value> actual(
+ scoped_ptr<base::Value> actual(
net::NetLogWebSocketHandshakeCallback(&testInput,
net::NetLog::LOG_BASIC));
« no previous file with comments | « net/websockets/websocket_net_log_params.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698