Refactor BlimpConnection to TCPConnection

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/threading/thread_task_runner_handle.h"
 #include "blimp/net/message_port.h"
+#include "blimp/net/tcp_connection.h"
 #include "net/log/net_log_source.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) {}
 
@@ skipping 32 matching lines @@
                                                 base::Bind(callback, result));
 }
 
 std::unique_ptr<MessagePort> TCPEngineTransport::TakeMessagePort() {
   DCHECK(connect_callback_.is_null());
   DCHECK(accepted_socket_);
   return MessagePort::CreateForStreamSocketWithCompression(
       std::move(accepted_socket_));
 }
 
+std::unique_ptr<BlimpConnection> TCPEngineTransport::MakeConnection() {

[scf, 2016/11/10 21:59:10]

rename to CreateConnection ?

[perumaal, 2016/11/11 01:50:55]

We had a discussion around this before. I learnt that CreateConnection is an
ambiguous name as it implied the TCP connection creation.

+  return base::MakeUnique<TCPConnection>(TakeMessagePort());
+}
+
 const char* TCPEngineTransport::GetName() const {
   return "TCP";
 }
 
-int TCPEngineTransport::GetLocalAddress(net::IPEndPoint* address) const {
+void TCPEngineTransport::GetLocalAddress(net::IPEndPoint* address) const {
   DCHECK(server_socket_);
-  return server_socket_->GetLocalAddress(address);
+  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