Refactor BlimpConnection to TCPConnection

blimp/net/tcp_engine_transport.h

 // 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.
 
 #ifndef BLIMP_NET_TCP_ENGINE_TRANSPORT_H_
 #define BLIMP_NET_TCP_ENGINE_TRANSPORT_H_
 
 #include <memory>
 
 #include "base/callback.h"
 #include "base/macros.h"
+#include "blimp/net/blimp_engine_transport.h"
 #include "blimp/net/blimp_net_export.h"
-#include "blimp/net/blimp_transport.h"
 #include "net/base/ip_endpoint.h"
 #include "net/base/net_errors.h"
 
 namespace net {
 class NetLog;
 class ServerSocket;
 class StreamSocket;
 }  // namespace net
 
 namespace blimp {
 
 class MessagePort;
 
-// BlimpTransport which listens for a TCP connection at |address|.
-class BLIMP_NET_EXPORT TCPEngineTransport : public BlimpTransport {
+// |BlimpTransport| which listens for a TCP connection at |address|.
+class BLIMP_NET_EXPORT TCPEngineTransport : public BlimpEngineTransport {
  public:
   // Caller retains the ownership of |net_log|.
   TCPEngineTransport(const net::IPEndPoint& address,
                      net::NetLog* net_log);
   ~TCPEngineTransport() override;
 
   // BlimpTransport implementation.
   void Connect(const net::CompletionCallback& callback) override;
-  std::unique_ptr<MessagePort> TakeMessagePort() override;
+  std::unique_ptr<BlimpConnection> MakeConnection() override;
   const char* GetName() const override;
+  void GetLocalAddress(net::IPEndPoint* address) const override;

[Wez, 2016/11/09 22:57:27]

If we're not allowing for failure then simply return IPEndpoint here.

 
-  int GetLocalAddress(net::IPEndPoint* address) const;
+  // Internal use only except tests.

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

You can move this to be provide and provide a TakeMessagePortForTest() accessor
publicly, which IIRC PRESUBMIT should complain about if non-test code tries to
use it?

+  std::unique_ptr<MessagePort> TakeMessagePort();
 
  private:
   void OnTCPConnectAccepted(int result);
 
   const net::IPEndPoint address_;
   net::NetLog* net_log_;
   std::unique_ptr<net::ServerSocket> server_socket_;
   std::unique_ptr<net::StreamSocket> accepted_socket_;
   net::CompletionCallback connect_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(TCPEngineTransport);
 };
 
 }  // namespace blimp
 
 #endif  // BLIMP_NET_TCP_ENGINE_TRANSPORT_H_