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

chrome/installer/util/google_update_settings.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_GOOGLE_UPDATE_SETTINGS_H_
 #define CHROME_INSTALLER_UTIL_GOOGLE_UPDATE_SETTINGS_H_
 #pragma once
 
 #include <string>
 
 #include "base/basictypes.h"
 
-namespace installer {
+namespace installer_util {
 class ChannelInfo;
 }
 
 // This class provides accessors to the Google Update 'ClientState' information
 // that recorded when the user downloads the chrome installer. It is
 // google_update.exe responsability to write the initial values.
 class GoogleUpdateSettings {
  public:
   // Returns whether the user has given consent to collect UMA data and send
   // crash dumps to Google. This information is collected by the web server
@@ skipping 77 matching lines @@
   //   not present already).
   // - If full installer failed, still remove this magic
   //   string (if it is present already).
   //
   // diff_install: tells whether this is incremental install or not.
   // install_return_code: if 0, means installation was successful.
   // value: current value of Google Update "ap" key.
   // Returns true if |value| is modified.
   static bool UpdateGoogleUpdateApKey(bool diff_install,
                                       int install_return_code,
-                                      installer::ChannelInfo* value);
+                                      installer_util::ChannelInfo* value);
 
   // For system-level installs, we need to be able to communicate the results
   // of the Toast Experiments back to Google Update. The problem is just that
   // the experiment is run in the context of the user, which doesn't have
   // write access to the HKLM key that Google Update expects the results in.
   // However, when we are about to switch contexts from system to user, we can
   // duplicate the handle to the registry key and pass it (through handle
   // inheritance) to the newly created child process that is launched as the
   // user, allowing the child process to write to the key, with the
   // WriteGoogleUpdateSystemClientKey function below.
   static int DuplicateGoogleUpdateSystemClientKey();
 
   // Takes a |handle| to a registry key and writes |value| string into the
   // specified |key|. See DuplicateGoogleUpdateSystemClientKey for details.
   static bool WriteGoogleUpdateSystemClientKey(int handle,
                                                const std::wstring& key,
                                                const std::wstring& value);
 
   // True if a build is strictly organic, according to its brand code.
   static bool IsOrganic(const std::wstring& brand);
 
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(GoogleUpdateSettings);
 };
 
 #endif  // CHROME_INSTALLER_UTIL_GOOGLE_UPDATE_SETTINGS_H_