| Index: blimp/client/core/session/client_network_components.cc
|
| diff --git a/blimp/client/core/session/client_network_components.cc b/blimp/client/core/session/client_network_components.cc
|
| index 45f722aeae43b3a0250b515210ae128f649633e6..e8dc13bcb4e473c886fb0b805721671cafc81bc8 100644
|
| --- a/blimp/client/core/session/client_network_components.cc
|
| +++ b/blimp/client/core/session/client_network_components.cc
|
| @@ -8,6 +8,7 @@
|
|
|
| #include "base/logging.h"
|
| #include "base/memory/ptr_util.h"
|
| +#include "blimp/net/grpc_client_transport.h"
|
| #include "blimp/net/ssl_client_transport.h"
|
| #include "net/base/net_errors.h"
|
|
|
| @@ -39,27 +40,27 @@ void ClientNetworkComponents::ConnectWithAssignment(
|
| case Assignment::SSL:
|
| DCHECK(assignment.cert);
|
| connection_manager_->AddTransport(base::MakeUnique<SSLClientTransport>(
|
| - assignment.engine_endpoint, std::move(assignment.cert), nullptr));
|
| + assignment.assignment_options.engine_endpoint,
|
| + std::move(assignment.cert), nullptr));
|
| transport_type = "SSL";
|
| break;
|
| case Assignment::TCP:
|
| connection_manager_->AddTransport(base::MakeUnique<TCPClientTransport>(
|
| - assignment.engine_endpoint, nullptr));
|
| + assignment.assignment_options.engine_endpoint, nullptr));
|
| transport_type = "TCP";
|
| break;
|
| case Assignment::GRPC:
|
| - // TODO(perumaal): Unimplemented as yet.
|
| - // connection_manager_->AddTransport(
|
| - // base::MakeUnique<GrpcClientTransport>(endpoint));
|
| + connection_manager_->AddTransport(
|
| + base::MakeUnique<GrpcClientTransport>(assignment.assignment_options));
|
| transport_type = "GRPC";
|
| - NOTIMPLEMENTED();
|
| break;
|
| case Assignment::UNKNOWN:
|
| LOG(FATAL) << "Unknown transport type.";
|
| break;
|
| }
|
|
|
| - VLOG(1) << "Connecting to " << assignment.engine_endpoint.ToString() << " ("
|
| + VLOG(1) << "Connecting to "
|
| + << assignment.assignment_options.engine_endpoint.ToString() << " ("
|
| << transport_type << ")";
|
|
|
| connection_manager_->Connect();
|
|
|