Revert 69165 - Merge the installer, installer_util and setup_util namespaces ...

chrome/test/mini_installer_test/test.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_path.h"
 #include "base/platform_thread.h"
 #include "base/scoped_ptr.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/chrome_mini_installer.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"
 
 
 // Although the C++ style guide disallows use of namespace directive, use
 // here because this is not only a .cc file, but also a test.
 using namespace mini_installer_constants;
 
 namespace {
 
 class MiniInstallTest : public testing::Test {
  public:
    MiniInstallTest() : chrome_frame_(false) {}
 
   static void CleanTheSystem() {
     const CommandLine* cmd = CommandLine::ForCurrentProcess();
-    if (cmd->HasSwitch(installer::switches::kChromeFrame)) {
+    if (cmd->HasSwitch(installer_util::switches::kChromeFrame)) {
       ChromeMiniInstaller systeminstall(kSystemInstall,
-          cmd->HasSwitch(installer::switches::kChromeFrame));
+          cmd->HasSwitch(installer_util::switches::kChromeFrame));
       systeminstall.UnInstall();
     } else {
       ChromeMiniInstaller userinstall(kUserInstall,
-          cmd->HasSwitch(installer::switches::kChromeFrame));
+          cmd->HasSwitch(installer_util::switches::kChromeFrame));
       userinstall.UnInstall();
       ChromeMiniInstaller systeminstall(kSystemInstall,
-          cmd->HasSwitch(installer::switches::kChromeFrame));
+          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->GetSwitchValueNative(switches::kInstallerTestBuild);
     if (build.empty())
       build = L"latest";
-    chrome_frame_ = cmd->HasSwitch(installer::switches::kChromeFrame);
+    chrome_frame_ = cmd->HasSwitch(installer_util::switches::kChromeFrame);
 
     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.
     user_inst_.reset(new ChromeMiniInstaller(kUserInstall,
                                              chrome_frame_));
     sys_inst_.reset(new ChromeMiniInstaller(kSystemInstall,
@@ skipping 110 matching lines @@
 #endif
 TEST_F(MiniInstallTest, MAYBE_InstallMiniInstallerUser) {
   user_inst_->Install();
 }
 
 TEST_F(MiniInstallTest, MiniInstallTestValidWindowsVersion) {
   // We run the tests on all supported OSes.
   // Make sure the code agrees.
   EXPECT_TRUE(InstallUtil::IsOSSupported());
 }