Bind RenderViewImpl routing_id to SocketStreamHost

content/browser/renderer_host/socket_stream_dispatcher_host.cc

 // Copyright (c) 2012 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/socket_stream_dispatcher_host.h"
 
 #include "base/logging.h"
 #include "content/browser/renderer_host/socket_stream_host.h"
 #include "content/common/resource_messages.h"
 #include "content/common/socket_stream.h"
@@ skipping 116 matching lines @@
 
 bool SocketStreamDispatcherHost::CanSetCookie(net::SocketStream* request,
                                               const GURL& url,
                                               const std::string& cookie_line,
                                               net::CookieOptions* options) {
   return content::GetContentClient()->browser()->AllowSetCookie(
       url, url, cookie_line, resource_context_, 0, MSG_ROUTING_NONE, options);
 }
 
 // Message handlers called by OnMessageReceived.
-void SocketStreamDispatcherHost::OnConnect(const GURL& url, int socket_id) {
-  DVLOG(1) << "SocketStreamDispatcherHost::OnConnect url=" << url
+void SocketStreamDispatcherHost::OnConnect(int render_view_id,
+                                           const GURL& url,
+                                           int socket_id) {
+  DVLOG(1) << "SocketStreamDispatcherHost::OnConnect"
+           << " render_view_id=" << render_view_id
+           << " url=" << url
            << " socket_id=" << socket_id;
   DCHECK_NE(content::kNoSocketId, socket_id);
   if (hosts_.Lookup(socket_id)) {
     LOG(ERROR) << "socket_id=" << socket_id << " already registered.";
     return;
   }
-  SocketStreamHost* socket_stream_host = new SocketStreamHost(this, socket_id);
+  SocketStreamHost* socket_stream_host =
+      new SocketStreamHost(this, render_view_id, socket_id);
   hosts_.AddWithID(socket_stream_host, socket_id);
   socket_stream_host->Connect(url, GetURLRequestContext());
   DVLOG(1) << "SocketStreamDispatcherHost::OnConnect -> " << socket_id;
 }
 
 void SocketStreamDispatcherHost::OnSendData(
     int socket_id, const std::vector<char>& data) {
   DVLOG(1) << "SocketStreamDispatcherHost::OnSendData socket_id=" << socket_id;
   SocketStreamHost* socket_stream_host = hosts_.Lookup(socket_id);
   if (!socket_stream_host) {
@@ skipping 21 matching lines @@
   hosts_.Remove(socket_id);
   if (!Send(new SocketStreamMsg_Closed(socket_id))) {
     LOG(ERROR) << "SocketStreamMsg_Closed failed.";
   }
 }
 
 net::URLRequestContext* SocketStreamDispatcherHost::GetURLRequestContext() {
   return url_request_context_selector_->GetRequestContext(
       ResourceType::SUB_RESOURCE);
 }