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}

4 files changed, 5 insertions, 4 deletions

diff --git a/chrome/browser/extensions/api/passwords_private/passwords_private_delegate_factory.cc b/chrome/browser/extensions/api/passwords_private/passwords_private_delegate_factory.cc
index c73bf7f..ea89dc6 100644
--- a/chrome/browser/extensions/api/passwords_private/passwords_private_delegate_factory.cc
+++ b/chrome/browser/extensions/api/passwords_private/passwords_private_delegate_factory.cc
@@ -25,7 +25,7 @@ PasswordsPrivateDelegate* PasswordsPrivateDelegateFactory::GetForBrowserContext(
 // static
 PasswordsPrivateDelegateFactory*
     PasswordsPrivateDelegateFactory::GetInstance() {
-  return Singleton<PasswordsPrivateDelegateFactory>::get();
+  return base::Singleton<PasswordsPrivateDelegateFactory>::get();
 }
 
 PasswordsPrivateDelegateFactory::PasswordsPrivateDelegateFactory()
diff --git a/chrome/browser/extensions/api/passwords_private/passwords_private_delegate_factory.h b/chrome/browser/extensions/api/passwords_private/passwords_private_delegate_factory.h
index a5cc994..fd8dffa 100644
--- a/chrome/browser/extensions/api/passwords_private/passwords_private_delegate_factory.h
+++ b/chrome/browser/extensions/api/passwords_private/passwords_private_delegate_factory.h
@@ -26,7 +26,7 @@ class PasswordsPrivateDelegateFactory
   static PasswordsPrivateDelegateFactory* GetInstance();
 
  private:
-  friend struct DefaultSingletonTraits<PasswordsPrivateDelegateFactory>;
+  friend struct base::DefaultSingletonTraits<PasswordsPrivateDelegateFactory>;
 
   PasswordsPrivateDelegateFactory();
   ~PasswordsPrivateDelegateFactory() override;
diff --git a/chrome/browser/extensions/api/passwords_private/passwords_private_event_router_factory.cc b/chrome/browser/extensions/api/passwords_private/passwords_private_event_router_factory.cc
index af54105..80dd51b 100644
--- a/chrome/browser/extensions/api/passwords_private/passwords_private_event_router_factory.cc
+++ b/chrome/browser/extensions/api/passwords_private/passwords_private_event_router_factory.cc
@@ -24,7 +24,7 @@ PasswordsPrivateEventRouterFactory::GetForProfile(
 // static
 PasswordsPrivateEventRouterFactory*
 PasswordsPrivateEventRouterFactory::GetInstance() {
-  return Singleton<PasswordsPrivateEventRouterFactory>::get();
+  return base::Singleton<PasswordsPrivateEventRouterFactory>::get();
 }
 
 PasswordsPrivateEventRouterFactory::PasswordsPrivateEventRouterFactory()
diff --git a/chrome/browser/extensions/api/passwords_private/passwords_private_event_router_factory.h b/chrome/browser/extensions/api/passwords_private/passwords_private_event_router_factory.h
index c9c03a7..f412b35 100644
--- a/chrome/browser/extensions/api/passwords_private/passwords_private_event_router_factory.h
+++ b/chrome/browser/extensions/api/passwords_private/passwords_private_event_router_factory.h
@@ -34,7 +34,8 @@ class PasswordsPrivateEventRouterFactory
   bool ServiceIsNULLWhileTesting() const override;
 
  private:
-  friend struct DefaultSingletonTraits<PasswordsPrivateEventRouterFactory>;
+  friend struct base::DefaultSingletonTraits<
+      PasswordsPrivateEventRouterFactory>;
 
   PasswordsPrivateEventRouterFactory();
   ~PasswordsPrivateEventRouterFactory() override;