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

chrome/installer/setup/install.h

 // Copyright (c) 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 contains the specification of setup main functions.
 
 #ifndef CHROME_INSTALLER_SETUP_INSTALL_H_
 #define CHROME_INSTALLER_SETUP_INSTALL_H_
 #pragma once
 
@@ skipping 21 matching lines @@
 // install_temp_path: working directory used during install/update. It should
 //                    also has a sub dir source that contains a complete
 //                    and unpacked Chrome package.
 // prefs: master preferences. See chrome/installer/util/master_preferences.h.
 // new_version: new Chrome version that needs to be installed
 // package: Represents the target installation folder and all distributions
 //          to be installed in that folder.
 //
 // Note: since caller unpacks Chrome to install_temp_path\source, the caller
 // is responsible for cleaning up install_temp_path.
-installer_util::InstallStatus InstallOrUpdateChrome(
+installer::InstallStatus InstallOrUpdateChrome(
     const FilePath& setup_path, const FilePath& archive_path,
     const FilePath& install_temp_path, const FilePath& prefs_path,
-    const installer_util::MasterPreferences& prefs, const Version& new_version,
+    const installer::MasterPreferences& prefs, const Version& new_version,
     const Package& package);
 
 // Registers or unregisters COM DLLs in a specific folder as declared in
 // kDllsToRegister.
 // TODO(robertshield): What if the list of old dlls and new ones isn't
 // the same?  I think we should start storing the list of DLLs somewhere as
 // part of the installation data.
 bool RegisterComDllList(const FilePath& dll_folder, bool system_level,
                         bool do_register, bool rollback_on_failure);
 
 }  // namespace installer
 
 #endif  // CHROME_INSTALLER_SETUP_INSTALL_H_