| Index: chrome/test/mini_installer_test/test.cc
|
| diff --git a/chrome/test/mini_installer_test/test.cc b/chrome/test/mini_installer_test/test.cc
|
| index 032d9a5d2aab64599d277fa084af490e1d3da58a..6d877dcb020514378d8dc5341be7cdaffe71d87c 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");
|
|
|