Refactor BlimpConnection to TCPConnection

blimp/net/tcp_engine_transport.h

Index: blimp/net/tcp_engine_transport.h
diff --git a/blimp/net/tcp_engine_transport.h b/blimp/net/tcp_engine_transport.h
index 93f426b88e9837825d39c52b3459e9f1f9f2da1c..b7e85e06b83ec98e60d4439e80dd710370d0c846 100644
--- a/blimp/net/tcp_engine_transport.h
+++ b/blimp/net/tcp_engine_transport.h
@@ -9,8 +9,8 @@
 
 #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"
 
@@ -24,8 +24,8 @@ 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,
@@ -34,10 +34,12 @@ class BLIMP_NET_EXPORT TCPEngineTransport : public BlimpTransport {
 
   // 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);