Move Singleton and related structs to namespace base

components/autofill/core/browser/autofill_country.cc

 // Copyright 2013 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 "components/autofill/core/browser/autofill_country.h"
 
 #include <stddef.h>
 #include <stdint.h>
 #include <map>
 #include <utility>
@@ skipping 774 matching lines @@
   // A const iterator over the wrapped map data.
   typedef std::map<std::string, CountryData>::const_iterator Iterator;
 
   static CountryDataMap* GetInstance();
   static const Iterator Begin();
   static const Iterator End();
   static const Iterator Find(const std::string& country_code);
 
  private:
   CountryDataMap();
-  friend struct DefaultSingletonTraits<CountryDataMap>;
+  friend struct base::DefaultSingletonTraits<CountryDataMap>;
 
   std::map<std::string, CountryData> country_data_;
 
   DISALLOW_COPY_AND_ASSIGN(CountryDataMap);
 };
 
 // static
 CountryDataMap* CountryDataMap::GetInstance() {
-  return Singleton<CountryDataMap>::get();
+  return base::Singleton<CountryDataMap>::get();
 }
 
 CountryDataMap::CountryDataMap() {
   // Add all the countries we have explicit data for.
   for (size_t i = 0; i < arraysize(kCountryData); ++i) {
     const StaticCountryData& static_data = kCountryData[i];
     country_data_.insert(std::make_pair(static_data.country_code,
                                         static_data.country_data));
   }
 
@@ skipping 33 matching lines @@
   static CountryNames* GetInstance();
 
   // Returns the country code corresponding to |country|, which should be a
   // country code or country name localized to |locale|.
   const std::string GetCountryCode(const base::string16& country,
                                    const std::string& locale);
 
  private:
   CountryNames();
   ~CountryNames();
-  friend struct DefaultSingletonTraits<CountryNames>;
+  friend struct base::DefaultSingletonTraits<CountryNames>;
 
   // Populates |locales_to_localized_names_| with the mapping of country names
   // localized to |locale| to their corresponding country codes.
   void AddLocalizedNamesForLocale(const std::string& locale);
 
   // Interprets |country_name| as a full country name localized to the given
   // |locale| and returns the corresponding country code stored in
   // |locales_to_localized_names_|, or an empty string if there is none.
   const std::string GetCountryCodeForLocalizedName(
       const base::string16& country_name,
@@ skipping 25 matching lines @@
       locales_to_localized_names_;
 
   // Maps ICU locale names to their corresponding collators.
   std::map<std::string, icu::Collator*> collators_;
 
   DISALLOW_COPY_AND_ASSIGN(CountryNames);
 };
 
 // static
 CountryNames* CountryNames::GetInstance() {
-  return Singleton<CountryNames>::get();
+  return base::Singleton<CountryNames>::get();
 }
 
 CountryNames::CountryNames() {
   // Add 2- and 3-letter ISO country codes.
   for (CountryDataMap::Iterator it = CountryDataMap::Begin();
        it != CountryDataMap::End();
        ++it) {
     const std::string& country_code = it->first;
     common_names_.insert(std::make_pair(country_code, country_code));
 
@@ skipping 195 matching lines @@
                                  const base::string16& name,
                                  const base::string16& postal_code_label,
                                  const base::string16& state_label)
     : country_code_(country_code),
       name_(name),
       postal_code_label_(postal_code_label),
       state_label_(state_label) {
 }
 
 }  // namespace autofill