Decouple Blimp transport output from BlimpConnections using MessagePort.

blimp/net/client_connection_manager.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/client_connection_manager.h"
 
+#include <utility>
+
 #include "base/logging.h"
+#include "base/memory/ptr_util.h"
 #include "blimp/common/create_blimp_message.h"
 #include "blimp/common/proto/blimp_message.pb.h"
 #include "blimp/common/protocol_version.h"
 #include "blimp/net/blimp_connection.h"
 #include "blimp/net/blimp_message_processor.h"
 #include "blimp/net/blimp_transport.h"
 #include "blimp/net/browser_connection_handler.h"
 #include "blimp/net/connection_handler.h"
+#include "blimp/net/message_port.h"
 #include "net/base/net_errors.h"
 
 namespace blimp {
 
 ClientConnectionManager::ClientConnectionManager(
     ConnectionHandler* connection_handler)
     : connection_handler_(connection_handler), weak_factory_(this) {
   DCHECK(connection_handler_);
 }
 
@@ skipping 21 matching lines @@
   } else {
     // TODO(haibinlu): add an error reporting path out for this.
     LOG(WARNING) << "All transports failed to connect";
   }
 }
 
 void ClientConnectionManager::OnConnectResult(int transport_index, int result) {
   DCHECK_NE(result, net::ERR_IO_PENDING);
   const auto& transport = transports_[transport_index];
   if (result == net::OK) {
-    std::unique_ptr<BlimpConnection> connection = transport->TakeConnection();
+    std::unique_ptr<BlimpConnection> connection =
+        base::MakeUnique<BlimpConnection>(transport->TakeMessagePort());
     connection->AddConnectionErrorObserver(this);
     SendAuthenticationMessage(std::move(connection));
   } else {
     DVLOG(1) << "Transport " << transport->GetName()
              << " failed to connect:" << net::ErrorToString(result);
     Connect(transport_index + 1);
   }
 }
 
 void ClientConnectionManager::SendAuthenticationMessage(
@@ skipping 18 matching lines @@
   }
   connection_handler_->HandleConnection(std::move(connection));
 }
 
 void ClientConnectionManager::OnConnectionError(int error) {
   // TODO(kmarshall): implement reconnection logic.
   VLOG(0) << "Connection dropped, error=" << error;
 }
 
 }  // namespace blimp