Revert "Revert 254514 "Revert 254507 "Reland "Move WebKitPlatformSupport...""

content/child/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/child/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/message_loop.h"
 #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 WebSocketStreamHandleBridge {
+class IPCWebSocketStreamHandleBridge
+    : public webkit_glue::WebSocketStreamHandleBridge {
  public:
-  IPCWebSocketStreamHandleBridge(blink::WebSocketStreamHandle* handle,
-                                 WebSocketStreamHandleDelegate* delegate)
-      : socket_id_(kNoSocketId), handle_(handle), delegate_(delegate) {}
+  IPCWebSocketStreamHandleBridge(
+      blink::WebSocketStreamHandle* handle,
+      webkit_glue::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);
 
-  // WebSocketStreamHandleBridge methods.
+  // webkit_glue::WebSocketStreamHandleBridge methods.
   virtual void Connect(const GURL& url) OVERRIDE;
   virtual bool Send(const std::vector<char>& data) OVERRIDE;
   virtual void Close() OVERRIDE;
 
   // Called by SocketStreamDispatcher.
   void OnConnected(int max_amount_send_allowed);
   void OnSentData(int amount_sent);
   void OnReceivedData(const std::vector<char>& data);
   void OnClosed();
   void OnFailed(int error_code, const char* error_msg);
 
  private:
   virtual ~IPCWebSocketStreamHandleBridge();
 
   // The ID for this bridge and corresponding SocketStream instance in the
   // browser process.
   int socket_id_;
 
   blink::WebSocketStreamHandle* handle_;
-  WebSocketStreamHandleDelegate* delegate_;
+  webkit_glue::WebSocketStreamHandleDelegate* delegate_;
 
   // Map from ID to bridge instance.
   static base::LazyInstance<IDMap<IPCWebSocketStreamHandleBridge> >::Leaky
       all_bridges;
 };
 
 // static
 base::LazyInstance<IDMap<IPCWebSocketStreamHandleBridge> >::Leaky
     IPCWebSocketStreamHandleBridge::all_bridges = LAZY_INSTANCE_INITIALIZER;
 
@@ skipping 17 matching lines @@
 void IPCWebSocketStreamHandleBridge::Connect(const GURL& url) {
   DVLOG(1) << "Bridge (" << this << ") Connect (url=" << url << ")";
 
   DCHECK_EQ(socket_id_, kNoSocketId);
   if (delegate_)
     delegate_->WillOpenStream(handle_, url);
 
   socket_id_ = all_bridges.Get().Add(this);
   DCHECK_NE(socket_id_, kNoSocketId);
   int render_frame_id = MSG_ROUTING_NONE;
-  WebSocketStreamHandleImpl* impl =
-      static_cast<WebSocketStreamHandleImpl*>(handle_);
   const SocketStreamHandleData* data =
-      static_cast<SocketStreamHandleData*>(impl->GetUserData(handle_));
+      SocketStreamHandleData::ForHandle(handle_);
   if (data)
     render_frame_id = data->render_frame_id();
   AddRef();  // Released in OnClosed().
   ChildThread::current()->Send(
       new SocketStreamHostMsg_Connect(render_frame_id, url, socket_id_));
   DVLOG(1) << "Bridge #" << socket_id_ << " sent IPC Connect";
   // TODO(ukai): timeout to OnConnected.
 }
 
 bool IPCWebSocketStreamHandleBridge::Send(const std::vector<char>& data) {
@@ skipping 55 matching lines @@
                                               const char* error_msg) {
   DVLOG(1) << "Bridge #" << socket_id_ << " OnFailed (error_code=" << error_code
            << ")";
   if (delegate_)
     delegate_->DidFail(handle_, error_code, base::ASCIIToUTF16(error_msg));
 }
 
 SocketStreamDispatcher::SocketStreamDispatcher() {
 }
 
-// static
-WebSocketStreamHandleBridge* SocketStreamDispatcher::CreateBridge(
+/* static */
+webkit_glue::WebSocketStreamHandleBridge*
+SocketStreamDispatcher::CreateBridge(
     blink::WebSocketStreamHandle* handle,
-    WebSocketStreamHandleDelegate* delegate) {
+    webkit_glue::WebSocketStreamHandleDelegate* delegate) {
   return new IPCWebSocketStreamHandleBridge(handle, delegate);
 }
 
 bool SocketStreamDispatcher::OnMessageReceived(const IPC::Message& msg) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(SocketStreamDispatcher, msg)
     IPC_MESSAGE_HANDLER(SocketStreamMsg_Connected, OnConnected)
     IPC_MESSAGE_HANDLER(SocketStreamMsg_SentData, OnSentData)
     IPC_MESSAGE_HANDLER(SocketStreamMsg_ReceivedData, OnReceivedData)
     IPC_MESSAGE_HANDLER(SocketStreamMsg_Closed, OnClosed)
@@ skipping 55 matching lines @@
 void SocketStreamDispatcher::OnFailed(int socket_id, int error_code) {
   IPCWebSocketStreamHandleBridge* bridge =
       IPCWebSocketStreamHandleBridge::FromSocketId(socket_id);
   if (bridge)
     bridge->OnFailed(error_code, net::ErrorToString(error_code));
   else
     DLOG(ERROR) << "No bridge for socket_id=" << socket_id;
 }
 
 }  // namespace content