| Index: net/websockets/websocket_channel.cc
|
| diff --git a/net/websockets/websocket_channel.cc b/net/websockets/websocket_channel.cc
|
| index b5668e4ef06e0652de1701977169dc9741a82e31..9566422716475d76131e1939f44e90e3d3172384 100644
|
| --- a/net/websockets/websocket_channel.cc
|
| +++ b/net/websockets/websocket_channel.cc
|
| @@ -28,6 +28,7 @@
|
| #include "net/websockets/websocket_handshake_response_info.h"
|
| #include "net/websockets/websocket_mux.h"
|
| #include "net/websockets/websocket_stream.h"
|
| +#include "url/origin.h"
|
|
|
| namespace net {
|
|
|
| @@ -279,7 +280,7 @@ WebSocketChannel::~WebSocketChannel() {
|
| void WebSocketChannel::SendAddChannelRequest(
|
| const GURL& socket_url,
|
| const std::vector<std::string>& requested_subprotocols,
|
| - const GURL& origin) {
|
| + const url::Origin& origin) {
|
| // Delegate to the tested version.
|
| SendAddChannelRequestWithSuppliedCreator(
|
| socket_url,
|
| @@ -406,7 +407,7 @@ void WebSocketChannel::StartClosingHandshake(uint16 code,
|
| void WebSocketChannel::SendAddChannelRequestForTesting(
|
| const GURL& socket_url,
|
| const std::vector<std::string>& requested_subprotocols,
|
| - const GURL& origin,
|
| + const url::Origin& origin,
|
| const WebSocketStreamCreator& creator) {
|
| SendAddChannelRequestWithSuppliedCreator(
|
| socket_url, requested_subprotocols, origin, creator);
|
| @@ -420,7 +421,7 @@ void WebSocketChannel::SetClosingHandshakeTimeoutForTesting(
|
| void WebSocketChannel::SendAddChannelRequestWithSuppliedCreator(
|
| const GURL& socket_url,
|
| const std::vector<std::string>& requested_subprotocols,
|
| - const GURL& origin,
|
| + const url::Origin& origin,
|
| const WebSocketStreamCreator& creator) {
|
| DCHECK_EQ(FRESHLY_CONSTRUCTED, state_);
|
| if (!socket_url.SchemeIsWSOrWSS()) {
|
|
|