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, 10 insertions, 8 deletions

diff --git a/chrome/browser/notifications/extension_welcome_notification_factory.cc b/chrome/browser/notifications/extension_welcome_notification_factory.cc
index f8baf39..0402eb6 100644
--- a/chrome/browser/notifications/extension_welcome_notification_factory.cc
+++ b/chrome/browser/notifications/extension_welcome_notification_factory.cc
@@ -23,7 +23,7 @@ ExtensionWelcomeNotificationFactory::GetForBrowserContext(
 // static
 ExtensionWelcomeNotificationFactory*
 ExtensionWelcomeNotificationFactory::GetInstance() {
-  return Singleton<ExtensionWelcomeNotificationFactory>::get();
+  return base::Singleton<ExtensionWelcomeNotificationFactory>::get();
 }
 
 ExtensionWelcomeNotificationFactory::ExtensionWelcomeNotificationFactory()
diff --git a/chrome/browser/notifications/extension_welcome_notification_factory.h b/chrome/browser/notifications/extension_welcome_notification_factory.h
index e51a9ac..723bbb3 100644
--- a/chrome/browser/notifications/extension_welcome_notification_factory.h
+++ b/chrome/browser/notifications/extension_welcome_notification_factory.h
@@ -22,7 +22,8 @@ class ExtensionWelcomeNotificationFactory
   static ExtensionWelcomeNotificationFactory* GetInstance();
 
  private:
-  friend struct DefaultSingletonTraits<ExtensionWelcomeNotificationFactory>;
+  friend struct base::DefaultSingletonTraits<
+      ExtensionWelcomeNotificationFactory>;
 
   ExtensionWelcomeNotificationFactory();
   ~ExtensionWelcomeNotificationFactory() override;
diff --git a/chrome/browser/notifications/notification_permission_context_factory.cc b/chrome/browser/notifications/notification_permission_context_factory.cc
index 08e3d0b..7a3ef03 100644
--- a/chrome/browser/notifications/notification_permission_context_factory.cc
+++ b/chrome/browser/notifications/notification_permission_context_factory.cc
@@ -19,7 +19,7 @@ NotificationPermissionContextFactory::GetForProfile(Profile* profile) {
 // static
 NotificationPermissionContextFactory*
 NotificationPermissionContextFactory::GetInstance() {
-  return Singleton<NotificationPermissionContextFactory>::get();
+  return base::Singleton<NotificationPermissionContextFactory>::get();
 }
 
 NotificationPermissionContextFactory::NotificationPermissionContextFactory()
diff --git a/chrome/browser/notifications/notification_permission_context_factory.h b/chrome/browser/notifications/notification_permission_context_factory.h
index c47a56d..519cac4 100644
--- a/chrome/browser/notifications/notification_permission_context_factory.h
+++ b/chrome/browser/notifications/notification_permission_context_factory.h
@@ -18,7 +18,8 @@ class NotificationPermissionContextFactory
   static NotificationPermissionContextFactory* GetInstance();
 
  private:
-  friend struct DefaultSingletonTraits<NotificationPermissionContextFactory>;
+  friend struct base::DefaultSingletonTraits<
+      NotificationPermissionContextFactory>;
 
   NotificationPermissionContextFactory();
   ~NotificationPermissionContextFactory() override;
diff --git a/chrome/browser/notifications/notifier_state_tracker_factory.cc b/chrome/browser/notifications/notifier_state_tracker_factory.cc
index b54b839..69dfa24 100644
--- a/chrome/browser/notifications/notifier_state_tracker_factory.cc
+++ b/chrome/browser/notifications/notifier_state_tracker_factory.cc
@@ -20,7 +20,7 @@ NotifierStateTrackerFactory::GetForProfile(Profile* profile) {
 // static
 NotifierStateTrackerFactory*
 NotifierStateTrackerFactory::GetInstance() {
-  return Singleton<NotifierStateTrackerFactory>::get();
+  return base::Singleton<NotifierStateTrackerFactory>::get();
 }
 
 NotifierStateTrackerFactory::NotifierStateTrackerFactory()
diff --git a/chrome/browser/notifications/notifier_state_tracker_factory.h b/chrome/browser/notifications/notifier_state_tracker_factory.h
index fb0abd1..f122a580 100644
--- a/chrome/browser/notifications/notifier_state_tracker_factory.h
+++ b/chrome/browser/notifications/notifier_state_tracker_factory.h
@@ -17,7 +17,7 @@ class NotifierStateTrackerFactory : public BrowserContextKeyedServiceFactory {
   static NotifierStateTrackerFactory* GetInstance();
 
  private:
-  friend struct DefaultSingletonTraits<NotifierStateTrackerFactory>;
+  friend struct base::DefaultSingletonTraits<NotifierStateTrackerFactory>;
 
   NotifierStateTrackerFactory();
   ~NotifierStateTrackerFactory() override;
diff --git a/chrome/browser/notifications/platform_notification_service_impl.cc b/chrome/browser/notifications/platform_notification_service_impl.cc
index 95bc0e6..2f39c33 100644
--- a/chrome/browser/notifications/platform_notification_service_impl.cc
+++ b/chrome/browser/notifications/platform_notification_service_impl.cc
@@ -76,7 +76,7 @@ void CancelNotification(const std::string& id, ProfileID profile_id) {
 // static
 PlatformNotificationServiceImpl*
 PlatformNotificationServiceImpl::GetInstance() {
-  return Singleton<PlatformNotificationServiceImpl>::get();
+  return base::Singleton<PlatformNotificationServiceImpl>::get();
 }
 
 PlatformNotificationServiceImpl::PlatformNotificationServiceImpl()
diff --git a/chrome/browser/notifications/platform_notification_service_impl.h b/chrome/browser/notifications/platform_notification_service_impl.h
index f9a4375..06ee563 100644
--- a/chrome/browser/notifications/platform_notification_service_impl.h
+++ b/chrome/browser/notifications/platform_notification_service_impl.h
@@ -86,7 +86,7 @@ class PlatformNotificationServiceImpl
       std::set<std::string>* displayed_notifications) override;
 
  private:
-  friend struct DefaultSingletonTraits<PlatformNotificationServiceImpl>;
+  friend struct base::DefaultSingletonTraits<PlatformNotificationServiceImpl>;
   friend class PlatformNotificationServiceBrowserTest;
   friend class PlatformNotificationServiceTest;
   friend class PushMessagingBrowserTest;