Removing Test and Staging environments from App Remoting Test Driver tool.

remoting/test/app_remoting_test_driver.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 "base/at_exit.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/stringprintf.h"
 #include "base/test/launcher/unit_test_launcher.h"
 #include "base/test/test_suite.h"
 #include "base/test/test_switches.h"
 #include "google_apis/google_api_keys.h"
 #include "net/base/escape.h"
 #include "remoting/test/app_remoting_test_driver_environment.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace switches {
 const char kAuthCodeSwitchName[] = "authcode";
 const char kHelpSwitchName[] = "help";
 const char kLoggingLevelSwitchName[] = "verbosity";
 const char kRefreshTokenFileSwitchName[] = "refresh-token-file";
 const char kReleaseHostsAfterTestingSwitchName[] = "release-hosts-after-tests";
-const char kServiceEnvironmentSwitchName[] = "environment";
 const char kShowHostAvailabilitySwitchName[] = "show-host-availability";
 const char kSingleProcessTestsSwitchName[] = "single-process-tests";
 const char kUserNameSwitchName[] = "username";
 }  // namespace switches
 
 namespace {
 
 // Requested permissions needed for App Remoting tests.  The spaces in between
 // scope fragments are necessary and will be escaped properly before use.
 const char kAppRemotingAuthScopeValues[] =
@@ skipping 31 matching lines @@
   printf("\nRequired Parameters:\n");
   printf("  %s: Specifies which account to use when running tests\n",
          switches::kUserNameSwitchName);
   printf("\nOptional Parameters:\n");
   printf("  %s: Exchanged for a refresh and access token for authentication\n",
          switches::kAuthCodeSwitchName);
   printf("  %s: Path to a JSON file containing username/refresh_token KVPs\n",
          switches::kRefreshTokenFileSwitchName);
   printf("  %s: Displays additional usage information\n",
          switches::kHelpSwitchName);
-  printf("  %s: Specifies the service api to use (dev|test) [default: dev]\n",
-         switches::kServiceEnvironmentSwitchName);
   printf(
       "  %s: Retrieves and displays the connection status for all known "
       "hosts, no tests will be run\n",
       switches::kShowHostAvailabilitySwitchName);
   printf(
       "  %s: Send a message to the service after all tests have been run to "
       "release remote hosts the tool used for testing.\n",
       switches::kReleaseHostsAfterTestingSwitchName);
   printf(
       "  %s: Specifies the optional logging level of the tool (0-3)."
@@ skipping 129 matching lines @@
   // refreshing their credentials.
   std::string auth_code(
       command_line->GetSwitchValueASCII(switches::kAuthCodeSwitchName));
 
   options.refresh_token_file_path =
       command_line->GetSwitchValuePath(switches::kRefreshTokenFileSwitchName);
 
   options.release_hosts_when_done =
       command_line->HasSwitch(switches::kReleaseHostsAfterTestingSwitchName);
 
-  // If the user passed in a service environment, use it, otherwise set a
-  // default value.
-  std::string service_environment_switch(command_line->GetSwitchValueASCII(
-      switches::kServiceEnvironmentSwitchName));
-  if (service_environment_switch.empty() ||
-      service_environment_switch == "dev") {
-    options.service_environment =
+  options.service_environment =
         remoting::test::ServiceEnvironment::kDeveloperEnvironment;
-  } else if (service_environment_switch == "test") {
-    options.service_environment =
-        remoting::test::ServiceEnvironment::kTestingEnvironment;
-  } else if (service_environment_switch == "staging") {
-    options.service_environment =
-        remoting::test::ServiceEnvironment::kStagingEnvironment;
-  } else {
-    LOG(ERROR) << "Invalid " << switches::kServiceEnvironmentSwitchName
-               << " argument passed in.";
-    PrintUsage();
-    return -1;
-  }
 
   // Update the logging verbosity level is user specified one.
   std::string verbosity_level(
       command_line->GetSwitchValueASCII(switches::kLoggingLevelSwitchName));
   if (!verbosity_level.empty()) {
     // Turn on logging for the test_driver and remoting components.
     // This switch is parsed during logging::InitLogging.
     command_line->AppendSwitchASCII("vmodule",
                                     "*/remoting/*=" + verbosity_level);
     logging::LoggingSettings logging_settings;
@@ skipping 22 matching lines @@
   // Since we've successfully set up our shared_data object, we'll assign the
   // value to our global* and transfer ownership to the framework.
   remoting::test::AppRemotingSharedData = shared_data.release();
   testing::AddGlobalTestEnvironment(remoting::test::AppRemotingSharedData);
 
   // Because many tests may access the same remoting host(s), we need to run
   // the tests sequentially so they do not interfere with each other.
   return base::LaunchUnitTestsSerially(
       argc, argv, base::Bind(&NoAtExitBaseTestSuite::RunTestSuite, argc, argv));
 }