Bind RenderViewImpl routing_id to SocketStreamHost

content/renderer/render_view_impl.cc

Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 57eb84fbd59645129969ecab431349140ccbeb2d..b455c77c5947b6da885545fde7b17256619e3131 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -85,6 +85,7 @@
 #include "content/renderer/web_ui_bindings.h"
 #include "content/renderer/webplugin_delegate_proxy.h"
 #include "content/renderer/websharedworker_proxy.h"
+#include "content/renderer/websocketstreamhandle_impl_extradata_impl.h"
 #include "media/base/filter_collection.h"
 #include "media/base/media_switches.h"
 #include "media/base/message_loop_factory.h"
@@ -137,6 +138,7 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPoint.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebRect.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSize.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSocketStreamHandle.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLError.h"
@@ -159,6 +161,7 @@
 #include "webkit/glue/webdropdata.h"
 #include "webkit/glue/webkit_constants.h"
 #include "webkit/glue/webkit_glue.h"
+#include "webkit/glue/websocketstreamhandle_impl.h"
 #include "webkit/glue/weburlloader_impl.h"
 #include "webkit/glue/weburlresponse_extradata_impl.h"
 #include "webkit/gpu/webgraphicscontext3d_in_process_impl.h"
@@ -239,6 +242,7 @@ using WebKit::WebSecurityPolicy;
 using WebKit::WebSettings;
 using WebKit::WebSharedWorker;
 using WebKit::WebSize;
+using WebKit::WebSocketStreamHandle;
 using WebKit::WebStorageNamespace;
 using WebKit::WebStorageQuotaCallbacks;
 using WebKit::WebStorageQuotaError;
@@ -270,6 +274,7 @@ using webkit::forms::PasswordForm;
 using webkit::forms::PasswordFormDomManager;
 using webkit_glue::AltErrorPageResourceFetcher;
 using webkit_glue::ResourceFetcher;
+using webkit_glue::WebSocketStreamHandleImpl;
 using webkit_glue::WebURLResponseExtraDataImpl;
 
 //-----------------------------------------------------------------------------
@@ -3370,6 +3375,15 @@ void RenderViewImpl::dispatchIntent(
       routing_id_, intent_data, id));
 }
 
+void RenderViewImpl::willOpenSocketStream(
+    WebSocketStreamHandle* handle) {
+  WebSocketStreamHandleImpl* impl =
+      static_cast<WebSocketStreamHandleImpl*>(handle);
+  if (impl)
+    impl->setExtraData(
+        new WebSocketStreamHandleImplExtraDataImpl(routing_id_));
+}
+
 // WebKit::WebPageSerializerClient implementation ------------------------------
 
 void RenderViewImpl::didSerializeDataForFrame(