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

chrome/installer/util/chrome_frame_distribution.cc

Index: chrome/installer/util/chrome_frame_distribution.cc
===================================================================
--- chrome/installer/util/chrome_frame_distribution.cc	(revision 68996)
+++ chrome/installer/util/chrome_frame_distribution.cc	(working copy)
@@ -24,7 +24,7 @@
 }
 
 ChromeFrameDistribution::ChromeFrameDistribution(
-    const installer_util::MasterPreferences& prefs)
+    const installer::MasterPreferences& prefs)
         : BrowserDistribution(prefs) {
   type_ = BrowserDistribution::CHROME_FRAME;
   ceee_ = prefs.install_ceee();
@@ -36,13 +36,13 @@
 
 std::wstring ChromeFrameDistribution::GetApplicationName() {
   const std::wstring& product_name =
-    installer_util::GetLocalizedString(IDS_PRODUCT_FRAME_NAME_BASE);
+    installer::GetLocalizedString(IDS_PRODUCT_FRAME_NAME_BASE);
   return product_name;
 }
 
 std::wstring ChromeFrameDistribution::GetAlternateApplicationName() {
   const std::wstring& product_name =
-    installer_util::GetLocalizedString(IDS_PRODUCT_FRAME_NAME_BASE);
+    installer::GetLocalizedString(IDS_PRODUCT_FRAME_NAME_BASE);
   return product_name;
 }
 
@@ -52,7 +52,7 @@
 
 std::wstring ChromeFrameDistribution::GetPublisherName() {
   const std::wstring& publisher_name =
-      installer_util::GetLocalizedString(IDS_ABOUT_VERSION_COMPANY_NAME_BASE);
+      installer::GetLocalizedString(IDS_ABOUT_VERSION_COMPANY_NAME_BASE);
   return publisher_name;
 }
 
@@ -107,7 +107,7 @@
 }
 
 void ChromeFrameDistribution::UpdateDiffInstallStatus(bool system_install,
-    bool incremental_install, installer_util::InstallStatus install_status) {
+    bool incremental_install, installer::InstallStatus install_status) {
   GoogleUpdateSettings::UpdateDiffInstallStatus(system_install,
       incremental_install, GetInstallReturnCode(install_status),
       kChromeFrameGuid);
@@ -115,20 +115,20 @@
 
 std::vector<FilePath> ChromeFrameDistribution::GetKeyFiles() {
   std::vector<FilePath> key_files;
-  key_files.push_back(FilePath(installer_util::kChromeFrameDll));
+  key_files.push_back(FilePath(installer::kChromeFrameDll));
   if (ceee_) {
-    key_files.push_back(FilePath(installer_util::kCeeeIeDll));
-    key_files.push_back(FilePath(installer_util::kCeeeBrokerExe));
+    key_files.push_back(FilePath(installer::kCeeeIeDll));
+    key_files.push_back(FilePath(installer::kCeeeBrokerExe));
   }
   return key_files;
 }
 
 std::vector<FilePath> ChromeFrameDistribution::GetComDllList() {
   std::vector<FilePath> dll_list;
-  dll_list.push_back(FilePath(installer_util::kChromeFrameDll));
+  dll_list.push_back(FilePath(installer::kChromeFrameDll));
   if (ceee_) {
-    dll_list.push_back(FilePath(installer_util::kCeeeInstallHelperDll));
-    dll_list.push_back(FilePath(installer_util::kCeeeIeDll));
+    dll_list.push_back(FilePath(installer::kCeeeInstallHelperDll));
+    dll_list.push_back(FilePath(installer::kCeeeIeDll));
   }
   return dll_list;
 }
@@ -136,9 +136,9 @@
 void ChromeFrameDistribution::AppendUninstallCommandLineFlags(
     CommandLine* cmd_line) {
   DCHECK(cmd_line);
-  cmd_line->AppendSwitch(installer_util::switches::kDeleteProfile);
-  cmd_line->AppendSwitch(installer_util::switches::kChromeFrame);
+  cmd_line->AppendSwitch(installer::switches::kDeleteProfile);
+  cmd_line->AppendSwitch(installer::switches::kChromeFrame);
   if (ceee_) {
-    cmd_line->AppendSwitch(installer_util::switches::kCeee);
+    cmd_line->AppendSwitch(installer::switches::kCeee);
   }
 }