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

chrome/installer/util/channel_info.cc

 // 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.
 
 #include "chrome/installer/util/channel_info.h"
 
 #include "base/logging.h"
 #include "base/win/registry.h"
 #include "chrome/installer/util/google_update_constants.h"
 
@@ skipping 13 matching lines @@
 };
 
 const wchar_t* const kModifiers[] = {
   kModCeee,
   kModFullInstall,
   kModMultiInstall
 };
 
 }  // namespace
 
-namespace installer_util {
+namespace installer {
 
 // static
 bool ChannelInfo::HasModifier(const wchar_t* modifier,
                               const std::wstring& ap_value) {
   DCHECK(modifier);
   return ap_value.find(modifier) != std::wstring::npos;
 }
 
 // Returns true if |ap_value| is modified.
 // static
@@ skipping 73 matching lines @@
 }
 
 bool ChannelInfo::IsMultiInstall() const {
   return HasModifier(kModMultiInstall, value_);
 }
 
 bool ChannelInfo::SetMultiInstall(bool value) {
   return SetModifier(kModMultiInstall, value, &value_);
 }
 
-}  // namespace installer_util
+}  // namespace installer