Fix WebSocket to set first party for cookies

content/browser/renderer_host/websocket_host.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/websocket_host.h"
 
 #include <inttypes.h>
 
 #include <utility>
 
@@ skipping 378 matching lines @@
     IPC_MESSAGE_HANDLER(WebSocketHostMsg_SendBlob, OnSendBlob)
     IPC_MESSAGE_HANDLER(WebSocketMsg_SendFrame, OnSendFrame)
     IPC_MESSAGE_HANDLER(WebSocketMsg_FlowControl, OnFlowControl)
     IPC_MESSAGE_HANDLER(WebSocketMsg_DropChannel, OnDropChannel)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void WebSocketHost::OnAddChannelRequest(
-    const GURL& socket_url,
-    const std::vector<std::string>& requested_protocols,
-    const url::Origin& origin,
-    const std::string& user_agent_override,
-    int render_frame_id) {
+    const WebSocketHostMsg_AddChannelRequest_Params& params) {
   DVLOG(3) << "WebSocketHost::OnAddChannelRequest"
-           << " routing_id=" << routing_id_ << " socket_url=\"" << socket_url
-           << "\" requested_protocols=\""
-           << base::JoinString(requested_protocols, ", ") << "\" origin=\""
-           << origin << "\" user_agent_override=\"" << user_agent_override
+           << " routing_id=" << routing_id_ << " socket_url=\""
+           << params.socket_url << "\" requested_protocols=\""
+           << base::JoinString(params.requested_protocols, ", ")
+           << "\" origin=\"" << params.origin
+           << "\" first_party_for_cookies=\""
+           << params.first_party_for_cookies << "\" user_agent_override=\""
+           << params.user_agent_override
            << "\"";
 
   DCHECK(!channel_);
   if (delay_ > base::TimeDelta()) {
     base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
         FROM_HERE,
         base::Bind(&WebSocketHost::AddChannel, weak_ptr_factory_.GetWeakPtr(),
-                  socket_url, requested_protocols, origin,
-                  user_agent_override, render_frame_id),
+                   params.socket_url, params.requested_protocols,
+                   params.origin, params.first_party_for_cookies,
+                   params.user_agent_override, params.render_frame_id),
         delay_);
   } else {
-    AddChannel(socket_url, requested_protocols, origin,
-               user_agent_override, render_frame_id);
+    AddChannel(
+        params.socket_url, params.requested_protocols, params.origin,
+        params.first_party_for_cookies, params.user_agent_override,
+        params.render_frame_id);
   }
   // |this| may have been deleted here.
 }
 
 void WebSocketHost::AddChannel(
     const GURL& socket_url,
     const std::vector<std::string>& requested_protocols,
     const url::Origin& origin,
+    const GURL& first_party_for_cookies,
     const std::string& user_agent_override,
     int render_frame_id) {
   DVLOG(3) << "WebSocketHost::AddChannel"
            << " routing_id=" << routing_id_ << " socket_url=\"" << socket_url
            << "\" requested_protocols=\""
            << base::JoinString(requested_protocols, ", ") << "\" origin=\""
-           << origin << "\" user_agent_override=\""
+           << origin << "\" first_party_for_cookies=\""
+           << first_party_for_cookies << "\" user_agent_override=\""
            << user_agent_override << "\"";
 
   DCHECK(!channel_);
 
   std::unique_ptr<net::WebSocketEventInterface> event_interface(
       new WebSocketEventHandler(dispatcher_, this, routing_id_,
                                 render_frame_id));
   channel_.reset(new net::WebSocketChannel(std::move(event_interface),
                                            url_request_context_));
 
@@ skipping 15 matching lines @@
     if (!net::HttpUtil::IsValidHeaderValue(user_agent_override)) {
       bad_message::ReceivedBadMessage(
           dispatcher_, bad_message::WSH_INVALID_HEADER_VALUE);
       return;
     }
     additional_headers = base::StringPrintf("%s:%s",
                                             net::HttpRequestHeaders::kUserAgent,
                                             user_agent_override.c_str());
   }
   channel_->SendAddChannelRequest(
-          socket_url, requested_protocols, origin,
-          additional_headers);
+      socket_url, requested_protocols, origin, first_party_for_cookies,
+      additional_headers);
   // |this| may have been deleted here.
 }
 
 void WebSocketHost::OnSendBlob(const std::string& uuid,
                                uint64_t expected_size) {
   DVLOG(3) << "WebSocketHost::OnSendBlob"
            << " routing_id=" << routing_id_ << " uuid=" << uuid
            << " expected_size=" << expected_size;
 
   DCHECK(channel_);
@@ skipping 109 matching lines @@
     default:
       ignore_result(dispatcher_->NotifyFailure(
           routing_id_,
           "Failed to load Blob: error code = " + net::ErrorToString(result)));
       // |this| is destroyed here.
       return;
   }
 }
 
 }  // namespace content