Move websocketstreamhandle_bridge.h out of webkit/glue/.

webkit/child/websocketstreamhandle_impl.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.
 
 // An implementation of WebSocketStreamHandle.
 
 #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 "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"
-#include "webkit/glue/websocketstreamhandle_bridge.h"
 
 using WebKit::WebData;
 using WebKit::WebSocketStreamError;
 using WebKit::WebSocketStreamHandle;
 using WebKit::WebSocketStreamHandleClient;
 using WebKit::WebURL;
 
 namespace webkit_glue {
 
 // WebSocketStreamHandleImpl::Context -----------------------------------------
@@ skipping 38 matching lines @@
   WebSocketStreamHandleClient* client_;
   // |bridge_| is alive from Connect to DidClose, so Context must be alive
   // in the time period.
   scoped_refptr<WebSocketStreamHandleBridge> bridge_;
 
   DISALLOW_COPY_AND_ASSIGN(Context);
 };
 
 WebSocketStreamHandleImpl::Context::Context(WebSocketStreamHandleImpl* handle)
     : handle_(handle),
-      client_(NULL),
-      bridge_(NULL) {
+      client_(NULL) {
 }
 
 void WebSocketStreamHandleImpl::Context::Connect(
     const WebURL& url,
     WebKitPlatformSupportImpl* platform) {
   VLOG(1) << "Connect url=" << url;
   DCHECK(!bridge_.get());
   bridge_ = platform->CreateWebSocketBridge(handle_, this);
   AddRef();  // Will be released by DidClose().
   bridge_->Connect(url);
@@ skipping 94 matching lines @@
 
 bool WebSocketStreamHandleImpl::send(const WebData& data) {
   return context_->Send(data);
 }
 
 void WebSocketStreamHandleImpl::close() {
   context_->Close();
 }
 
 }  // namespace webkit_glue