1 files changed, 19 insertions, 21 deletions
diff --git a/chromium/content/child/socket_stream_dispatcher.cc b/chromium/content/child/socket_stream_dispatcher.cc
index 9370f087cc5..017a116466a 100644
--- a/chromium/content/child/socket_stream_dispatcher.cc
+++ b/chromium/content/child/socket_stream_dispatcher.cc
@@ -14,32 +14,29 @@
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/child/child_thread.h"
+#include "content/child/web_socket_stream_handle_bridge.h"
+#include "content/child/web_socket_stream_handle_delegate.h"
+#include "content/child/web_socket_stream_handle_impl.h"
 #include "content/common/socket_stream.h"
 #include "content/common/socket_stream_handle_data.h"
 #include "content/common/socket_stream_messages.h"
 #include "net/base/net_errors.h"
 #include "url/gurl.h"
-#include "webkit/child/websocketstreamhandle_bridge.h"
-#include "webkit/child/websocketstreamhandle_delegate.h"
 
 namespace content {
 
 // IPCWebSocketStreamHandleBridge is owned by each SocketStreamHandle.
 // It communicates with the main browser process via SocketStreamDispatcher.
-class IPCWebSocketStreamHandleBridge
-    : public webkit_glue::WebSocketStreamHandleBridge {
+class IPCWebSocketStreamHandleBridge : public WebSocketStreamHandleBridge {
  public:
-  IPCWebSocketStreamHandleBridge(
-      blink::WebSocketStreamHandle* handle,
-      webkit_glue::WebSocketStreamHandleDelegate* delegate)
-      : socket_id_(kNoSocketId),
-        handle_(handle),
-        delegate_(delegate) {}
+  IPCWebSocketStreamHandleBridge(blink::WebSocketStreamHandle* handle,
+                                 WebSocketStreamHandleDelegate* delegate)
+      : socket_id_(kNoSocketId), handle_(handle), delegate_(delegate) {}
 
   // Returns the handle having given id or NULL if there is no such handle.
   static IPCWebSocketStreamHandleBridge* FromSocketId(int id);
 
-  // webkit_glue::WebSocketStreamHandleBridge methods.
+  // WebSocketStreamHandleBridge methods.
   virtual void Connect(const GURL& url) OVERRIDE;
   virtual bool Send(const std::vector<char>& data) OVERRIDE;
   virtual void Close() OVERRIDE;
@@ -59,7 +56,7 @@ class IPCWebSocketStreamHandleBridge
   int socket_id_;
 
   blink::WebSocketStreamHandle* handle_;
-  webkit_glue::WebSocketStreamHandleDelegate* delegate_;
+  WebSocketStreamHandleDelegate* delegate_;
 
   // Map from ID to bridge instance.
   static base::LazyInstance<IDMap<IPCWebSocketStreamHandleBridge> >::Leaky
@@ -96,14 +93,16 @@ void IPCWebSocketStreamHandleBridge::Connect(const GURL& url) {
 
   socket_id_ = all_bridges.Get().Add(this);
   DCHECK_NE(socket_id_, kNoSocketId);
-  int render_view_id = MSG_ROUTING_NONE;
+  int render_frame_id = MSG_ROUTING_NONE;
+  WebSocketStreamHandleImpl* impl =
+      static_cast<WebSocketStreamHandleImpl*>(handle_);
   const SocketStreamHandleData* data =
-      SocketStreamHandleData::ForHandle(handle_);
+      static_cast<SocketStreamHandleData*>(impl->GetUserData(handle_));
   if (data)
-    render_view_id = data->render_view_id();
+    render_frame_id = data->render_frame_id();
   AddRef();  // Released in OnClosed().
   ChildThread::current()->Send(
-      new SocketStreamHostMsg_Connect(render_view_id, url, socket_id_));
+      new SocketStreamHostMsg_Connect(render_frame_id, url, socket_id_));
   DVLOG(1) << "Bridge #" << socket_id_ << " sent IPC Connect";
   // TODO(ukai): timeout to OnConnected.
 }
@@ -168,17 +167,16 @@ void IPCWebSocketStreamHandleBridge::OnFailed(int error_code,
   DVLOG(1) << "Bridge #" << socket_id_ << " OnFailed (error_code=" << error_code
            << ")";
   if (delegate_)
-    delegate_->DidFail(handle_, error_code, ASCIIToUTF16(error_msg));
+    delegate_->DidFail(handle_, error_code, base::ASCIIToUTF16(error_msg));
 }
 
 SocketStreamDispatcher::SocketStreamDispatcher() {
 }
 
-/* static */
-webkit_glue::WebSocketStreamHandleBridge*
-SocketStreamDispatcher::CreateBridge(
+// static
+WebSocketStreamHandleBridge* SocketStreamDispatcher::CreateBridge(
     blink::WebSocketStreamHandle* handle,
-    webkit_glue::WebSocketStreamHandleDelegate* delegate) {
+    WebSocketStreamHandleDelegate* delegate) {
   return new IPCWebSocketStreamHandleBridge(handle, delegate);
 }