Revert 69167, itself a revert of 69165 - Merge the installer, installer_util ...

chrome/installer/util/language_selector.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.
 //
 // This file declares a helper class for selecting a supported language from a
 // set of candidates.
 
 #ifndef CHROME_INSTALLER_UTIL_LANGUAGE_SELECTOR_H_
 #define CHROME_INSTALLER_UTIL_LANGUAGE_SELECTOR_H_
 #pragma once
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 
-namespace installer_util {
+namespace installer {
 
 // A helper class for selecting a supported language from a set of candidates.
 // By default, the candidates are retrieved from the operating system.
 class LanguageSelector {
  public:
   // Default constructor will select from the set of languages supported by the
   // operating system.
   LanguageSelector();
 
   // Constructor for testing purposes.
@@ skipping 20 matching lines @@
                        SelectPred_Fn select_predicate,
                        std::wstring* matched_name, int* matched_offset);
   void DoSelect(const std::vector<std::wstring>& candidates);
 
   std::wstring matched_candidate_;
   int offset_;
 
   DISALLOW_COPY_AND_ASSIGN(LanguageSelector);
 };
 
-}  // namespace installer_util.
+}  // namespace installer.
 
 #endif  // CHROME_INSTALLER_UTIL_LANGUAGE_SELECTOR_H_