| Index: content/browser/renderer_host/websocket_dispatcher_host_unittest.cc
|
| diff --git a/content/browser/renderer_host/websocket_dispatcher_host_unittest.cc b/content/browser/renderer_host/websocket_dispatcher_host_unittest.cc
|
| index d00d43f36f4392614a195da6af1a867de50d1c70..4544838b1b9b7e87014289e19d84fd61dccfc0d0 100644
|
| --- a/content/browser/renderer_host/websocket_dispatcher_host_unittest.cc
|
| +++ b/content/browser/renderer_host/websocket_dispatcher_host_unittest.cc
|
| @@ -129,6 +129,7 @@ class WebSocketDispatcherHostTest : public ::testing::Test {
|
| socket_url,
|
| requested_protocols,
|
| origin,
|
| + "",
|
| render_frame_id);
|
| if (!dispatcher_host_->OnMessageReceived(message))
|
| return false;
|
| @@ -151,6 +152,7 @@ class WebSocketDispatcherHostTest : public ::testing::Test {
|
| socket_url,
|
| requested_protocols,
|
| origin,
|
| + "",
|
| render_frame_id);
|
| if (!dispatcher_host_->OnMessageReceived(messageAddChannelRequest))
|
| return false;
|
| @@ -226,7 +228,7 @@ TEST_F(WebSocketDispatcherHostTest, AddChannelRequest) {
|
| url::Origin origin(GURL("http://example.com"));
|
| int render_frame_id = -2;
|
| WebSocketHostMsg_AddChannelRequest message(
|
| - routing_id, socket_url, requested_protocols, origin, render_frame_id);
|
| + routing_id, socket_url, requested_protocols, origin, "", render_frame_id);
|
|
|
| ASSERT_TRUE(dispatcher_host_->OnMessageReceived(message));
|
|
|
| @@ -260,7 +262,7 @@ TEST_F(WebSocketDispatcherHostTest, SendFrame) {
|
| url::Origin origin(GURL("http://example.com"));
|
| int render_frame_id = -2;
|
| WebSocketHostMsg_AddChannelRequest add_channel_message(
|
| - routing_id, socket_url, requested_protocols, origin, render_frame_id);
|
| + routing_id, socket_url, requested_protocols, origin, "", render_frame_id);
|
|
|
| ASSERT_TRUE(dispatcher_host_->OnMessageReceived(add_channel_message));
|
|
|
| @@ -289,10 +291,10 @@ TEST_F(WebSocketDispatcherHostTest, SendFrame) {
|
| TEST_F(WebSocketDispatcherHostTest, Destruct) {
|
| WebSocketHostMsg_AddChannelRequest message1(
|
| 123, GURL("ws://example.com/test"), std::vector<std::string>(),
|
| - url::Origin(GURL("http://example.com")), -1);
|
| + url::Origin(GURL("http://example.com")), "", -1);
|
| WebSocketHostMsg_AddChannelRequest message2(
|
| 456, GURL("ws://example.com/test2"), std::vector<std::string>(),
|
| - url::Origin(GURL("http://example.com")), -1);
|
| + url::Origin(GURL("http://example.com")), "", -1);
|
|
|
| ASSERT_TRUE(dispatcher_host_->OnMessageReceived(message1));
|
| ASSERT_TRUE(dispatcher_host_->OnMessageReceived(message2));
|
| @@ -419,7 +421,7 @@ TEST_F(WebSocketDispatcherHostTest, InvalidScheme) {
|
| url::Origin origin(GURL("http://example.com"));
|
| int render_frame_id = -2;
|
| WebSocketHostMsg_AddChannelRequest message(
|
| - routing_id, socket_url, requested_protocols, origin, render_frame_id);
|
| + routing_id, socket_url, requested_protocols, origin, "", render_frame_id);
|
|
|
| ASSERT_TRUE(dispatcher_host_->OnMessageReceived(message));
|
|
|
|
|