Command line flag cleanup.

chrome/test/mini_installer_test/test.cc

-// 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"
 #include "chrome/test/mini_installer_test/mini_installer_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #include "chrome_mini_installer.h"
 
 // Although the C++ style guide disallows use of namespace directive, use
 // here because this is not only a .cc file, but also a test.
@@ skipping 26 matching lines @@
         userinstall.UnInstall();
         ChromeMiniInstaller systeminstall(kSystemInstall,
             cmd->HasSwitch(installer_util::switches::kChromeFrame));
         systeminstall.UnInstall();
       }
     }
 
     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");
 
         // Create a few differently configured installers that are used in
         // the tests, for convenience.
         if (chrome_frame_) {
           sys_inst_.reset(new ChromeMiniInstaller(kSystemInstall,
                                                   chrome_frame_));
           sys_inst_->SetBuildUnderTest(build);
@@ skipping 109 matching lines @@
 TEST_F(MiniInstallTest, InstallMiniInstallerUser) {
   if (!chrome_frame_)
     user_inst_->Install();
 }
 
 TEST_F(MiniInstallTest, MiniInstallTestValidWindowsVersion) {
   // We run the tests on all supported OSes.
   // Make sure the code agrees.
   EXPECT_TRUE(InstallUtil::IsOSSupported());
 }