Index: content/browser/websockets/websocket_impl.h |
diff --git a/content/browser/websockets/websocket_impl.h b/content/browser/websockets/websocket_impl.h |
index fb64613dc55ba538b4835db4970a9ccb19d43a31..00c9f0db13689570bbb3ab945142cd1217903852 100644 |
--- a/content/browser/websockets/websocket_impl.h |
+++ b/content/browser/websockets/websocket_impl.h |
@@ -15,8 +15,8 @@ |
#include "base/memory/weak_ptr.h" |
#include "base/time/time.h" |
#include "content/common/content_export.h" |
+#include "content/common/websocket.mojom.h" |
#include "mojo/public/cpp/bindings/binding.h" |
-#include "third_party/WebKit/public/platform/modules/websockets/websocket.mojom.h" |
class GURL; |
@@ -33,7 +33,7 @@ class StoragePartition; |
// Host of net::WebSocketChannel. |
class CONTENT_EXPORT WebSocketImpl |
- : NON_EXPORTED_BASE(public blink::mojom::WebSocket) { |
+ : NON_EXPORTED_BASE(public mojom::WebSocket) { |
public: |
class Delegate { |
public: |
@@ -45,7 +45,7 @@ class CONTENT_EXPORT WebSocketImpl |
}; |
WebSocketImpl(Delegate* delegate, |
- blink::mojom::WebSocketRequest request, |
+ mojom::WebSocketRequest request, |
int frame_id, |
base::TimeDelta delay); |
~WebSocketImpl() override; |
@@ -54,15 +54,15 @@ class CONTENT_EXPORT WebSocketImpl |
// This function is virtual for testing. |
virtual void GoAway(); |
- // blink::mojom::WebSocket methods: |
+ // mojom::WebSocket methods: |
void AddChannelRequest(const GURL& url, |
const std::vector<std::string>& requested_protocols, |
const url::Origin& origin, |
const GURL& first_party_for_cookies, |
const std::string& user_agent_override, |
- blink::mojom::WebSocketClientPtr client) override; |
+ mojom::WebSocketClientPtr client) override; |
void SendFrame(bool fin, |
- blink::mojom::WebSocketMessageType type, |
+ mojom::WebSocketMessageType type, |
const std::vector<uint8_t>& data) override; |
void SendFlowControl(int64_t quota) override; |
void StartClosingHandshake(uint16_t code, const std::string& reason) override; |
@@ -81,9 +81,9 @@ class CONTENT_EXPORT WebSocketImpl |
const std::string& user_agent_override); |
Delegate* delegate_; |
- mojo::Binding<blink::mojom::WebSocket> binding_; |
+ mojo::Binding<mojom::WebSocket> binding_; |
- blink::mojom::WebSocketClientPtr client_; |
+ mojom::WebSocketClientPtr client_; |
// The channel we use to send events to the network. |
std::unique_ptr<net::WebSocketChannel> channel_; |