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

chrome/installer/util/chrome_frame_distribution.h

Index: chrome/installer/util/chrome_frame_distribution.h
===================================================================
--- chrome/installer/util/chrome_frame_distribution.h	(revision 69167)
+++ chrome/installer/util/chrome_frame_distribution.h	(working copy)
@@ -14,7 +14,7 @@
 #include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/util_constants.h"
 
-namespace installer_util {
+namespace installer {
 class MasterPreferences;
 }
 
@@ -54,7 +54,7 @@
   // Update ap value. We implement this simply to have the same behaviour re.
   // the ap value.
   virtual void UpdateDiffInstallStatus(bool system_install,
-      bool incremental_install, installer_util::InstallStatus install_status);
+      bool incremental_install, installer::InstallStatus install_status);
 
   virtual std::vector<FilePath> GetKeyFiles();
 
@@ -67,7 +67,7 @@
 
   // Disallow construction from non-friends.
   explicit ChromeFrameDistribution(
-      const installer_util::MasterPreferences& prefs);
+      const installer::MasterPreferences& prefs);
 
   // Determines whether this Chrome Frame distribution is being used to work
   // with CEEE bits as well.