From 64fc2700e520905b170fe6f7576795aed63648f4 Mon Sep 17 00:00:00 2001 From: "estade@chromium.org" Date: Fri, 25 Jun 2010 20:40:59 +0000 Subject: Command line flag cleanup. Move some string literals into chrome/common/chrome_switches. There are still many uses in places that cannot depend on chrome/common. BUG=none TEST=trybots Review URL: http://codereview.chromium.org/2824008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50888 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/test/mini_installer_test/run_all_unittests.cc | 8 ++++---- chrome/test/mini_installer_test/test.cc | 10 ++++++---- 2 files changed, 10 insertions(+), 8 deletions(-) (limited to 'chrome/test') diff --git a/chrome/test/mini_installer_test/run_all_unittests.cc b/chrome/test/mini_installer_test/run_all_unittests.cc index cbcdf78..0549e1a 100644 --- a/chrome/test/mini_installer_test/run_all_unittests.cc +++ b/chrome/test/mini_installer_test/run_all_unittests.cc @@ -1,15 +1,15 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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/command_line.h" #include "base/file_util.h" #include "base/test/test_suite.h" +#include "chrome/common/chrome_switches.h" #include "chrome/installer/util/util_constants.h" #include "chrome/test/mini_installer_test/mini_installer_test_constants.h" #include "chrome_mini_installer.h" - void BackUpProfile(bool chrome_frame) { if (base::GetProcessCount(L"chrome.exe", NULL) > 0) { printf("Chrome is currently running and cannot backup the profile." @@ -45,10 +45,10 @@ int main(int argc, char** argv) { CommandLine::Init(argc, argv); const CommandLine& command_line = *CommandLine::ForCurrentProcess(); TestSuite test_suite = TestSuite(argc, argv); - if (command_line.HasSwitch("clean")) { + if (command_line.HasSwitch(switches::kInstallerTestClean)) { printf("Current version of Chrome will be uninstalled " "from all levels before proceeding with tests.\n"); - } else if (command_line.HasSwitch("backup")) { + } else if (command_line.HasSwitch(switches::kInstallerTestForce)) { BackUpProfile(command_line.HasSwitch( installer_util::switches::kChromeFrame)); } else { diff --git a/chrome/test/mini_installer_test/test.cc b/chrome/test/mini_installer_test/test.cc index 032d9a5..6d877dc 100644 --- a/chrome/test/mini_installer_test/test.cc +++ b/chrome/test/mini_installer_test/test.cc @@ -1,10 +1,12 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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/command_line.h" #include "base/platform_thread.h" #include "base/scoped_ptr.h" #include "base/win_util.h" +#include "chrome/common/chrome_switches.h" #include "chrome/installer/util/install_util.h" #include "chrome/installer/util/util_constants.h" #include "chrome/test/mini_installer_test/mini_installer_test_constants.h" @@ -51,13 +53,13 @@ class MiniInstallTest : public testing::Test { virtual void SetUp() { // Parse test command-line arguments. const CommandLine* cmd = CommandLine::ForCurrentProcess(); - std::wstring build = cmd->GetSwitchValue(L"build"); + std::wstring build = cmd->GetSwitchValue(switches::kInstallerTestBuild); if (build.empty()) build = L"latest"; - force_tests_ = cmd->HasSwitch(L"force"); + force_tests_ = cmd->HasSwitch(switches::kInstallerTestForce); chrome_frame_ = cmd->HasSwitch(installer_util::switches::kChromeFrame); if (win_util::GetWinVersion() < win_util::WINVERSION_VISTA || - force_tests_) { + force_tests_) { CleanTheSystem(); // Separate the test output from cleaning output printf("\nBEGIN test----------------------------------------\n"); -- cgit v1.1