Update monet.

mojo/services/network/web_socket_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.
 
 #include "mojo/services/network/web_socket_impl.h"
 
 #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"
 #include "net/websockets/websocket_channel.h"
 #include "net/websockets/websocket_errors.h"
 #include "net/websockets/websocket_event_interface.h"
 #include "net/websockets/websocket_frame.h"  // for WebSocketFrameHeader::OpCode
 #include "net/websockets/websocket_handshake_request_info.h"
 #include "net/websockets/websocket_handshake_response_info.h"
 #include "url/origin.h"
@@ skipping 35 matching lines @@
     return static_cast<WebSocket::MessageType>(type);
   }
 };
 
 namespace {
 
 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 {}
 
  private:
   // net::WebSocketEventInterface methods:
   ChannelState OnAddChannelResponse(const std::string& selected_subprotocol,
                                     const std::string& extensions) override;
   ChannelState OnDataFrame(bool fin,
                            WebSocketMessageType type,
                            const std::vector<char>& data) override;
@@ skipping 105 matching lines @@
     : binding_(this, request.Pass()), context_(context) {
 }
 
 WebSocketImpl::~WebSocketImpl() {
 }
 
 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()));
   scoped_ptr<net::WebSocketEventInterface> event_interface(
       new WebSocketEventHandler(client.Pass()));
   channel_.reset(new net::WebSocketChannel(event_interface.Pass(),
                                            context_->url_request_context()));
   channel_->SendAddChannelRequest(GURL(url.get()),
                                   protocols.To<std::vector<std::string> >(),
                                   url::Origin(origin.get()));
@@ skipping 24 matching lines @@
                                           uint32_t num_bytes,
                                           const char* data) {
   std::vector<char> buffer(num_bytes);
   memcpy(&buffer[0], data, num_bytes);
   DCHECK(channel_);
   channel_->SendFrame(
       fin, ConvertTo<net::WebSocketFrameHeader::OpCode>(type), buffer);
 }
 
 }  // namespace mojo