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

chrome/installer/util/google_chrome_distribution.h

 // Copyright (c) 2006-2009 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.
 //
 // This file extends generic BrowserDistribution class to declare Google Chrome
 // specific implementation.
 
 #ifndef CHROME_INSTALLER_UTIL_GOOGLE_CHROME_DISTRIBUTION_H_
 #define CHROME_INSTALLER_UTIL_GOOGLE_CHROME_DISTRIBUTION_H_
 #pragma once
@@ skipping 48 matching lines @@
   // key returned by GetVersionKey() is deleted.
   virtual std::wstring GetDistributionData(HKEY root_key);
 
   virtual std::wstring GetUninstallLinkName();
 
   virtual std::wstring GetUninstallRegPath();
 
   virtual std::wstring GetVersionKey();
 
   virtual void UpdateDiffInstallStatus(bool system_install,
-      bool incremental_install, installer::InstallStatus install_status);
+      bool incremental_install, installer_util::InstallStatus install_status);
 
-  virtual void LaunchUserExperiment(installer::InstallStatus status,
+  virtual void LaunchUserExperiment(installer_util::InstallStatus status,
       const installer::Version& version,
       const installer::Product& installation,
       bool system_level);
 
   // Assuming that the user qualifies, this function performs the inactive user
   // toast experiment. It will use chrome to show the UI and it will record the
   // outcome in the registry.
   virtual void InactiveUserToastExperiment(int flavor,
       const installer::Product& installation);
 
   std::wstring product_guid() { return product_guid_; }
 
  protected:
   void set_product_guid(std::wstring guid) { product_guid_ = guid; }
 
   // Disallow construction from others.
   explicit GoogleChromeDistribution(
-      const installer::MasterPreferences& prefs);
+      const installer_util::MasterPreferences& prefs);
 
  private:
   friend class BrowserDistribution;
 
   FRIEND_TEST_ALL_PREFIXES(GoogleChromeDistTest, TestExtractUninstallMetrics);
 
   // Extracts uninstall metrics from the JSON file located at file_path.
   // Returns them in a form suitable for appending to a url that already
   // has GET parameters, i.e. &metric1=foo&metric2=bar.
   // Returns true if uninstall_metrics has been successfully populated with
@@ skipping 10 matching lines @@
   // Returns true if at least one uninstall metric was found in
   // uninstall_metrics_dict, false otherwise.
   virtual bool BuildUninstallMetricsString(
       DictionaryValue* uninstall_metrics_dict, std::wstring* metrics);
 
   // The product ID for Google Update.
   std::wstring product_guid_;
 };
 
 #endif  // CHROME_INSTALLER_UTIL_GOOGLE_CHROME_DISTRIBUTION_H_