Move Singleton and related structs to namespace base

chrome/browser/speech/extension_api/tts_engine_extension_observer.cc

 // Copyright 2014 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/speech/extension_api/tts_engine_extension_observer.h"
 
 #include "base/logging.h"
 #include "base/memory/singleton.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/incognito_helpers.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/speech/extension_api/tts_engine_extension_api.h"
 #include "chrome/browser/speech/tts_controller.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "components/keyed_service/content/browser_context_keyed_service_factory.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "extensions/browser/event_router.h"
 #include "extensions/browser/event_router_factory.h"
 
 // Factory to load one instance of TtsExtensionLoaderChromeOs per profile.
 class TtsEngineExtensionObserverFactory
     : public BrowserContextKeyedServiceFactory {
  public:
   static TtsEngineExtensionObserver* GetForProfile(Profile* profile) {
     return static_cast<TtsEngineExtensionObserver*>(
         GetInstance()->GetServiceForBrowserContext(profile, true));
   }
 
   static TtsEngineExtensionObserverFactory* GetInstance() {
-    return Singleton<TtsEngineExtensionObserverFactory>::get();
+    return base::Singleton<TtsEngineExtensionObserverFactory>::get();
   }
 
  private:
-  friend struct DefaultSingletonTraits<TtsEngineExtensionObserverFactory>;
+  friend struct base::DefaultSingletonTraits<TtsEngineExtensionObserverFactory>;
 
   TtsEngineExtensionObserverFactory()
       : BrowserContextKeyedServiceFactory(
             "TtsEngineExtensionObserver",
             BrowserContextDependencyManager::GetInstance()) {
     DependsOn(extensions::EventRouterFactory::GetInstance());
   }
 
   ~TtsEngineExtensionObserverFactory() override {}
 
@@ skipping 74 matching lines @@
 void TtsEngineExtensionObserver::OnExtensionUnloaded(
     content::BrowserContext* browser_context,
     const extensions::Extension* extension,
     extensions::UnloadedExtensionInfo::Reason reason) {
   if (engine_extension_ids_.find(extension->id()) !=
       engine_extension_ids_.end()) {
     engine_extension_ids_.erase(extension->id());
     TtsController::GetInstance()->VoicesChanged();
   }
 }