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

chrome/installer/util/channel_info.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_CHANNEL_INFO_H_
 #define CHROME_INSTALLER_UTIL_CHANNEL_INFO_H_
 #pragma once
 
 #include <string>
 
 namespace base {
 namespace win {
 class RegKey;
 }
 }
 
-namespace installer_util {
+namespace installer {
 
 // A helper class for parsing and modifying the Omaha additional parameter
 // ("ap") client state value for a product.
 class ChannelInfo {
  public:
 
   // Initialize an instance from the "ap" value in a given registry key.
   // Returns false if the value could not be read from the registry.
   bool Initialize(const base::win::RegKey& key);
 
@@ skipping 33 matching lines @@
 
  private:
   static bool HasModifier(const wchar_t* modifier,
                           const std::wstring& ap_value);
   static bool SetModifier(const wchar_t* modifier, bool set,
                           std::wstring* ap_value);
 
   std::wstring value_;
 };  // class ChannelInfo
 
-}  // namespace installer_util
+}  // namespace installer
 
 #endif  // CHROME_INSTALLER_UTIL_CHANNEL_INFO_H_