Provide child/frame IDs for WebSocket handshake request

content/browser/websockets/websocket_impl.cc

Index: content/browser/websockets/websocket_impl.cc
diff --git a/content/browser/websockets/websocket_impl.cc b/content/browser/websockets/websocket_impl.cc
index 6ea179da37116fb599c2e530ba171ee56b5bfe87..e590e95933230298de27bcebd5915dc8a11d8010 100644
--- a/content/browser/websockets/websocket_impl.cc
+++ b/content/browser/websockets/websocket_impl.cc
@@ -20,9 +20,12 @@
 #include "base/threading/thread_task_runner_handle.h"
 #include "content/browser/bad_message.h"
 #include "content/browser/child_process_security_policy_impl.h"
+#include "content/browser/loader/resource_request_info_impl.h"

[tyoshino (SeeGerritForStatus), 2016/10/12 08:13:36]

for what?

[yhirano, 2016/10/12 10:47:15]

Sorry, it was used when I used ResourceRequestInfo instead of
WebSocketHandshakeRequestInfo. Deleted.

 #include "content/browser/ssl/ssl_error_handler.h"
 #include "content/browser/ssl/ssl_manager.h"
+#include "content/browser/websockets/websocket_handshake_request_info_impl.h"
 #include "content/public/browser/storage_partition.h"
+#include "content/public/common/process_type.h"

[tyoshino (SeeGerritForStatus), 2016/10/12 08:13:36]

for what?

[yhirano, 2016/10/12 10:47:15]

Ditto

 #include "ipc/ipc_message.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
@@ -30,6 +33,7 @@
 #include "net/http/http_response_headers.h"
 #include "net/http/http_util.h"
 #include "net/ssl/ssl_info.h"
+#include "net/url_request/url_request.h"

[tyoshino (SeeGerritForStatus), 2016/10/12 08:13:36]

where is this used?

[yhirano, 2016/10/12 10:47:15]

Done.

 #include "net/url_request/url_request_context_getter.h"
 #include "net/websockets/websocket_channel.h"
 #include "net/websockets/websocket_errors.h"
@@ -90,6 +94,7 @@ class WebSocketImpl::WebSocketEventHandler final
 
   // net::WebSocketEventInterface implementation
 
+  void OnCreateURLRequest(net::URLRequest* request) override;
   ChannelState OnAddChannelResponse(const std::string& selected_subprotocol,
                                     const std::string& extensions) override;
   ChannelState OnDataFrame(bool fin,
@@ -151,6 +156,12 @@ WebSocketImpl::WebSocketEventHandler::~WebSocketEventHandler() {
            << reinterpret_cast<void*>(this);
 }
 
+void WebSocketImpl::WebSocketEventHandler::OnCreateURLRequest(
+    net::URLRequest* request) {
+  WebSocketHandshakeRequestInfoImpl::CreateInfoAndAssociateWithRequest(
+      impl_->child_id_, impl_->frame_id_, request);
+}
+
 ChannelState WebSocketImpl::WebSocketEventHandler::OnAddChannelResponse(
     const std::string& selected_protocol,
     const std::string& extensions) {
@@ -354,15 +365,16 @@ void WebSocketImpl::WebSocketEventHandler::SSLErrorHandlerDelegate::
   callbacks_->ContinueSSLRequest();
 }
 
-WebSocketImpl::WebSocketImpl(
-    Delegate* delegate,
-    blink::mojom::WebSocketRequest request,
-    int frame_id,
-    base::TimeDelta delay)
+WebSocketImpl::WebSocketImpl(Delegate* delegate,
+                             blink::mojom::WebSocketRequest request,
+                             int child_id,
+                             int frame_id,
+                             base::TimeDelta delay)
     : delegate_(delegate),
       binding_(this, std::move(request)),
       delay_(delay),
       pending_flow_control_quota_(0),
+      child_id_(child_id),
       frame_id_(frame_id),
       handshake_succeeded_(false),
       weak_ptr_factory_(this) {