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}

6 files changed, 7 insertions, 8 deletions

diff --git a/chrome/browser/plugins/chrome_plugin_service_filter.cc b/chrome/browser/plugins/chrome_plugin_service_filter.cc
index 8089d94..35b5bee 100644
--- a/chrome/browser/plugins/chrome_plugin_service_filter.cc
+++ b/chrome/browser/plugins/chrome_plugin_service_filter.cc
@@ -180,7 +180,7 @@ bool NPAPIRemovalInfoBarDelegate::LinkClicked(
 
 // static
 ChromePluginServiceFilter* ChromePluginServiceFilter::GetInstance() {
-  return Singleton<ChromePluginServiceFilter>::get();
+  return base::Singleton<ChromePluginServiceFilter>::get();
 }
 
 void ChromePluginServiceFilter::RegisterResourceContext(
diff --git a/chrome/browser/plugins/chrome_plugin_service_filter.h b/chrome/browser/plugins/chrome_plugin_service_filter.h
index 4b11483..ee30a6c 100644
--- a/chrome/browser/plugins/chrome_plugin_service_filter.h
+++ b/chrome/browser/plugins/chrome_plugin_service_filter.h
@@ -98,7 +98,7 @@ class ChromePluginServiceFilter : public content::PluginServiceFilter,
                          const content::WebPluginInfo& info) override;
 
  private:
-  friend struct DefaultSingletonTraits<ChromePluginServiceFilter>;
+  friend struct base::DefaultSingletonTraits<ChromePluginServiceFilter>;
 
   struct OverriddenPlugin {
     OverriddenPlugin();
diff --git a/chrome/browser/plugins/plugin_finder.cc b/chrome/browser/plugins/plugin_finder.cc
index dc6ec05..6c68179 100644
--- a/chrome/browser/plugins/plugin_finder.cc
+++ b/chrome/browser/plugins/plugin_finder.cc
@@ -161,8 +161,8 @@ void PluginFinder::RegisterPrefs(PrefRegistrySimple* registry) {
 // static
 PluginFinder* PluginFinder::GetInstance() {
   // PluginFinder::GetInstance() is the only method that's allowed to call
-  // Singleton<PluginFinder>::get().
-  return Singleton<PluginFinder>::get();
+  // base::Singleton<PluginFinder>::get().
+  return base::Singleton<PluginFinder>::get();
 }
 
 PluginFinder::PluginFinder() : version_(-1) {
diff --git a/chrome/browser/plugins/plugin_finder.h b/chrome/browser/plugins/plugin_finder.h
index 6556a3d..6a12911 100644
--- a/chrome/browser/plugins/plugin_finder.h
+++ b/chrome/browser/plugins/plugin_finder.h
@@ -74,8 +74,7 @@ class PluginFinder {
       const content::WebPluginInfo& plugin);
 
  private:
-  friend struct DefaultSingletonTraits<PluginFinder>;
-  friend class Singleton<PluginFinder>;
+  friend struct base::DefaultSingletonTraits<PluginFinder>;
   FRIEND_TEST_ALL_PREFIXES(PluginFinderTest, JsonSyntax);
   FRIEND_TEST_ALL_PREFIXES(PluginFinderTest, PluginGroups);
 
diff --git a/chrome/browser/plugins/plugin_prefs_factory.cc b/chrome/browser/plugins/plugin_prefs_factory.cc
index 35eead5..8ec72d5 100644
--- a/chrome/browser/plugins/plugin_prefs_factory.cc
+++ b/chrome/browser/plugins/plugin_prefs_factory.cc
@@ -17,7 +17,7 @@
 
 // static
 PluginPrefsFactory* PluginPrefsFactory::GetInstance() {
-  return Singleton<PluginPrefsFactory>::get();
+  return base::Singleton<PluginPrefsFactory>::get();
 }
 
 // static
diff --git a/chrome/browser/plugins/plugin_prefs_factory.h b/chrome/browser/plugins/plugin_prefs_factory.h
index a4dd05b..0b8332b 100644
--- a/chrome/browser/plugins/plugin_prefs_factory.h
+++ b/chrome/browser/plugins/plugin_prefs_factory.h
@@ -20,7 +20,7 @@ class PluginPrefsFactory : public RefcountedBrowserContextKeyedServiceFactory {
 
  private:
   friend class PluginPrefs;
-  friend struct DefaultSingletonTraits<PluginPrefsFactory>;
+  friend struct base::DefaultSingletonTraits<PluginPrefsFactory>;
 
   // Helper method for PluginPrefs::GetForTestingProfile.
   static scoped_refptr<RefcountedKeyedService> CreateForTestingProfile(