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

blimp/engine/app/blimp_engine_config.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/engine/app/blimp_engine_config.h"
 
 #include <memory>
 #include <string>
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/string_util.h"
-#include "blimp/engine/app/switches.h"
+#include "blimp/common/get_client_token.h"
+#include "blimp/common/switches.h"

[Kevin M, 2016/05/11 00:39:57]

Do we need to include this file, now that GetClientToken() is responsible for
accessing the switch?

[CJ, 2016/05/11 23:48:50]

Done.

 #include "cc/base/switches.h"
 #include "content/public/common/content_switches.h"
 #include "ui/gl/gl_switches.h"
 #include "ui/native_theme/native_theme_switches.h"
 
 namespace blimp {
 namespace engine {
 
-namespace {
-// Gets the client token from the file provided by the command line. If a read
-// does not succeed, or the switch is malformed, an empty string is returned.
-std::string GetClientToken(const base::CommandLine& cmd_line) {
-  std::string file_contents;
-  const base::FilePath path = cmd_line.GetSwitchValuePath(kClientTokenPath);
-  if (!base::ReadFileToString(path, &file_contents)) {
-    LOG(ERROR) << "Could not read client token file at "
-               << (path.empty() ? "(not provided)" : path.AsUTF8Unsafe());
-  }
-  return base::CollapseWhitespaceASCII(file_contents, true);
-}
-}  // namespace
-
 void SetCommandLineDefaults(base::CommandLine* command_line) {
   command_line->AppendSwitch(::switches::kEnableOverlayScrollbar);
   command_line->AppendSwitch(cc::switches::kDisableCachedPictureRaster);
   command_line->AppendSwitch(::switches::kDisableGpu);
   command_line->AppendSwitch(
       "disable-remote-fonts");  // switches::kDisableRemoteFonts is not visible.
   command_line->AppendSwitch(::switches::kUseRemoteCompositing);
   command_line->AppendSwitchASCII(
       ::switches::kUseGL,
       "osmesa");  // Avoid invoking gpu::CollectDriverVersionNVidia.
@@ skipping 19 matching lines @@
 
 const std::string& BlimpEngineConfig::client_token() const {
   return client_token_;
 }
 
 BlimpEngineConfig::BlimpEngineConfig(const std::string& client_token)
     : client_token_(client_token) {}
 
 }  // namespace engine
 }  // namespace blimp