Move Singleton and related structs to namespace base

chrome/browser/extensions/extension_system_factory.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_system_factory.h"
 
 #include "chrome/browser/extensions/blacklist_factory.h"
 #include "chrome/browser/extensions/extension_management.h"
 #include "chrome/browser/extensions/install_verifier_factory.h"
 #include "chrome/browser/policy/profile_policy_connector_factory.h"
@@ skipping 17 matching lines @@
 // static
 ExtensionSystemImpl::Shared*
 ExtensionSystemSharedFactory::GetForBrowserContext(
     content::BrowserContext* context) {
   return static_cast<ExtensionSystemImpl::Shared*>(
       GetInstance()->GetServiceForBrowserContext(context, true));
 }
 
 // static
 ExtensionSystemSharedFactory* ExtensionSystemSharedFactory::GetInstance() {
-  return Singleton<ExtensionSystemSharedFactory>::get();
+  return base::Singleton<ExtensionSystemSharedFactory>::get();
 }
 
 ExtensionSystemSharedFactory::ExtensionSystemSharedFactory()
     : BrowserContextKeyedServiceFactory(
         "ExtensionSystemShared",
         BrowserContextDependencyManager::GetInstance()) {
   DependsOn(ExtensionPrefsFactory::GetInstance());
   DependsOn(ExtensionManagementFactory::GetInstance());
   // This depends on ExtensionService which depends on ExtensionRegistry.
   DependsOn(ExtensionRegistryFactory::GetInstance());
@@ skipping 28 matching lines @@
 
 // static
 ExtensionSystem* ExtensionSystemFactory::GetForBrowserContext(
     content::BrowserContext* context) {
   return static_cast<ExtensionSystem*>(
       GetInstance()->GetServiceForBrowserContext(context, true));
 }
 
 // static
 ExtensionSystemFactory* ExtensionSystemFactory::GetInstance() {
-  return Singleton<ExtensionSystemFactory>::get();
+  return base::Singleton<ExtensionSystemFactory>::get();
 }
 
 ExtensionSystemFactory::ExtensionSystemFactory()
     : ExtensionSystemProvider("ExtensionSystem",
                               BrowserContextDependencyManager::GetInstance()) {
   DCHECK(ExtensionsBrowserClient::Get())
       << "ExtensionSystemFactory must be initialized after BrowserProcess";
   DependsOn(ExtensionSystemSharedFactory::GetInstance());
 }
 
 ExtensionSystemFactory::~ExtensionSystemFactory() {
 }
 
 KeyedService* ExtensionSystemFactory::BuildServiceInstanceFor(
     content::BrowserContext* context) const {
   return new ExtensionSystemImpl(static_cast<Profile*>(context));
 }
 
 content::BrowserContext* ExtensionSystemFactory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
   // Separate instance in incognito.
   return context;
 }
 
 bool ExtensionSystemFactory::ServiceIsCreatedWithBrowserContext() const {
   return true;
 }
 
 }  // namespace extensions