| Index: net/websockets/websocket_channel.cc
|
| diff --git a/net/websockets/websocket_channel.cc b/net/websockets/websocket_channel.cc
|
| index ba100ecea2a6e9e581322896132424008442e060..a12d4f948f40c950659468c0a6b5259558120041 100644
|
| --- a/net/websockets/websocket_channel.cc
|
| +++ b/net/websockets/websocket_channel.cc
|
| @@ -338,11 +338,12 @@ void WebSocketChannel::SendAddChannelRequest(
|
| const GURL& socket_url,
|
| const std::vector<std::string>& requested_subprotocols,
|
| const url::Origin& origin,
|
| + const GURL& first_party_for_cookies,
|
| const std::string& additional_headers) {
|
| // Delegate to the tested version.
|
| SendAddChannelRequestWithSuppliedCreator(
|
| - socket_url, requested_subprotocols, origin, additional_headers,
|
| - base::Bind(&WebSocketStream::CreateAndConnectStream));
|
| + socket_url, requested_subprotocols, origin, first_party_for_cookies,
|
| + additional_headers, base::Bind(&WebSocketStream::CreateAndConnectStream));
|
| }
|
|
|
| void WebSocketChannel::SetState(State new_state) {
|
| @@ -544,10 +545,12 @@ void WebSocketChannel::SendAddChannelRequestForTesting(
|
| const GURL& socket_url,
|
| const std::vector<std::string>& requested_subprotocols,
|
| const url::Origin& origin,
|
| + const GURL& first_party_for_cookies,
|
| const std::string& additional_headers,
|
| const WebSocketStreamCreator& creator) {
|
| SendAddChannelRequestWithSuppliedCreator(socket_url, requested_subprotocols,
|
| - origin, additional_headers, creator);
|
| + origin, first_party_for_cookies,
|
| + additional_headers, creator);
|
| }
|
|
|
| void WebSocketChannel::SetClosingHandshakeTimeoutForTesting(
|
| @@ -564,6 +567,7 @@ void WebSocketChannel::SendAddChannelRequestWithSuppliedCreator(
|
| const GURL& socket_url,
|
| const std::vector<std::string>& requested_subprotocols,
|
| const url::Origin& origin,
|
| + const GURL& first_party_for_cookies,
|
| const std::string& additional_headers,
|
| const WebSocketStreamCreator& creator) {
|
| DCHECK_EQ(FRESHLY_CONSTRUCTED, state_);
|
| @@ -578,8 +582,9 @@ void WebSocketChannel::SendAddChannelRequestWithSuppliedCreator(
|
| std::unique_ptr<WebSocketStream::ConnectDelegate> connect_delegate(
|
| new ConnectDelegate(this));
|
| stream_request_ = creator.Run(socket_url_, requested_subprotocols, origin,
|
| - additional_headers, url_request_context_,
|
| - BoundNetLog(), std::move(connect_delegate));
|
| + first_party_for_cookies, additional_headers,
|
| + url_request_context_, BoundNetLog(),
|
| + std::move(connect_delegate));
|
| SetState(CONNECTING);
|
| }
|
|
|
|
|