Bind RenderViewImpl routing_id to SocketStreamHost

content/common/socket_stream_dispatcher.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/common/socket_stream_dispatcher.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/id_map.h"
 #include "base/lazy_instance.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop.h"
 #include "content/common/child_thread.h"
 #include "content/common/socket_stream.h"
+#include "content/common/socket_stream_handle_data.h"
 #include "content/common/socket_stream_messages.h"
 #include "googleurl/src/gurl.h"
 #include "webkit/glue/websocketstreamhandle_bridge.h"
 #include "webkit/glue/websocketstreamhandle_delegate.h"
+#include "webkit/glue/websocketstreamhandle_impl.h"

[darin (slow to review), 2012/03/20 06:46:59]

still needed?

[Takashi Toyoshima, 2012/03/20 18:19:40]

No. This inclusion was removed at Patch Set 8.

 
 // IPCWebSocketStreamHandleBridge is owned by each SocketStreamHandle.
 // It communicates with the main browser process via SocketStreamDispatcher.
 class IPCWebSocketStreamHandleBridge
     : public webkit_glue::WebSocketStreamHandleBridge {
  public:
   IPCWebSocketStreamHandleBridge(
       ChildThread* child_thread,
       WebKit::WebSocketStreamHandle* handle,
       webkit_glue::WebSocketStreamHandleDelegate* delegate)
@@ skipping 109 matching lines @@
 }
 
 void IPCWebSocketStreamHandleBridge::DoConnect(const GURL& url) {
   DCHECK(child_thread_);
   DCHECK_EQ(socket_id_, content::kNoSocketId);
   if (delegate_)
     delegate_->WillOpenStream(handle_, url);
 
   socket_id_ = all_bridges.Get().Add(this);
   DCHECK_NE(socket_id_, content::kNoSocketId);
+  int render_view_id = MSG_ROUTING_NONE;
+  const SocketStreamHandleData* data =
+      SocketStreamHandleData::ForHandle(handle_);
+  if (data)
+    render_view_id = data->render_view_id();
   AddRef();  // Released in OnClosed().
-  if (child_thread_->Send(new SocketStreamHostMsg_Connect(url, socket_id_))) {
+  if (child_thread_->Send(
+      new SocketStreamHostMsg_Connect(render_view_id, url, socket_id_))) {
     DVLOG(1) << "Connect socket_id=" << socket_id_;
     // TODO(ukai): timeout to OnConnected.
   } else {
     DLOG(ERROR) << "IPC SocketStream_Connect failed.";
     OnClosed();
   }
 }
 
 void IPCWebSocketStreamHandleBridge::DoClose() {
   child_thread_->Send(new SocketStreamHostMsg_Close(socket_id_));
@@ skipping 56 matching lines @@
 }
 
 void SocketStreamDispatcher::OnClosed(int socket_id) {
   IPCWebSocketStreamHandleBridge* bridge =
       IPCWebSocketStreamHandleBridge::FromSocketId(socket_id);
   if (bridge)
     bridge->OnClosed();
   else
     DLOG(ERROR) << "No SocketStreamHandleBridge for socket_id=" << socket_id;
 }