Revert 69167, itself a revert of 69165 - Merge the installer, installer_util ...

chrome/test/mini_installer_test/run_all_unittests.cc

 // 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/process_util.h"
 #include "base/test/test_suite.h"
 #include "base/win/windows_version.h"
 #include "chrome/common/chrome_switches.h"
@@ skipping 34 matching lines @@
   // Check command line to decide if the tests should continue
   // with cleaning the system or make a backup before continuing.
   CommandLine::Init(argc, argv);
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   base::TestSuite test_suite(argc, argv);
   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(switches::kInstallerTestBackup)) {
     BackUpProfile(command_line.HasSwitch(
-        installer_util::switches::kChromeFrame));
+        installer::switches::kChromeFrame));
   } else {
     printf("This test needs command line arguments.\n");
     printf("Usage: %ls -{clean|backup} [-build <version>] [-force] \n",
            command_line.GetProgram().value().c_str());
     printf("-clean arg will uninstall your chrome at all levels"
            " and also delete profile.\n"
            "-backup arg will make a copy of User Data before uninstalling"
            " your chrome at all levels. The copy will be named as"
            " User Data Copy.\n"
            "-build specifies the build to be tested, e.g., 3.0.195.24."
            " Specifying 'dev' or 'stable' will use the latest build from that"
            " channel. 'latest', the default, will use the latest build.\n"
            "-force allows these tests to be run on the current platform,"
            " regardless of whether it is supported.\n");
     return 1;
   }
 
   if (base::win::GetVersion() < base::win::VERSION_VISTA ||
       command_line.HasSwitch(switches::kInstallerTestForce)) {
     return test_suite.Run();
   } else {
     printf("These tests don't run on this platform.\n");
     return 0;
   }
 }