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

webkit/child/websocketstreamhandle_impl.cc

 // Copyright 2014 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.
 
 // An implementation of WebSocketStreamHandle.
 
-#include "content/child/web_socket_stream_handle_impl.h"
+#include "webkit/child/websocketstreamhandle_impl.h"
 
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
-#include "content/child/blink_platform_impl.h"
-#include "content/child/web_socket_stream_handle_bridge.h"
-#include "content/child/web_socket_stream_handle_delegate.h"
 #include "third_party/WebKit/public/platform/WebData.h"
 #include "third_party/WebKit/public/platform/WebSocketStreamError.h"
 #include "third_party/WebKit/public/platform/WebSocketStreamHandleClient.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
+#include "webkit/child/webkitplatformsupport_impl.h"
+#include "webkit/child/websocketstreamhandle_bridge.h"
+#include "webkit/child/websocketstreamhandle_delegate.h"
 
 using blink::WebData;
 using blink::WebSocketStreamError;
 using blink::WebSocketStreamHandle;
 using blink::WebSocketStreamHandleClient;
 using blink::WebURL;
 
-namespace content {
+namespace webkit_glue {
 
 // WebSocketStreamHandleImpl::Context -----------------------------------------
 
 class WebSocketStreamHandleImpl::Context
     : public base::RefCounted<Context>,
       public WebSocketStreamHandleDelegate {
  public:
   explicit Context(WebSocketStreamHandleImpl* handle);
 
   WebSocketStreamHandleClient* client() const { return client_; }
   void set_client(WebSocketStreamHandleClient* client) {
     client_ = client;
   }
 
-  void Connect(const WebURL& url, BlinkPlatformImpl* platform);
+  void Connect(const WebURL& url, WebKitPlatformSupportImpl* platform);
   bool Send(const WebData& data);
   void Close();
 
   // Must be called before |handle_| or |client_| is deleted.
   // Once detached, it never calls |client_| back.
   void Detach();
 
   // WebSocketStreamHandleDelegate methods:
   virtual void DidOpenStream(WebSocketStreamHandle*, int) OVERRIDE;
   virtual void DidSendData(WebSocketStreamHandle*, int) OVERRIDE;
@@ skipping 20 matching lines @@
   scoped_refptr<WebSocketStreamHandleBridge> bridge_;
 
   DISALLOW_COPY_AND_ASSIGN(Context);
 };
 
 WebSocketStreamHandleImpl::Context::Context(WebSocketStreamHandleImpl* handle)
     : handle_(handle),
       client_(NULL) {
 }
 
-void WebSocketStreamHandleImpl::Context::Connect(const WebURL& url,
-                                                 BlinkPlatformImpl* platform) {
+void WebSocketStreamHandleImpl::Context::Connect(
+    const WebURL& url,
+    WebKitPlatformSupportImpl* platform) {
   VLOG(1) << "Connect url=" << url;
   DCHECK(!bridge_.get());
   bridge_ = platform->CreateWebSocketStreamBridge(handle_, this);
   AddRef();  // Will be released by DidClose().
   bridge_->Connect(url);
 }
 
 bool WebSocketStreamHandleImpl::Context::Send(const WebData& data) {
   VLOG(1) << "Send data.size=" << data.size();
   DCHECK(bridge_.get());
@@ skipping 59 matching lines @@
   if (client_) {
     client_->didFail(
         handle_,
         WebSocketStreamError(error_code, error_msg));
   }
 }
 
 // WebSocketStreamHandleImpl ------------------------------------------------
 
 WebSocketStreamHandleImpl::WebSocketStreamHandleImpl(
-    BlinkPlatformImpl* platform)
+    WebKitPlatformSupportImpl* platform)
     : context_(new Context(this)),
       platform_(platform) {
 }
 
 WebSocketStreamHandleImpl::~WebSocketStreamHandleImpl() {
   // We won't receive any events from |context_|.
   // |context_| is ref counted, and will be released when it received
   // DidClose.
   context_->Detach();
 }
 
 void WebSocketStreamHandleImpl::connect(
     const WebURL& url, WebSocketStreamHandleClient* client) {
   VLOG(1) << "connect url=" << url;
   DCHECK(!context_->client());
   context_->set_client(client);
 
   context_->Connect(url, platform_);
 }
 
 bool WebSocketStreamHandleImpl::send(const WebData& data) {
   return context_->Send(data);
 }
 
 void WebSocketStreamHandleImpl::close() {
   context_->Close();
 }
 
-}  // namespace content
+}  // namespace webkit_glue