Roll mojo SDK to 734c6e1652ff2f3b696e441722838f453f4f9b42

mojo/services/network/tcp_bound_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/tcp_bound_socket_impl.h"
 
 #include "mojo/services/network/net_adapters.h"
 #include "mojo/services/network/net_address_type_converters.h"
 #include "mojo/services/network/tcp_connected_socket_impl.h"
 #include "mojo/services/network/tcp_server_socket_impl.h"
 #include "net/base/net_errors.h"
 
 namespace mojo {
 
-TCPBoundSocketImpl::TCPBoundSocketImpl() {
+TCPBoundSocketImpl::TCPBoundSocketImpl(InterfaceRequest<TCPBoundSocket> request)
+    : binding_(this, request.Pass()) {
 }
 
 TCPBoundSocketImpl::~TCPBoundSocketImpl() {
 }
 
 int TCPBoundSocketImpl::Bind(NetAddressPtr local_address) {
   net::IPEndPoint end_point = local_address.To<net::IPEndPoint>();
 
   socket_.reset(new net::TCPSocket(NULL, net::NetLog::Source()));
   int result = socket_->Open(end_point.GetFamily());
@@ skipping 30 matching lines @@
   }
 
   // TODO(brettw) set the backlog properly.
   int result = socket_->Listen(4);
   if (result != net::OK) {
     callback.Run(MakeNetworkError(result));
     return;
   }
 
   // The server socket object takes ownership of the socket.
-  BindToRequest(new TCPServerSocketImpl(socket_.Pass()), &server);
+  new TCPServerSocketImpl(server.Pass(), socket_.Pass());
   callback.Run(MakeNetworkError(net::OK));
 }
 
 void TCPBoundSocketImpl::Connect(
     NetAddressPtr remote_address,
     ScopedDataPipeConsumerHandle send_stream,
     ScopedDataPipeProducerHandle receive_stream,
     InterfaceRequest<TCPConnectedSocket> client_socket,
     const Callback<void(NetworkErrorPtr)>& callback) {
   if (!socket_ || pending_connect_socket_.is_pending()) {
@@ skipping 33 matching lines @@
   } else {
     pending_connect_send_stream_.reset();
     pending_connect_receive_stream_.reset();
     pending_connect_socket_ = InterfaceRequest<TCPConnectedSocket>();
   }
   pending_connect_callback_.Run(MakeNetworkError(result));
   pending_connect_callback_ = Callback<void(NetworkErrorPtr)>();
 }
 
 }  // namespace mojo