Update monet.

mojo/services/network/http_connection_impl.cc

Index: mojo/services/network/http_connection_impl.cc
diff --git a/mojo/services/network/http_connection_impl.cc b/mojo/services/network/http_connection_impl.cc
index e42fd1e4599af9f751d02517d9e23ef3d8856cf8..b6f27deac7a1bab15c41a67079b3365558b7c14e 100644
--- a/mojo/services/network/http_connection_impl.cc
+++ b/mojo/services/network/http_connection_impl.cc
@@ -11,7 +11,7 @@
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
-#include "mojo/common/handle_watcher.h"
+#include "mojo/message_pump/handle_watcher.h"
 #include "mojo/services/network/http_server_impl.h"
 #include "mojo/services/network/interfaces/web_socket.mojom.h"
 #include "mojo/services/network/net_adapters.h"
@@ -91,10 +91,10 @@ class HttpConnectionImpl::WebSocketImpl : public WebSocket {
   WebSocketImpl(HttpConnectionImpl* connection,
                 InterfaceRequest<WebSocket> request,
                 ScopedDataPipeConsumerHandle send_stream,
-                WebSocketClientPtr client)
+                InterfaceHandle<WebSocketClient> client)
       : connection_(connection),
         binding_(this, request.Pass()),
-        client_(client.Pass()),
+        client_(WebSocketClientPtr::Create(client.Pass())),
         send_stream_(send_stream.Pass()),
         read_send_stream_(new WebSocketReadQueue(send_stream_.get())),
         pending_send_count_(0) {
@@ -145,7 +145,7 @@ class HttpConnectionImpl::WebSocketImpl : public WebSocket {
                Array<String> protocols,
                const String& origin,
                ScopedDataPipeConsumerHandle send_stream,
-               WebSocketClientPtr client) override {
+               InterfaceHandle<WebSocketClient> client) override {
     NOTREACHED();
   }
 
@@ -250,10 +250,11 @@ struct TypeConverter<HttpRequestPtr, net::HttpServerRequestInfo> {
   }
 };
 
-HttpConnectionImpl::HttpConnectionImpl(int connection_id,
-                                       HttpServerImpl* server,
-                                       HttpConnectionDelegatePtr delegate,
-                                       HttpConnectionPtr* connection)
+HttpConnectionImpl::HttpConnectionImpl(
+    int connection_id,
+    HttpServerImpl* server,
+    HttpConnectionDelegatePtr delegate,
+    InterfaceHandle<HttpConnection>* connection)
     : connection_id_(connection_id),
       server_(server),
       delegate_(delegate.Pass()),
@@ -297,7 +298,7 @@ void HttpConnectionImpl::OnReceivedWebSocketRequest(
       HttpRequest::From(info),
       [this, info](InterfaceRequest<WebSocket> web_socket,
                    ScopedDataPipeConsumerHandle send_stream,
-                   WebSocketClientPtr web_socket_client) {
+                   InterfaceHandle<WebSocketClient> web_socket_client) {
         if (!web_socket.is_pending() || !send_stream.is_valid() ||
             !web_socket_client) {
           Close();