Refactor BlimpConnection to TCPConnection

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"
@@ skipping 39 matching lines @@
                    base::Unretained(this), transport_index));
   } 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];
+  DVLOG(3) << "OnConnectResult; result = " << result;

[Garrett Casto, 2016/10/25 18:33:50]

Nit: Everything else in this file is DVLOG(1). If you are going to log here, I
would stick with that. VLOG(3) is normally extremely detailed logging.

[perumaal, 2016/10/25 23:02:39]

Cool, good idea. thanks

   if (result == net::OK) {
-    std::unique_ptr<BlimpConnection> connection =
-        base::MakeUnique<BlimpConnection>(transport->TakeMessagePort());
+    std::unique_ptr<BlimpConnection> connection = transport->MakeConnection();
     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(
     std::unique_ptr<BlimpConnection> connection) {
   DVLOG(1) << "Sending authentication message.";
   connection->GetOutgoingMessageProcessor()->ProcessMessage(
       CreateStartConnectionMessage(client_auth_token_, kProtocolVersion),
       base::Bind(&ClientConnectionManager::OnAuthenticationMessageSent,
                  weak_factory_.GetWeakPtr(),
                  base::Passed(std::move(connection))));
 }
 
 void ClientConnectionManager::OnAuthenticationMessageSent(
-    std::unique_ptr<BlimpConnection> connection,
-    int result) {
+    std::unique_ptr<BlimpConnection> connection, int result) {
   DVLOG(1) << "AuthenticationMessageSent, result=" << result;
   if (result != net::OK) {
     // If a write error occurred, just throw away |connection|.
     // We don't need to propagate the error code here because the connection
     // will already have done so via the ErrorObserver object.
     return;
   }
   connection_handler_->HandleConnection(std::move(connection));
 }
 
 void ClientConnectionManager::OnConnectionError(int error) {
   // TODO(kmarshall): implement reconnection logic.
   VLOG(0) << "Connection dropped, error=" << error;
 }
 
 }  // namespace blimp