Index: mojo/services/network/web_socket_impl.cc |
diff --git a/mojo/services/network/web_socket_impl.cc b/mojo/services/network/web_socket_impl.cc |
index 6cbadc5a6836031c7c8dac6dc1edc3d18b970367..ecd5782319da2d5645a6c3a106765eb05a26d2ee 100644 |
--- a/mojo/services/network/web_socket_impl.cc |
+++ b/mojo/services/network/web_socket_impl.cc |
@@ -6,7 +6,7 @@ |
#include "base/logging.h" |
#include "base/message_loop/message_loop.h" |
-#include "mojo/common/handle_watcher.h" |
+#include "mojo/message_pump/handle_watcher.h" |
#include "mojo/services/network/network_context.h" |
#include "mojo/services/network/web_socket_read_queue.h" |
#include "mojo/services/network/web_socket_write_queue.h" |
@@ -62,8 +62,8 @@ typedef net::WebSocketEventInterface::ChannelState ChannelState; |
struct WebSocketEventHandler : public net::WebSocketEventInterface { |
public: |
- WebSocketEventHandler(WebSocketClientPtr client) |
- : client_(client.Pass()) { |
+ WebSocketEventHandler(InterfaceHandle<WebSocketClient> client) |
+ : client_(WebSocketClientPtr::Create(client.Pass())) { |
} |
~WebSocketEventHandler() override {} |
@@ -189,7 +189,7 @@ void WebSocketImpl::Connect(const String& url, |
Array<String> protocols, |
const String& origin, |
ScopedDataPipeConsumerHandle send_stream, |
- WebSocketClientPtr client) { |
+ InterfaceHandle<WebSocketClient> client) { |
DCHECK(!channel_); |
send_stream_ = send_stream.Pass(); |
read_queue_.reset(new WebSocketReadQueue(send_stream_.get())); |