Refactor BlimpConnection to TCPConnection

blimp/net/test_common.cc

Index: blimp/net/test_common.cc
diff --git a/blimp/net/test_common.cc b/blimp/net/test_common.cc
index f72ed236b002ea7aa902abe657baa405bd63aee1..fc7f76d7847fa153492ebe5f278cc2305ccbf40f 100644
--- a/blimp/net/test_common.cc
+++ b/blimp/net/test_common.cc
@@ -5,6 +5,7 @@
 #include "blimp/net/test_common.h"
 
 #include <string>
+#include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "base/sys_byteorder.h"
@@ -22,16 +23,19 @@ MockStreamSocket::~MockStreamSocket() {}
 
 MockTransport::MockTransport() {}
 
-MockTransport::~MockTransport() {}
-
-std::unique_ptr<MessagePort> MockTransport::TakeMessagePort() {
-  return base::WrapUnique(TakeMessagePortPtr());
+std::unique_ptr<BlimpConnection> MockTransport::MakeConnection() {
+  return std::move(connection_);
 }
 
-const char* MockTransport::GetName() const {
-  return "mock";
+void MockTransport::SetMockConnection(
+    std::unique_ptr<MockBlimpConnection> connection) {
+  connection_ = std::move(connection);
 }
 
+MockTransport::~MockTransport() {}
+
+const char* MockTransport::GetName() const { return "mock"; }
+
 MockConnectionHandler::MockConnectionHandler() {}
 
 MockConnectionHandler::~MockConnectionHandler() {}
@@ -74,8 +78,7 @@ std::string EncodeHeader(size_t size) {
   return std::string(serialized.get(), kPacketHeaderSizeBytes);
 }
 
-bool BufferStartsWith(net::GrowableIOBuffer* buf,
-                      size_t buf_size,
+bool BufferStartsWith(net::GrowableIOBuffer* buf, size_t buf_size,
                       const std::string& str) {
   return (buf_size >= str.size() &&
           str == std::string(buf->data(), str.size()));