Move Singleton and related structs to namespace base

Public APIs from base should live inside base:: so moved Singleton class
and structs to base{} and fixed consumers.

also fixed:

** Presubmit ERRORS **
Found Singleton<T> in the following header files.
Please move them to an appropriate source file so that the template
gets instantiated in a single compilation unit.
  chrome/browser/plugins/plugin_finder.h \
  chromecast/media/base/media_message_loop.h \
  content/browser/media/android/media_drm_credential_manager.h

Presubmit warnings:
src/chrome/browser/extensions/warning_badge_service_factory.h:5:
  #ifndef header guard has wrong style, please use:
  CHROME_BROWSER_EXTENSIONS_WARNING_BADGE_SERVICE_FACTORY_H_
  [build/header_guard] [5]
src/chrome/browser/extensions/warning_badge_service_factory.h:39:
  #endif line should be "#endif  //
  CHROME_BROWSER_EXTENSIONS_WARNING_BADGE_SERVICE_FACTORY_H_"
  [build/header_guard] [5]

TBR=jam@chromium.org

Review URL: https://codereview.chromium.org/1308823002

Cr-Commit-Position: refs/heads/master@{#348136}

10 files changed, 20 insertions, 18 deletions

diff --git a/chrome/browser/speech/extension_api/tts_engine_extension_api.cc b/chrome/browser/speech/extension_api/tts_engine_extension_api.cc
index eff4dee..e7e952d 100644
--- a/chrome/browser/speech/extension_api/tts_engine_extension_api.cc
+++ b/chrome/browser/speech/extension_api/tts_engine_extension_api.cc
@@ -65,7 +65,7 @@ void WarnIfMissingPauseOrResumeListener(
 }  // namespace
 
 TtsExtensionEngine* TtsExtensionEngine::GetInstance() {
-  return Singleton<TtsExtensionEngine>::get();
+  return base::Singleton<TtsExtensionEngine>::get();
 }
 
 void TtsExtensionEngine::GetVoices(content::BrowserContext* browser_context,
diff --git a/chrome/browser/speech/extension_api/tts_engine_extension_observer.cc b/chrome/browser/speech/extension_api/tts_engine_extension_observer.cc
index 61c2fb4..852621e 100644
--- a/chrome/browser/speech/extension_api/tts_engine_extension_observer.cc
+++ b/chrome/browser/speech/extension_api/tts_engine_extension_observer.cc
@@ -27,11 +27,11 @@ class TtsEngineExtensionObserverFactory
   }
 
   static TtsEngineExtensionObserverFactory* GetInstance() {
-    return Singleton<TtsEngineExtensionObserverFactory>::get();
+    return base::Singleton<TtsEngineExtensionObserverFactory>::get();
   }
 
  private:
-  friend struct DefaultSingletonTraits<TtsEngineExtensionObserverFactory>;
+  friend struct base::DefaultSingletonTraits<TtsEngineExtensionObserverFactory>;
 
   TtsEngineExtensionObserverFactory()
       : BrowserContextKeyedServiceFactory(
diff --git a/chrome/browser/speech/tts_android.cc b/chrome/browser/speech/tts_android.cc
index 7fe5b02..bcc501c 100644
--- a/chrome/browser/speech/tts_android.cc
+++ b/chrome/browser/speech/tts_android.cc
@@ -135,8 +135,9 @@ void TtsPlatformImplAndroid::SendFinalTtsEvent(
 
 // static
 TtsPlatformImplAndroid* TtsPlatformImplAndroid::GetInstance() {
-  return Singleton<TtsPlatformImplAndroid,
-                   LeakySingletonTraits<TtsPlatformImplAndroid> >::get();
+  return base::Singleton<
+      TtsPlatformImplAndroid,
+      base::LeakySingletonTraits<TtsPlatformImplAndroid>>::get();
 }
 
 // static
diff --git a/chrome/browser/speech/tts_android.h b/chrome/browser/speech/tts_android.h
index 6dcf02b..f6ce3b2 100644
--- a/chrome/browser/speech/tts_android.h
+++ b/chrome/browser/speech/tts_android.h
@@ -35,7 +35,7 @@ class TtsPlatformImplAndroid : public TtsPlatformImpl {
   static bool Register(JNIEnv* env);
 
  private:
-  friend struct DefaultSingletonTraits<TtsPlatformImplAndroid>;
+  friend struct base::DefaultSingletonTraits<TtsPlatformImplAndroid>;
 
   TtsPlatformImplAndroid();
   ~TtsPlatformImplAndroid() override;
diff --git a/chrome/browser/speech/tts_chromeos.cc b/chrome/browser/speech/tts_chromeos.cc
index 4f35e9e..a45bb3a 100644
--- a/chrome/browser/speech/tts_chromeos.cc
+++ b/chrome/browser/speech/tts_chromeos.cc
@@ -48,7 +48,7 @@ class TtsPlatformImplChromeOs : public TtsPlatformImpl {
   TtsPlatformImplChromeOs() {}
   ~TtsPlatformImplChromeOs() override {}
 
-  friend struct DefaultSingletonTraits<TtsPlatformImplChromeOs>;
+  friend struct base::DefaultSingletonTraits<TtsPlatformImplChromeOs>;
 
   DISALLOW_COPY_AND_ASSIGN(TtsPlatformImplChromeOs);
 };
@@ -61,5 +61,5 @@ TtsPlatformImpl* TtsPlatformImpl::GetInstance() {
 // static
 TtsPlatformImplChromeOs*
 TtsPlatformImplChromeOs::GetInstance() {
-  return Singleton<TtsPlatformImplChromeOs>::get();
+  return base::Singleton<TtsPlatformImplChromeOs>::get();
 }
diff --git a/chrome/browser/speech/tts_controller_impl.cc b/chrome/browser/speech/tts_controller_impl.cc
index 07748fe..ad41da5 100644
--- a/chrome/browser/speech/tts_controller_impl.cc
+++ b/chrome/browser/speech/tts_controller_impl.cc
@@ -111,7 +111,7 @@ TtsController* TtsController::GetInstance() {
 
 // static
 TtsControllerImpl* TtsControllerImpl::GetInstance() {
-  return Singleton<TtsControllerImpl>::get();
+  return base::Singleton<TtsControllerImpl>::get();
 }
 
 TtsControllerImpl::TtsControllerImpl()
diff --git a/chrome/browser/speech/tts_controller_impl.h b/chrome/browser/speech/tts_controller_impl.h
index 695f4bb..dc53d5e 100644
--- a/chrome/browser/speech/tts_controller_impl.h
+++ b/chrome/browser/speech/tts_controller_impl.h
@@ -75,7 +75,7 @@ class TtsControllerImpl : public TtsController {
   int GetMatchingVoice(const Utterance* utterance,
                        std::vector<VoiceData>& voices);
 
-  friend struct DefaultSingletonTraits<TtsControllerImpl>;
+  friend struct base::DefaultSingletonTraits<TtsControllerImpl>;
 
   // The current utterance being spoken.
   Utterance* current_utterance_;
diff --git a/chrome/browser/speech/tts_linux.cc b/chrome/browser/speech/tts_linux.cc
index 05360b1..ba15516 100644
--- a/chrome/browser/speech/tts_linux.cc
+++ b/chrome/browser/speech/tts_linux.cc
@@ -83,7 +83,7 @@ class TtsPlatformImplLinux : public TtsPlatformImpl {
   // uniquely identify a voice across all available modules.
   scoped_ptr<std::map<std::string, SPDChromeVoice> > all_native_voices_;
 
-  friend struct DefaultSingletonTraits<TtsPlatformImplLinux>;
+  friend struct base::DefaultSingletonTraits<TtsPlatformImplLinux>;
 
   DISALLOW_COPY_AND_ASSIGN(TtsPlatformImplLinux);
 };
@@ -346,8 +346,9 @@ void TtsPlatformImplLinux::IndexMarkCallback(size_t msg_id,
 
 // static
 TtsPlatformImplLinux* TtsPlatformImplLinux::GetInstance() {
-  return Singleton<TtsPlatformImplLinux,
-                   LeakySingletonTraits<TtsPlatformImplLinux> >::get();
+  return base::Singleton<
+      TtsPlatformImplLinux,
+      base::LeakySingletonTraits<TtsPlatformImplLinux>>::get();
 }
 
 // static
diff --git a/chrome/browser/speech/tts_mac.mm b/chrome/browser/speech/tts_mac.mm
index 21aa9a2..a492dd5 100644
--- a/chrome/browser/speech/tts_mac.mm
+++ b/chrome/browser/speech/tts_mac.mm
@@ -89,7 +89,7 @@ class TtsPlatformImplMac : public TtsPlatformImpl {
   int last_char_index_;
   bool paused_;
 
-  friend struct DefaultSingletonTraits<TtsPlatformImplMac>;
+  friend struct base::DefaultSingletonTraits<TtsPlatformImplMac>;
 
   DISALLOW_COPY_AND_ASSIGN(TtsPlatformImplMac);
 };
@@ -289,7 +289,7 @@ TtsPlatformImplMac::~TtsPlatformImplMac() {
 
 // static
 TtsPlatformImplMac* TtsPlatformImplMac::GetInstance() {
-  return Singleton<TtsPlatformImplMac>::get();
+  return base::Singleton<TtsPlatformImplMac>::get();
 }
 
 @implementation ChromeTtsDelegate
diff --git a/chrome/browser/speech/tts_win.cc b/chrome/browser/speech/tts_win.cc
index 1886bd0..ac25820 100644
--- a/chrome/browser/speech/tts_win.cc
+++ b/chrome/browser/speech/tts_win.cc
@@ -57,7 +57,7 @@ class TtsPlatformImplWin : public TtsPlatformImpl {
   int char_position_;
   bool paused_;
 
-  friend struct DefaultSingletonTraits<TtsPlatformImplWin>;
+  friend struct base::DefaultSingletonTraits<TtsPlatformImplWin>;
 
   DISALLOW_COPY_AND_ASSIGN(TtsPlatformImplWin);
 };
@@ -248,8 +248,8 @@ TtsPlatformImplWin::TtsPlatformImplWin()
 
 // static
 TtsPlatformImplWin* TtsPlatformImplWin::GetInstance() {
-  return Singleton<TtsPlatformImplWin,
-                   LeakySingletonTraits<TtsPlatformImplWin> >::get();
+  return base::Singleton<TtsPlatformImplWin,
+                         base::LeakySingletonTraits<TtsPlatformImplWin>>::get();
 }
 
 // static