Allows client to access auth token from command line specified file.

blimp/client/session/assignment_source.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/session/assignment_source.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/location.h"
 #include "base/memory/ref_counted.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/task_runner_util.h"
+#include "base/threading/thread_restrictions.h"
 #include "base/values.h"
 #include "blimp/client/app/blimp_client_switches.h"
+#include "blimp/common/get_client_token.h"
 #include "blimp/common/protocol_version.h"
 #include "components/safe_json/safe_json_parser.h"
 #include "net/base/ip_address.h"
 #include "net/base/ip_endpoint.h"
 #include "net/base/load_flags.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_status_code.h"
 #include "net/proxy/proxy_config_service.h"
 #include "net/proxy/proxy_service.h"
 #include "net/url_request/url_fetcher.h"
@@ skipping 62 matching lines @@
 
 bool IsValidIpPortNumber(unsigned port) {
   return port > 0 && port <= 65535;
 }
 
 // Populates an Assignment using command-line parameters, if provided.
 // Returns a null Assignment if no parameters were set.
 // Must be called on a thread suitable for file IO.
 Assignment GetAssignmentFromCommandLine() {
   Assignment assignment;
-  assignment.client_token = kDummyClientToken;
+  const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
+  assignment.client_token = GetClientToken(*cmd_line);

[Kevin M, 2016/05/10 18:06:34]

Add newline before this line, to visually separate the client token getter from
the variables in the header.

[Kevin M, 2016/05/10 18:06:34]

What's the behavior if the token isn't specified?

[Kevin M, 2016/05/10 18:06:34]

You can just pass the result of ForCurrentProcess() inline vs. getting a
variable, since the reference to "CommandLine" makes it obvious what we're
getting.

[CJ, 2016/05/10 20:58:06]

Done.

[CJ, 2016/05/10 20:58:06]

Adding an assert here such that client_token does not equal "". This is similar
to how the server seems to handle this. Please let me know if there is a better
way.

[CJ, 2016/05/10 20:58:06]

Keeping it, since in a later comment, you suggest reuse. 

 
   unsigned port_parsed = 0;
   if (!base::StringToUint(
           base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(

[Kevin M, 2016/05/10 18:06:34]

You can replace all calls to base::CommandLine::ForCurrentProcess() with
"cmd_line", since we've already stored the result.

[CJ, 2016/05/10 20:58:06]

Done.

               switches::kEnginePort),
           &port_parsed) ||
       !IsValidIpPortNumber(port_parsed)) {
     DLOG(FATAL) << "--engine-port must be a value between 1 and 65535.";
     return Assignment();
   }
 
   net::IPAddress ip_address;
   std::string ip_str =
       base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
@@ skipping 255 matching lines @@
 }
 
 void AssignmentSource::OnJsonParseError(const std::string& error) {
   DLOG(ERROR) << "Error while parsing assigner JSON: " << error;
   base::ResetAndReturn(&callback_)
       .Run(AssignmentSource::Result::RESULT_BAD_RESPONSE, Assignment());
 }
 
 }  // namespace client
 }  // namespace blimp