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

chrome/installer/util/l10n_string_util.cc

 // 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 defines specific implementation of BrowserDistribution class for
 // Google Chrome.
 
 #include <atlbase.h>
 
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
 #include "chrome/installer/util/language_selector.h"
 
 namespace {
 
-const installer_util::LanguageSelector& GetLanguageSelector() {
-  static const installer_util::LanguageSelector instance;
+const installer::LanguageSelector& GetLanguageSelector() {
+  static const installer::LanguageSelector instance;
 
   return instance;
 }
 
 }  // namespace
 
-namespace installer_util {
+namespace installer {
 
 std::wstring GetLocalizedString(int base_message_id) {
   std::wstring localized_string;
 
   int message_id = base_message_id + GetLanguageSelector().offset();
   const ATLSTRINGRESOURCEIMAGE* image = AtlGetStringResourceImage(
       _AtlBaseModule.GetModuleInstance(), message_id);
   if (image) {
     localized_string = std::wstring(image->achString, image->nLength);
   } else {
@@ skipping 32 matching lines @@
   DCHECK(kuint32max > (url_path.size() * 3));
   DWORD count = static_cast<DWORD>(url_path.size() * 3);
   scoped_array<wchar_t> url_canon(new wchar_t[count]);
   HRESULT hr = ::UrlCanonicalizeW(url_path.c_str(), url_canon.get(),
                                   &count, URL_ESCAPE_UNSAFE);
   if (SUCCEEDED(hr))
     return std::wstring(url_canon.get());
   return url_path;
 }
 
-}  // namespace installer_util
+}  // namespace installer