Refactor BlimpConnection to TCPConnection

blimp/client/core/session/client_network_components.cc

 // Copyright 2016 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/client/core/session/client_network_components.h"
 
 #include <utility>
 
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
@@ skipping 17 matching lines @@
   connection_manager_ = base::MakeUnique<ClientConnectionManager>(this);
 }
 
 void ClientNetworkComponents::ConnectWithAssignment(
     const Assignment& assignment) {
   DCHECK(io_thread_checker_.CalledOnValidThread());
   DCHECK(connection_manager_);
 
   connection_manager_->set_client_auth_token(assignment.client_auth_token);
   const char* transport_type = "UNKNOWN";
+  auto endpoint = assignment.engine_endpoint.ToString();

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

Nit: I'm not sure why you pulled this out. It doesn't look like it's referenced
anywhere new. Given the scale of the refactoring here, I would generally try to
avoid making small cosmetic changes like this because it just complicates the
diff.

[Kevin M, 2016/10/25 18:49:22]

Just inline this in VLOG? Otherwise we are computing strings on release builds.

Side notes:
* err on the side of using an explicit type over "auto" for variables with a
nontrivial binding lifetime.

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

Done.

   switch (assignment.transport_protocol) {
     case Assignment::SSL:
       DCHECK(assignment.cert);
       connection_manager_->AddTransport(base::MakeUnique<SSLClientTransport>(
           assignment.engine_endpoint, std::move(assignment.cert), nullptr));
       transport_type = "SSL";
       break;
     case Assignment::TCP:
       connection_manager_->AddTransport(base::MakeUnique<TCPClientTransport>(
           assignment.engine_endpoint, nullptr));
       transport_type = "TCP";
       break;
+    case Assignment::GRPC:
+      // TODO(perumaal): Unimplemented as yet.

[Kevin M, 2016/10/25 18:49:22]

NOTIMPLEMENTED() ?

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

Nice! thx

+      // connection_manager_->AddTransport(
+      // base::MakeUnique<GrpcClientTransport>(endpoint));
+      transport_type = "GRPC";
+      LOG(FATAL) << "Not yet implemented!";
+      break;
     case Assignment::UNKNOWN:
       LOG(FATAL) << "Unknown transport type.";
       break;
   }
 
-  VLOG(1) << "Connecting to " << assignment.engine_endpoint.ToString() << " ("
-          << transport_type << ")";
+  VLOG(1) << "Connecting to " << endpoint << " (" << transport_type << ")";
 
   connection_manager_->Connect();
 }
 
 BrowserConnectionHandler*
 ClientNetworkComponents::GetBrowserConnectionHandler() {
   DCHECK(io_thread_checker_.CalledOnValidThread());
   return &connection_handler_;
 }
 
@@ skipping 11 matching lines @@
   if (result >= 0) {
     VLOG(1) << "Disconnected with reason: " << result;
   } else {
     VLOG(1) << "Connection error: " << net::ErrorToString(result);
   }
   network_observer_->OnDisconnected(result);
 }
 
 }  // namespace client
 }  // namespace blimp