Merge the installer, installer_util and setup_util namespaces into a single i...

chrome/test/mini_installer_test/test.cc

Index: chrome/test/mini_installer_test/test.cc
===================================================================
--- chrome/test/mini_installer_test/test.cc	(revision 68996)
+++ chrome/test/mini_installer_test/test.cc	(working copy)
@@ -27,16 +27,16 @@
 
   static void CleanTheSystem() {
     const CommandLine* cmd = CommandLine::ForCurrentProcess();
-    if (cmd->HasSwitch(installer_util::switches::kChromeFrame)) {
+    if (cmd->HasSwitch(installer::switches::kChromeFrame)) {
       ChromeMiniInstaller systeminstall(kSystemInstall,
-          cmd->HasSwitch(installer_util::switches::kChromeFrame));
+          cmd->HasSwitch(installer::switches::kChromeFrame));
       systeminstall.UnInstall();
     } else {
       ChromeMiniInstaller userinstall(kUserInstall,
-          cmd->HasSwitch(installer_util::switches::kChromeFrame));
+          cmd->HasSwitch(installer::switches::kChromeFrame));
       userinstall.UnInstall();
       ChromeMiniInstaller systeminstall(kSystemInstall,
-          cmd->HasSwitch(installer_util::switches::kChromeFrame));
+          cmd->HasSwitch(installer::switches::kChromeFrame));
       systeminstall.UnInstall();
     }
   }
@@ -48,7 +48,7 @@
         cmd->GetSwitchValueNative(switches::kInstallerTestBuild);
     if (build.empty())
       build = L"latest";
-    chrome_frame_ = cmd->HasSwitch(installer_util::switches::kChromeFrame);
+    chrome_frame_ = cmd->HasSwitch(installer::switches::kChromeFrame);
 
     CleanTheSystem();
     // Separate the test output from cleaning output