Move Singleton and related structs to namespace base

chrome/browser/extensions/extension_action_manager.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/extension_action_manager.h"
 
 #include "chrome/browser/extensions/api/system_indicator/system_indicator_manager_factory.h"
 #include "chrome/browser/extensions/extension_action.h"
 #include "chrome/browser/profiles/profile.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
@@ skipping 12 matching lines @@
   // BrowserContextKeyedServiceFactory implementation:
   static ExtensionActionManager* GetForBrowserContext(
       content::BrowserContext* context) {
     return static_cast<ExtensionActionManager*>(
         GetInstance()->GetServiceForBrowserContext(context, true));
   }
 
   static ExtensionActionManagerFactory* GetInstance();
 
  private:
-  friend struct DefaultSingletonTraits<ExtensionActionManagerFactory>;
+  friend struct base::DefaultSingletonTraits<ExtensionActionManagerFactory>;
 
   ExtensionActionManagerFactory()
       : BrowserContextKeyedServiceFactory(
           "ExtensionActionManager",
           BrowserContextDependencyManager::GetInstance()) {
   }
 
   KeyedService* BuildServiceInstanceFor(
       content::BrowserContext* profile) const override {
     return new ExtensionActionManager(static_cast<Profile*>(profile));
   }
 
   content::BrowserContext* GetBrowserContextToUse(
       content::BrowserContext* context) const override {
     return ExtensionsBrowserClient::Get()->GetOriginalContext(context);
   }
 };
 
 ExtensionActionManagerFactory*
 ExtensionActionManagerFactory::GetInstance() {
-  return Singleton<ExtensionActionManagerFactory>::get();
+  return base::Singleton<ExtensionActionManagerFactory>::get();
 }
 
 }  // namespace
 
 ExtensionActionManager::ExtensionActionManager(Profile* profile)
     : profile_(profile), extension_registry_observer_(this) {
   CHECK_EQ(profile, profile->GetOriginalProfile())
       << "Don't instantiate this with an incognito profile.";
   extension_registry_observer_.Add(ExtensionRegistry::Get(profile_));
 }
@@ skipping 98 matching lines @@
                            profile_);
 }
 
 ExtensionAction* ExtensionActionManager::GetExtensionAction(
     const Extension& extension) const {
   ExtensionAction* action = GetBrowserAction(extension);
   return action ? action : GetPageAction(extension);
 }
 
 }  // namespace extensions