Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(438)

Unified Diff: blimp/client/core/session/assignment_source.cc

Issue 2462183002: GRPC Stream implementation of HeliumStream
Patch Set: Address gcasto comments Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: blimp/client/core/session/assignment_source.cc
diff --git a/blimp/client/core/session/assignment_source.cc b/blimp/client/core/session/assignment_source.cc
index f1214416fecd9759333f081ad26ad5763843e993..a113ee16c12b4b11fa7b515f904a4af82a0a60c0 100644
--- a/blimp/client/core/session/assignment_source.cc
+++ b/blimp/client/core/session/assignment_source.cc
@@ -118,9 +118,9 @@ Assignment GetAssignmentFromCommandLine() {
<< "No client auth token provided.";
unsigned port_parsed = 0;
- if (!base::StringToUint(
- cmd_line->GetSwitchValueASCII(switches::kEnginePort),
- &port_parsed) || !IsValidIpPortNumber(port_parsed)) {
+ if (!base::StringToUint(cmd_line->GetSwitchValueASCII(switches::kEnginePort),
+ &port_parsed) ||
+ !IsValidIpPortNumber(port_parsed)) {
DLOG(FATAL) << "--engine-port must be a value between 1 and 65535.";
return Assignment();
}
@@ -131,7 +131,7 @@ Assignment GetAssignmentFromCommandLine() {
DLOG(FATAL) << "Invalid engine IP " << ip_str;
return Assignment();
}
- assignment.engine_endpoint =
+ assignment.assignment_options.engine_endpoint =
net::IPEndPoint(ip_address, base::checked_cast<uint16_t>(port_parsed));
std::string transport_str =
@@ -366,7 +366,8 @@ void AssignmentSource::OnJsonParsed(std::unique_ptr<base::Value> json) {
// over SSL.
Assignment assignment;
assignment.transport_protocol = Assignment::TransportProtocol::SSL;
- assignment.engine_endpoint = net::IPEndPoint(ip_address, port);
+ assignment.assignment_options.engine_endpoint =
+ net::IPEndPoint(ip_address, port);
assignment.client_auth_token = client_auth_token;
assignment.cert = std::move(cert_list[0]);
« no previous file with comments | « blimp/client/app/android/blimp_client_session_android.cc ('k') | blimp/client/core/session/assignment_source_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698