Refactor BlimpConnection to TCPConnection

blimp/net/tcp_client_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_client_transport.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/callback.h"
 #include "base/callback_helpers.h"
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "blimp/net/message_port.h"
-#include "blimp/net/stream_socket_connection.h"
+#include "blimp/net/tcp_connection.h"
 #include "net/log/net_log_source.h"
 #include "net/socket/client_socket_factory.h"
 #include "net/socket/stream_socket.h"
 #include "net/socket/tcp_client_socket.h"
 
 namespace blimp {
 
 TCPClientTransport::TCPClientTransport(const net::IPEndPoint& ip_endpoint,
                                        net::NetLog* net_log)
     : ip_endpoint_(ip_endpoint),
@@ skipping 25 matching lines @@
 
   OnTCPConnectComplete(result);
 }
 
 std::unique_ptr<MessagePort> TCPClientTransport::TakeMessagePort() {
   DCHECK(connect_callback_.is_null());
   DCHECK(socket_);
   return MessagePort::CreateForStreamSocketWithCompression(std::move(socket_));
 }
 
+std::unique_ptr<BlimpConnection> TCPClientTransport::MakeConnection() {

[Wez, 2016/11/09 22:47:17]

nit: Please reflect the header ordering in the .cc where possible.

+  return base::MakeUnique<TCPConnection>(TakeMessagePort());
+}
+
 const char* TCPClientTransport::GetName() const {
   return "TCP";
 }
 
 void TCPClientTransport::OnTCPConnectComplete(int result) {
   DCHECK_NE(net::ERR_IO_PENDING, result);
   OnConnectComplete(result);
 }
 
 void TCPClientTransport::OnConnectComplete(int result) {
@@ skipping 10 matching lines @@
 void TCPClientTransport::SetSocket(std::unique_ptr<net::StreamSocket> socket) {
   DCHECK(socket);
   socket_ = std::move(socket);
 }
 
 net::ClientSocketFactory* TCPClientTransport::socket_factory() const {
   return socket_factory_;
 }
 
 }  // namespace blimp