Roll mojo SDK to 734c6e1652ff2f3b696e441722838f453f4f9b42

mojo/services/network/http_server_impl.cc

 // Copyright 2015 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/http_server_impl.h"
 
 #include "base/logging.h"
 #include "mojo/services/network/http_connection_impl.h"
 #include "mojo/services/network/net_adapters.h"
 #include "mojo/services/network/net_address_type_converters.h"
@@ skipping 22 matching lines @@
     callback.Run(MakeNetworkError(net_error), nullptr);
     delete http_server;
     return;
   }
   callback.Run(MakeNetworkError(net::OK), http_server->GetLocalAddress());
 }
 
 HttpServerImpl::HttpServerImpl(HttpServerDelegatePtr delegate)
     : delegate_(delegate.Pass()) {
   DCHECK(delegate_);
-  delegate_.set_error_handler(this);
+  delegate_.set_connection_error_handler([this]() { delete this; });
 }
 
 HttpServerImpl::~HttpServerImpl() {}
 
 int HttpServerImpl::Start(NetAddressPtr local_address) {
   DCHECK(local_address);
 
   scoped_ptr<net::ServerSocket> socket(
       new net::TCPServerSocket(nullptr, net::NetLog::Source()));
   int net_result = socket->Listen(local_address.To<net::IPEndPoint>(),
@@ skipping 51 matching lines @@
                                         const std::string& data) {
   DCHECK(connections_.find(connection_id) != connections_.end());
   connections_[connection_id]->OnReceivedWebSocketMessage(data);
 }
 
 void HttpServerImpl::OnClose(int connection_id) {
   DCHECK(connections_.find(connection_id) != connections_.end());
   connections_.erase(connection_id);
 }
 
-void HttpServerImpl::OnConnectionError() {
-  delete this;
-}
-
 }  // namespace mojo