Move Singleton and related structs to namespace base

chrome/browser/extensions/api/preference/preference_api.cc

 // Copyright (c) 2012 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/browser/extensions/api/preference/preference_api.h"
 
 #include <map>
 #include <utility>
 
 #include "base/lazy_instance.h"
@@ skipping 193 matching lines @@
     const bool pref_found = browser_pref->GetAsInteger(&int_value);
     DCHECK(pref_found) << "Preference not found.";
     return new base::FundamentalValue(
         int_value != chrome_browser_net::NETWORK_PREDICTION_NEVER);
   }
 };
 
 class PrefMapping {
  public:
   static PrefMapping* GetInstance() {
-    return Singleton<PrefMapping>::get();
+    return base::Singleton<PrefMapping>::get();
   }
 
   bool FindBrowserPrefForExtensionPref(const std::string& extension_pref,
                                        std::string* browser_pref,
                                        APIPermission::ID* read_permission,
                                        APIPermission::ID* write_permission) {
     PrefMap::iterator it = mapping_.find(extension_pref);
     if (it != mapping_.end()) {
       *browser_pref = it->second.pref_name;
       *read_permission = it->second.read_permission;
@@ skipping 19 matching lines @@
       const std::string& browser_pref) {
     std::map<std::string, PrefTransformerInterface*>::iterator it =
         transformers_.find(browser_pref);
     if (it != transformers_.end())
       return it->second;
     else
       return identity_transformer_.get();
   }
 
  private:
-  friend struct DefaultSingletonTraits<PrefMapping>;
+  friend struct base::DefaultSingletonTraits<PrefMapping>;
 
   PrefMapping() {
     identity_transformer_.reset(new IdentityPrefTransformer());
     for (size_t i = 0; i < arraysize(kPrefMapping); ++i) {
       mapping_[kPrefMapping[i].extension_pref] =
           PrefMapData(kPrefMapping[i].browser_pref,
                       kPrefMapping[i].read_permission,
                       kPrefMapping[i].write_permission);
       std::string event_name =
           base::StringPrintf(kOnPrefChangeFormat,
@@ skipping 508 matching lines @@
           pref_key, PreferenceFunction::PERMISSION_TYPE_WRITE, &browser_pref)) {
     return false;
   }
 
   PreferenceAPI::Get(GetProfile())
       ->RemoveExtensionControlledPref(extension_id(), browser_pref, scope);
   return true;
 }
 
 }  // namespace extensions