Decouple Blimp transport output from BlimpConnections using MessagePort.

blimp/net/tcp_engine_transport.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 "blimp/net/tcp_engine_transport.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/callback.h"
 #include "base/callback_helpers.h"
 #include "base/location.h"
 #include "base/memory/ptr_util.h"
-#include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
-#include "blimp/net/stream_socket_connection.h"
+#include "blimp/net/message_port.h"
+#include "blimp/net/message_port_util.h"
 #include "net/socket/stream_socket.h"
 #include "net/socket/tcp_server_socket.h"
 
 namespace blimp {
 
 TCPEngineTransport::TCPEngineTransport(const net::IPEndPoint& address,
                                        net::NetLog* net_log)
     : address_(address), net_log_(net_log) {}
 
 TCPEngineTransport::~TCPEngineTransport() {}
@@ skipping 17 matching lines @@
   net::CompletionCallback accept_callback = base::Bind(
       &TCPEngineTransport::OnTCPConnectAccepted, base::Unretained(this));
 
   int result = server_socket_->Accept(&accepted_socket_, accept_callback);
   if (result == net::ERR_IO_PENDING) {
     connect_callback_ = callback;
     return;
   }
 
   if (result != net::OK) {
-    // TODO(haibinlu): investigate when we can keep using this server socket.
     server_socket_.reset();
   }
 
   base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
                                                 base::Bind(callback, result));
 }
 
-std::unique_ptr<BlimpConnection> TCPEngineTransport::TakeConnection() {
+std::unique_ptr<MessagePort> TCPEngineTransport::TakeMessagePort() {
   DCHECK(connect_callback_.is_null());
   DCHECK(accepted_socket_);
-  return base::WrapUnique(
-      new StreamSocketConnection(std::move(accepted_socket_)));
+  return CreateMessagePortForStreamSocket(std::move(accepted_socket_));
 }
 
 const char* TCPEngineTransport::GetName() const {
   return "TCP";
 }
 
 int TCPEngineTransport::GetLocalAddress(net::IPEndPoint* address) const {
   DCHECK(server_socket_);
   return server_socket_->GetLocalAddress(address);
 }
 
 void TCPEngineTransport::OnTCPConnectAccepted(int result) {
   DCHECK_NE(net::ERR_IO_PENDING, result);
   DCHECK(accepted_socket_);
   if (result != net::OK) {
     accepted_socket_.reset();
   }
   base::ResetAndReturn(&connect_callback_).Run(result);
 }
 
 }  // namespace blimp