[Blimp] Adds blimp engine browser test framework and LoadUrl test.

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/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"
 
 namespace blimp {
 namespace engine {
 
 namespace {
-// Gets the client token from the file provided by the command line. If a read
+// Gets the client token from the command line. Either from the token provided,
+// or from the file provided by the command line. If a file 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());
+  std::string token;
+  if (cmd_line.HasSwitch(kClientToken)) {
+    token = cmd_line.GetSwitchValueASCII(kClientToken);
+  } else {
+    DCHECK(cmd_line.HasSwitch(kClientTokenPath));
+    const base::FilePath path = cmd_line.GetSwitchValuePath(kClientTokenPath);
+    if (!base::ReadFileToString(path, &token)) {
+      LOG(ERROR) << "Could not read client token file at "
+                 << (path.empty() ? "(not provided)" : path.AsUTF8Unsafe());
+    }
   }
-  return base::CollapseWhitespaceASCII(file_contents, true);
+  return base::CollapseWhitespaceASCII(token, true);
 }
 }  // namespace
 
 BlimpEngineConfig::~BlimpEngineConfig() {}
 
 // static
 std::unique_ptr<BlimpEngineConfig> BlimpEngineConfig::Create(
     const base::CommandLine& cmd_line) {
   const std::string client_token = GetClientToken(cmd_line);
   if (!client_token.empty()) {
@@ skipping 10 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