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

chrome/installer/util/product.h

 // 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.
 
 #ifndef CHROME_INSTALLER_UTIL_PRODUCT_H_
 #define CHROME_INSTALLER_UTIL_PRODUCT_H_
 #pragma once
 
 #include <vector>
 
 #include "base/ref_counted.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/package.h"
 
 class CommandLine;
 
-namespace installer {
+namespace installer_util {
 class MasterPreferences;
 }
 
 namespace installer {
 
 class Product;
 class Package;
 class Version;
 
 typedef std::vector<scoped_refptr<Package> > Packages;
 typedef std::vector<scoped_refptr<const Product> > Products;
 
 const Product* FindProduct(const Products& products,
                            BrowserDistribution::Type type);
 
 // Calls WriteInstallerResult for each Product object.
 void WriteInstallerResult(const Products& products,
-                          installer::InstallStatus status,
+                          installer_util::InstallStatus status,
                           int string_resource_id,
                           const std::wstring* const launch_cmd);
 
 // Represents an installation of a specific product which has a one-to-one
 // relation to a BrowserDistribution.  A product has registry settings, related
 // installation/uninstallation actions and exactly one Package that represents
 // the files on disk.  The Package may be shared with other Product instances,
 // so only the last Product to be uninstalled should remove the package.
 // Right now there are no classes that derive from Product, but in
 // the future, as we move away from global functions and towards a data driven
@@ skipping 43 matching lines @@
   //    value 1
   bool IsMsi() const;
 
   // Sets the boolean MSI marker for this installation if set is true or clears
   // it otherwise. The MSI marker is stored in the registry under the
   // ClientState key.
   bool SetMsiMarker(bool set) const;
 
   // Sets installer error information in registry so that Google Update can read
   // it and display to the user.
-  void WriteInstallerResult(installer::InstallStatus status,
+  void WriteInstallerResult(installer_util::InstallStatus status,
                             int string_resource_id,
                             const std::wstring* const launch_cmd) const;
 
   // Find the version of this product installed on the system by checking the
   // Google Update registry key. Returns the version or NULL if no version is
   // found.  Caller must free the returned Version object.
   Version* GetInstalledVersion() const;
 
  protected:
   BrowserDistribution* distribution_;
@@ skipping 22 matching lines @@
 
   bool system_level() const {
     return system_level_;
   }
 
   const Packages& packages() const;
 
   const Products& products() const;
 
   bool AddDistribution(BrowserDistribution::Type type,
-                       const installer::MasterPreferences& prefs);
+                       const installer_util::MasterPreferences& prefs);
   bool AddDistribution(BrowserDistribution* distribution);
 
  protected:
   bool system_level_;
   Packages packages_;
   Products products_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ProductPackageMapping);
 };
 
 }  // namespace installer
 
 #endif  // CHROME_INSTALLER_UTIL_PRODUCT_H_