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}

8 files changed, 8 insertions, 8 deletions

diff --git a/apps/app_lifetime_monitor_factory.cc b/apps/app_lifetime_monitor_factory.cc
index d561fdd..03624a7 100644
--- a/apps/app_lifetime_monitor_factory.cc
+++ b/apps/app_lifetime_monitor_factory.cc
@@ -19,7 +19,7 @@ AppLifetimeMonitor* AppLifetimeMonitorFactory::GetForProfile(Profile* profile) {
 }
 
 AppLifetimeMonitorFactory* AppLifetimeMonitorFactory::GetInstance() {
-  return Singleton<AppLifetimeMonitorFactory>::get();
+  return base::Singleton<AppLifetimeMonitorFactory>::get();
 }
 
 AppLifetimeMonitorFactory::AppLifetimeMonitorFactory()
diff --git a/apps/app_lifetime_monitor_factory.h b/apps/app_lifetime_monitor_factory.h
index 1df284b..4beec38 100644
--- a/apps/app_lifetime_monitor_factory.h
+++ b/apps/app_lifetime_monitor_factory.h
@@ -24,7 +24,7 @@ class AppLifetimeMonitorFactory : public BrowserContextKeyedServiceFactory {
   static AppLifetimeMonitorFactory* GetInstance();
 
  private:
-  friend struct DefaultSingletonTraits<AppLifetimeMonitorFactory>;
+  friend struct base::DefaultSingletonTraits<AppLifetimeMonitorFactory>;
 
   AppLifetimeMonitorFactory();
   ~AppLifetimeMonitorFactory() override;
diff --git a/apps/app_load_service_factory.cc b/apps/app_load_service_factory.cc
index 94eac78..10acf68 100644
--- a/apps/app_load_service_factory.cc
+++ b/apps/app_load_service_factory.cc
@@ -22,7 +22,7 @@ AppLoadService* AppLoadServiceFactory::GetForProfile(Profile* profile) {
 }
 
 AppLoadServiceFactory* AppLoadServiceFactory::GetInstance() {
-  return Singleton<AppLoadServiceFactory>::get();
+  return base::Singleton<AppLoadServiceFactory>::get();
 }
 
 AppLoadServiceFactory::AppLoadServiceFactory()
diff --git a/apps/app_load_service_factory.h b/apps/app_load_service_factory.h
index 68fa7db..3c67b70 100644
--- a/apps/app_load_service_factory.h
+++ b/apps/app_load_service_factory.h
@@ -21,7 +21,7 @@ class AppLoadServiceFactory : public BrowserContextKeyedServiceFactory {
   static AppLoadServiceFactory* GetInstance();
 
  private:
-  friend struct DefaultSingletonTraits<AppLoadServiceFactory>;
+  friend struct base::DefaultSingletonTraits<AppLoadServiceFactory>;
 
   AppLoadServiceFactory();
   ~AppLoadServiceFactory() override;
diff --git a/apps/app_restore_service_factory.cc b/apps/app_restore_service_factory.cc
index 10dcd25..407b80d 100644
--- a/apps/app_restore_service_factory.cc
+++ b/apps/app_restore_service_factory.cc
@@ -18,7 +18,7 @@ AppRestoreService* AppRestoreServiceFactory::GetForProfile(Profile* profile) {
 }
 
 AppRestoreServiceFactory* AppRestoreServiceFactory::GetInstance() {
-  return Singleton<AppRestoreServiceFactory>::get();
+  return base::Singleton<AppRestoreServiceFactory>::get();
 }
 
 AppRestoreServiceFactory::AppRestoreServiceFactory()
diff --git a/apps/app_restore_service_factory.h b/apps/app_restore_service_factory.h
index 0c5189b..ec72fe7 100644
--- a/apps/app_restore_service_factory.h
+++ b/apps/app_restore_service_factory.h
@@ -24,7 +24,7 @@ class AppRestoreServiceFactory : public BrowserContextKeyedServiceFactory {
   static AppRestoreServiceFactory* GetInstance();
 
  private:
-  friend struct DefaultSingletonTraits<AppRestoreServiceFactory>;
+  friend struct base::DefaultSingletonTraits<AppRestoreServiceFactory>;
 
   AppRestoreServiceFactory();
   ~AppRestoreServiceFactory() override;
diff --git a/apps/saved_files_service_factory.cc b/apps/saved_files_service_factory.cc
index 94dcf31..9d813bf 100644
--- a/apps/saved_files_service_factory.cc
+++ b/apps/saved_files_service_factory.cc
@@ -18,7 +18,7 @@ SavedFilesService* SavedFilesServiceFactory::GetForProfile(Profile* profile) {
 
 // static
 SavedFilesServiceFactory* SavedFilesServiceFactory::GetInstance() {
-  return Singleton<SavedFilesServiceFactory>::get();
+  return base::Singleton<SavedFilesServiceFactory>::get();
 }
 
 SavedFilesServiceFactory::SavedFilesServiceFactory()
diff --git a/apps/saved_files_service_factory.h b/apps/saved_files_service_factory.h
index b7f4715..c560cc2 100644
--- a/apps/saved_files_service_factory.h
+++ b/apps/saved_files_service_factory.h
@@ -24,7 +24,7 @@ class SavedFilesServiceFactory : public BrowserContextKeyedServiceFactory {
  private:
   SavedFilesServiceFactory();
   ~SavedFilesServiceFactory() override;
-  friend struct DefaultSingletonTraits<SavedFilesServiceFactory>;
+  friend struct base::DefaultSingletonTraits<SavedFilesServiceFactory>;
 
   KeyedService* BuildServiceInstanceFor(
       content::BrowserContext* profile) const override;