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}

66 files changed, 95 insertions, 81 deletions

diff --git a/chrome/browser/extensions/activity_log/activity_log.cc b/chrome/browser/extensions/activity_log/activity_log.cc
index db15fd30..346623c 100644
--- a/chrome/browser/extensions/activity_log/activity_log.cc
+++ b/chrome/browser/extensions/activity_log/activity_log.cc
@@ -154,7 +154,7 @@ static const ApiInfo kApiInfoTable[] = {
 class ApiInfoDatabase {
  public:
   static ApiInfoDatabase* GetInstance() {
-    return Singleton<ApiInfoDatabase>::get();
+    return base::Singleton<ApiInfoDatabase>::get();
   }
 
   // Retrieves an ApiInfo record for the given Action type.  Returns either a
@@ -184,7 +184,7 @@ class ApiInfoDatabase {
   // should still be checked before returning a positive match.
   std::map<std::string, const ApiInfo*> api_database_;
 
-  friend struct DefaultSingletonTraits<ApiInfoDatabase>;
+  friend struct base::DefaultSingletonTraits<ApiInfoDatabase>;
   DISALLOW_COPY_AND_ASSIGN(ApiInfoDatabase);
 };
 
diff --git a/chrome/browser/extensions/api/autofill_private/autofill_private_event_router_factory.cc b/chrome/browser/extensions/api/autofill_private/autofill_private_event_router_factory.cc
index a39f6b6..4126e95 100644
--- a/chrome/browser/extensions/api/autofill_private/autofill_private_event_router_factory.cc
+++ b/chrome/browser/extensions/api/autofill_private/autofill_private_event_router_factory.cc
@@ -23,7 +23,7 @@ AutofillPrivateEventRouterFactory::GetForProfile(
 // static
 AutofillPrivateEventRouterFactory*
 AutofillPrivateEventRouterFactory::GetInstance() {
-  return Singleton<AutofillPrivateEventRouterFactory>::get();
+  return base::Singleton<AutofillPrivateEventRouterFactory>::get();
 }
 
 AutofillPrivateEventRouterFactory::AutofillPrivateEventRouterFactory()
diff --git a/chrome/browser/extensions/api/autofill_private/autofill_private_event_router_factory.h b/chrome/browser/extensions/api/autofill_private/autofill_private_event_router_factory.h
index f7238ad..837b258 100644
--- a/chrome/browser/extensions/api/autofill_private/autofill_private_event_router_factory.h
+++ b/chrome/browser/extensions/api/autofill_private/autofill_private_event_router_factory.h
@@ -34,7 +34,7 @@ class AutofillPrivateEventRouterFactory
   bool ServiceIsNULLWhileTesting() const override;
 
  private:
-  friend struct DefaultSingletonTraits<AutofillPrivateEventRouterFactory>;
+  friend struct base::DefaultSingletonTraits<AutofillPrivateEventRouterFactory>;
 
   AutofillPrivateEventRouterFactory();
   ~AutofillPrivateEventRouterFactory() override;
diff --git a/chrome/browser/extensions/api/automation_internal/automation_event_router.cc b/chrome/browser/extensions/api/automation_internal/automation_event_router.cc
index 3e4539d..c13e9197 100644
--- a/chrome/browser/extensions/api/automation_internal/automation_event_router.cc
+++ b/chrome/browser/extensions/api/automation_internal/automation_event_router.cc
@@ -24,8 +24,9 @@ namespace extensions {
 
 // static
 AutomationEventRouter* AutomationEventRouter::GetInstance() {
-  return Singleton<AutomationEventRouter,
-                   LeakySingletonTraits<AutomationEventRouter>>::get();
+  return base::Singleton<
+      AutomationEventRouter,
+      base::LeakySingletonTraits<AutomationEventRouter>>::get();
 }
 
 AutomationEventRouter::AutomationEventRouter() {
diff --git a/chrome/browser/extensions/api/automation_internal/automation_event_router.h b/chrome/browser/extensions/api/automation_internal/automation_event_router.h
index 1389b43..56e7e33 100644
--- a/chrome/browser/extensions/api/automation_internal/automation_event_router.h
+++ b/chrome/browser/extensions/api/automation_internal/automation_event_router.h
@@ -79,7 +79,7 @@ class AutomationEventRouter : public content::NotificationObserver {
   content::NotificationRegistrar registrar_;
   std::vector<AutomationListener> listeners_;
 
-  friend struct DefaultSingletonTraits<AutomationEventRouter>;
+  friend struct base::DefaultSingletonTraits<AutomationEventRouter>;
 
   DISALLOW_COPY_AND_ASSIGN(AutomationEventRouter);
 };
diff --git a/chrome/browser/extensions/api/braille_display_private/braille_controller_brlapi.cc b/chrome/browser/extensions/api/braille_display_private/braille_controller_brlapi.cc
index 0ead4f5..641d224 100644
--- a/chrome/browser/extensions/api/braille_display_private/braille_controller_brlapi.cc
+++ b/chrome/browser/extensions/api/braille_display_private/braille_controller_brlapi.cc
@@ -46,8 +46,9 @@ BrailleController* BrailleController::GetInstance() {
 
 // static
 BrailleControllerImpl* BrailleControllerImpl::GetInstance() {
-  return Singleton<BrailleControllerImpl,
-                   LeakySingletonTraits<BrailleControllerImpl> >::get();
+  return base::Singleton<
+      BrailleControllerImpl,
+      base::LeakySingletonTraits<BrailleControllerImpl>>::get();
 }
 
 BrailleControllerImpl::BrailleControllerImpl()
diff --git a/chrome/browser/extensions/api/braille_display_private/braille_controller_brlapi.h b/chrome/browser/extensions/api/braille_display_private/braille_controller_brlapi.h
index f299e57..c8af59f 100644
--- a/chrome/browser/extensions/api/braille_display_private/braille_controller_brlapi.h
+++ b/chrome/browser/extensions/api/braille_display_private/braille_controller_brlapi.h
@@ -79,7 +79,7 @@ class BrailleControllerImpl : public BrailleController {
   // Manipulated on the FILE thread.
   base::FilePathWatcher file_path_watcher_;
 
-  friend struct DefaultSingletonTraits<BrailleControllerImpl>;
+  friend struct base::DefaultSingletonTraits<BrailleControllerImpl>;
 
   DISALLOW_COPY_AND_ASSIGN(BrailleControllerImpl);
 };
diff --git a/chrome/browser/extensions/api/braille_display_private/braille_controller_stub.cc b/chrome/browser/extensions/api/braille_display_private/braille_controller_stub.cc
index bd7b813..e2413b6 100644
--- a/chrome/browser/extensions/api/braille_display_private/braille_controller_stub.cc
+++ b/chrome/browser/extensions/api/braille_display_private/braille_controller_stub.cc
@@ -25,7 +25,7 @@ class BrailleControllerImpl : public BrailleController {
  private:
   BrailleControllerImpl();
   ~BrailleControllerImpl() override;
-  friend struct DefaultSingletonTraits<BrailleControllerImpl>;
+  friend struct base::DefaultSingletonTraits<BrailleControllerImpl>;
   DISALLOW_COPY_AND_ASSIGN(BrailleControllerImpl);
 };
 
@@ -48,8 +48,9 @@ BrailleControllerImpl::~BrailleControllerImpl() {
 
 // static
 BrailleControllerImpl* BrailleControllerImpl::GetInstance() {
-  return Singleton<BrailleControllerImpl,
-                   LeakySingletonTraits<BrailleControllerImpl> >::get();
+  return base::Singleton<
+      BrailleControllerImpl,
+      base::LeakySingletonTraits<BrailleControllerImpl>>::get();
 }
 
 scoped_ptr<DisplayState> BrailleControllerImpl::GetDisplayState() {
diff --git a/chrome/browser/extensions/api/desktop_capture/desktop_capture_base.cc b/chrome/browser/extensions/api/desktop_capture/desktop_capture_base.cc
index d20cd11..22302a1 100644
--- a/chrome/browser/extensions/api/desktop_capture/desktop_capture_base.cc
+++ b/chrome/browser/extensions/api/desktop_capture/desktop_capture_base.cc
@@ -214,7 +214,7 @@ DesktopCaptureRequestsRegistry::~DesktopCaptureRequestsRegistry() {}
 
 // static
 DesktopCaptureRequestsRegistry* DesktopCaptureRequestsRegistry::GetInstance() {
-  return Singleton<DesktopCaptureRequestsRegistry>::get();
+  return base::Singleton<DesktopCaptureRequestsRegistry>::get();
 }
 
 void DesktopCaptureRequestsRegistry::AddRequest(
diff --git a/chrome/browser/extensions/api/desktop_capture/desktop_capture_base.h b/chrome/browser/extensions/api/desktop_capture/desktop_capture_base.h
index 39cf378..92ea6cd 100644
--- a/chrome/browser/extensions/api/desktop_capture/desktop_capture_base.h
+++ b/chrome/browser/extensions/api/desktop_capture/desktop_capture_base.h
@@ -97,7 +97,7 @@ class DesktopCaptureRequestsRegistry {
   void CancelRequest(int process_id, int request_id);
 
  private:
-  friend struct DefaultSingletonTraits<DesktopCaptureRequestsRegistry>;
+  friend struct base::DefaultSingletonTraits<DesktopCaptureRequestsRegistry>;
 
   struct RequestId {
     RequestId(int process_id, int request_id);
diff --git a/chrome/browser/extensions/api/dial/dial_api_factory.cc b/chrome/browser/extensions/api/dial/dial_api_factory.cc
index 192f808..3acbe8b 100644
--- a/chrome/browser/extensions/api/dial/dial_api_factory.cc
+++ b/chrome/browser/extensions/api/dial/dial_api_factory.cc
@@ -20,7 +20,7 @@ scoped_refptr<DialAPI> DialAPIFactory::GetForBrowserContext(
 
 // static
 DialAPIFactory* DialAPIFactory::GetInstance() {
-  return Singleton<DialAPIFactory>::get();
+  return base::Singleton<DialAPIFactory>::get();
 }
 
 DialAPIFactory::DialAPIFactory() : RefcountedBrowserContextKeyedServiceFactory(
diff --git a/chrome/browser/extensions/api/dial/dial_api_factory.h b/chrome/browser/extensions/api/dial/dial_api_factory.h
index 9bfc05d..f965126 100644
--- a/chrome/browser/extensions/api/dial/dial_api_factory.h
+++ b/chrome/browser/extensions/api/dial/dial_api_factory.h
@@ -20,7 +20,7 @@ class DialAPIFactory : public RefcountedBrowserContextKeyedServiceFactory {
   static DialAPIFactory* GetInstance();
 
  private:
-  friend struct DefaultSingletonTraits<DialAPIFactory>;
+  friend struct base::DefaultSingletonTraits<DialAPIFactory>;
 
   DialAPIFactory();
   ~DialAPIFactory() override;
diff --git a/chrome/browser/extensions/api/input_ime/input_ime_api.cc b/chrome/browser/extensions/api/input_ime/input_ime_api.cc
index c76bb8d..8b0de98 100644
--- a/chrome/browser/extensions/api/input_ime/input_ime_api.cc
+++ b/chrome/browser/extensions/api/input_ime/input_ime_api.cc
@@ -419,7 +419,7 @@ class ImeObserver : public InputMethodEngineInterface::Observer {
 namespace extensions {
 
 InputImeEventRouterFactory* InputImeEventRouterFactory::GetInstance() {
-  return Singleton<InputImeEventRouterFactory>::get();
+  return base::Singleton<InputImeEventRouterFactory>::get();
 }
 
 InputImeEventRouterFactory::InputImeEventRouterFactory() {
diff --git a/chrome/browser/extensions/api/input_ime/input_ime_api.h b/chrome/browser/extensions/api/input_ime/input_ime_api.h
index 30fb3be0..de640b1 100644
--- a/chrome/browser/extensions/api/input_ime/input_ime_api.h
+++ b/chrome/browser/extensions/api/input_ime/input_ime_api.h
@@ -77,7 +77,7 @@ class InputImeEventRouterFactory {
   InputImeEventRouter* GetRouter(Profile* profile);
 
  private:
-  friend struct DefaultSingletonTraits<InputImeEventRouterFactory>;
+  friend struct base::DefaultSingletonTraits<InputImeEventRouterFactory>;
   InputImeEventRouterFactory();
   ~InputImeEventRouterFactory();
 
diff --git a/chrome/browser/extensions/api/language_settings_private/language_settings_private_delegate_factory.cc b/chrome/browser/extensions/api/language_settings_private/language_settings_private_delegate_factory.cc
index 11eeaf7..05ce0fc 100644
--- a/chrome/browser/extensions/api/language_settings_private/language_settings_private_delegate_factory.cc
+++ b/chrome/browser/extensions/api/language_settings_private/language_settings_private_delegate_factory.cc
@@ -24,7 +24,7 @@ LanguageSettingsPrivateDelegateFactory::GetForBrowserContext(
 // static
 LanguageSettingsPrivateDelegateFactory*
 LanguageSettingsPrivateDelegateFactory::GetInstance() {
-  return Singleton<LanguageSettingsPrivateDelegateFactory>::get();
+  return base::Singleton<LanguageSettingsPrivateDelegateFactory>::get();
 }
 
 LanguageSettingsPrivateDelegateFactory::LanguageSettingsPrivateDelegateFactory()
diff --git a/chrome/browser/extensions/api/language_settings_private/language_settings_private_delegate_factory.h b/chrome/browser/extensions/api/language_settings_private/language_settings_private_delegate_factory.h
index b7b1cde..e8ee67f 100644
--- a/chrome/browser/extensions/api/language_settings_private/language_settings_private_delegate_factory.h
+++ b/chrome/browser/extensions/api/language_settings_private/language_settings_private_delegate_factory.h
@@ -35,7 +35,7 @@ class LanguageSettingsPrivateDelegateFactory
   bool ServiceIsNULLWhileTesting() const override;
 
  private:
-  friend struct DefaultSingletonTraits<
+  friend struct base::DefaultSingletonTraits<
       LanguageSettingsPrivateDelegateFactory>;
 
   LanguageSettingsPrivateDelegateFactory();
diff --git a/chrome/browser/extensions/api/notifications/notifications_api.cc b/chrome/browser/extensions/api/notifications/notifications_api.cc
index 788c41e..ba47fa4 100644
--- a/chrome/browser/extensions/api/notifications/notifications_api.cc
+++ b/chrome/browser/extensions/api/notifications/notifications_api.cc
@@ -106,11 +106,11 @@ class ShutdownNotifierFactory
     : public BrowserContextKeyedServiceShutdownNotifierFactory {
  public:
   static ShutdownNotifierFactory* GetInstance() {
-    return Singleton<ShutdownNotifierFactory>::get();
+    return base::Singleton<ShutdownNotifierFactory>::get();
   }
 
  private:
-  friend struct DefaultSingletonTraits<ShutdownNotifierFactory>;
+  friend struct base::DefaultSingletonTraits<ShutdownNotifierFactory>;
 
   ShutdownNotifierFactory()
       : BrowserContextKeyedServiceShutdownNotifierFactory(
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;
diff --git a/chrome/browser/extensions/api/preference/preference_api.cc b/chrome/browser/extensions/api/preference/preference_api.cc
index 4a2d3db..475eade 100644
--- a/chrome/browser/extensions/api/preference/preference_api.cc
+++ b/chrome/browser/extensions/api/preference/preference_api.cc
@@ -215,7 +215,7 @@ class NetworkPredictionTransformer : public PrefTransformerInterface {
 class PrefMapping {
  public:
   static PrefMapping* GetInstance() {
-    return Singleton<PrefMapping>::get();
+    return base::Singleton<PrefMapping>::get();
   }
 
   bool FindBrowserPrefForExtensionPref(const std::string& extension_pref,
@@ -255,7 +255,7 @@ class PrefMapping {
   }
 
  private:
-  friend struct DefaultSingletonTraits<PrefMapping>;
+  friend struct base::DefaultSingletonTraits<PrefMapping>;
 
   PrefMapping() {
     identity_transformer_.reset(new IdentityPrefTransformer());
diff --git a/chrome/browser/extensions/api/proxy/proxy_api.cc b/chrome/browser/extensions/api/proxy/proxy_api.cc
index 33a7a9e..1485007 100644
--- a/chrome/browser/extensions/api/proxy/proxy_api.cc
+++ b/chrome/browser/extensions/api/proxy/proxy_api.cc
@@ -24,7 +24,7 @@ namespace keys = proxy_api_constants;
 
 // static
 ProxyEventRouter* ProxyEventRouter::GetInstance() {
-  return Singleton<ProxyEventRouter>::get();
+  return base::Singleton<ProxyEventRouter>::get();
 }
 
 ProxyEventRouter::ProxyEventRouter() {
diff --git a/chrome/browser/extensions/api/proxy/proxy_api.h b/chrome/browser/extensions/api/proxy/proxy_api.h
index 8cb06d5..da76d92 100644
--- a/chrome/browser/extensions/api/proxy/proxy_api.h
+++ b/chrome/browser/extensions/api/proxy/proxy_api.h
@@ -57,7 +57,7 @@ class ProxyEventRouter {
                         const base::string16& error);
 
  private:
-  friend struct DefaultSingletonTraits<ProxyEventRouter>;
+  friend struct base::DefaultSingletonTraits<ProxyEventRouter>;
 
   ProxyEventRouter();
   ~ProxyEventRouter();
diff --git a/chrome/browser/extensions/api/search_engines_private/search_engines_private_event_router_factory.cc b/chrome/browser/extensions/api/search_engines_private/search_engines_private_event_router_factory.cc
index 1571fcc..7ae223d 100644
--- a/chrome/browser/extensions/api/search_engines_private/search_engines_private_event_router_factory.cc
+++ b/chrome/browser/extensions/api/search_engines_private/search_engines_private_event_router_factory.cc
@@ -22,7 +22,7 @@ SearchEnginesPrivateEventRouterFactory::GetForProfile(
 // static
 SearchEnginesPrivateEventRouterFactory*
 SearchEnginesPrivateEventRouterFactory::GetInstance() {
-  return Singleton<SearchEnginesPrivateEventRouterFactory>::get();
+  return base::Singleton<SearchEnginesPrivateEventRouterFactory>::get();
 }
 
 SearchEnginesPrivateEventRouterFactory::SearchEnginesPrivateEventRouterFactory()
diff --git a/chrome/browser/extensions/api/search_engines_private/search_engines_private_event_router_factory.h b/chrome/browser/extensions/api/search_engines_private/search_engines_private_event_router_factory.h
index b214255..dad28f6 100644
--- a/chrome/browser/extensions/api/search_engines_private/search_engines_private_event_router_factory.h
+++ b/chrome/browser/extensions/api/search_engines_private/search_engines_private_event_router_factory.h
@@ -34,7 +34,8 @@ class SearchEnginesPrivateEventRouterFactory
   bool ServiceIsNULLWhileTesting() const override;
 
  private:
-  friend struct DefaultSingletonTraits<SearchEnginesPrivateEventRouterFactory>;
+  friend struct base::DefaultSingletonTraits<
+      SearchEnginesPrivateEventRouterFactory>;
 
   SearchEnginesPrivateEventRouterFactory();
   ~SearchEnginesPrivateEventRouterFactory() override;
diff --git a/chrome/browser/extensions/api/settings_private/settings_private_delegate_factory.cc b/chrome/browser/extensions/api/settings_private/settings_private_delegate_factory.cc
index 7025aac..fc56bc3 100644
--- a/chrome/browser/extensions/api/settings_private/settings_private_delegate_factory.cc
+++ b/chrome/browser/extensions/api/settings_private/settings_private_delegate_factory.cc
@@ -23,7 +23,7 @@ SettingsPrivateDelegate* SettingsPrivateDelegateFactory::GetForBrowserContext(
 
 // static
 SettingsPrivateDelegateFactory* SettingsPrivateDelegateFactory::GetInstance() {
-  return Singleton<SettingsPrivateDelegateFactory>::get();
+  return base::Singleton<SettingsPrivateDelegateFactory>::get();
 }
 
 SettingsPrivateDelegateFactory::SettingsPrivateDelegateFactory()
diff --git a/chrome/browser/extensions/api/settings_private/settings_private_delegate_factory.h b/chrome/browser/extensions/api/settings_private/settings_private_delegate_factory.h
index 1d85dbf..199711a 100644
--- a/chrome/browser/extensions/api/settings_private/settings_private_delegate_factory.h
+++ b/chrome/browser/extensions/api/settings_private/settings_private_delegate_factory.h
@@ -25,7 +25,7 @@ class SettingsPrivateDelegateFactory
   static SettingsPrivateDelegateFactory* GetInstance();
 
  private:
-  friend struct DefaultSingletonTraits<SettingsPrivateDelegateFactory>;
+  friend struct base::DefaultSingletonTraits<SettingsPrivateDelegateFactory>;
 
   SettingsPrivateDelegateFactory();
   ~SettingsPrivateDelegateFactory() override;
diff --git a/chrome/browser/extensions/api/settings_private/settings_private_event_router_factory.cc b/chrome/browser/extensions/api/settings_private/settings_private_event_router_factory.cc
index 86e9daf..227e15d 100644
--- a/chrome/browser/extensions/api/settings_private/settings_private_event_router_factory.cc
+++ b/chrome/browser/extensions/api/settings_private/settings_private_event_router_factory.cc
@@ -22,7 +22,7 @@ SettingsPrivateEventRouter* SettingsPrivateEventRouterFactory::GetForProfile(
 // static
 SettingsPrivateEventRouterFactory*
 SettingsPrivateEventRouterFactory::GetInstance() {
-  return Singleton<SettingsPrivateEventRouterFactory>::get();
+  return base::Singleton<SettingsPrivateEventRouterFactory>::get();
 }
 
 SettingsPrivateEventRouterFactory::SettingsPrivateEventRouterFactory()
diff --git a/chrome/browser/extensions/api/settings_private/settings_private_event_router_factory.h b/chrome/browser/extensions/api/settings_private/settings_private_event_router_factory.h
index 653c9bd..b92cf0f 100644
--- a/chrome/browser/extensions/api/settings_private/settings_private_event_router_factory.h
+++ b/chrome/browser/extensions/api/settings_private/settings_private_event_router_factory.h
@@ -34,7 +34,7 @@ class SettingsPrivateEventRouterFactory
   bool ServiceIsNULLWhileTesting() const override;
 
  private:
-  friend struct DefaultSingletonTraits<SettingsPrivateEventRouterFactory>;
+  friend struct base::DefaultSingletonTraits<SettingsPrivateEventRouterFactory>;
 
   SettingsPrivateEventRouterFactory();
   ~SettingsPrivateEventRouterFactory() override;
diff --git a/chrome/browser/extensions/api/system_indicator/system_indicator_manager_factory.cc b/chrome/browser/extensions/api/system_indicator/system_indicator_manager_factory.cc
index 4f383a8..8aef062 100644
--- a/chrome/browser/extensions/api/system_indicator/system_indicator_manager_factory.cc
+++ b/chrome/browser/extensions/api/system_indicator/system_indicator_manager_factory.cc
@@ -23,7 +23,7 @@ SystemIndicatorManager* SystemIndicatorManagerFactory::GetForProfile(
 
 // static
 SystemIndicatorManagerFactory* SystemIndicatorManagerFactory::GetInstance() {
-  return Singleton<SystemIndicatorManagerFactory>::get();
+  return base::Singleton<SystemIndicatorManagerFactory>::get();
 }
 
 SystemIndicatorManagerFactory::SystemIndicatorManagerFactory()
diff --git a/chrome/browser/extensions/api/system_indicator/system_indicator_manager_factory.h b/chrome/browser/extensions/api/system_indicator/system_indicator_manager_factory.h
index 12d6ac0..3828a7d 100644
--- a/chrome/browser/extensions/api/system_indicator/system_indicator_manager_factory.h
+++ b/chrome/browser/extensions/api/system_indicator/system_indicator_manager_factory.h
@@ -21,7 +21,7 @@ class SystemIndicatorManagerFactory : public BrowserContextKeyedServiceFactory {
   static SystemIndicatorManagerFactory* GetInstance();
 
  private:
-  friend struct DefaultSingletonTraits<SystemIndicatorManagerFactory>;
+  friend struct base::DefaultSingletonTraits<SystemIndicatorManagerFactory>;
 
   SystemIndicatorManagerFactory();
   ~SystemIndicatorManagerFactory() override;
diff --git a/chrome/browser/extensions/api/vpn_provider/vpn_service_factory.cc b/chrome/browser/extensions/api/vpn_provider/vpn_service_factory.cc
index a46b328..c6c656f 100644
--- a/chrome/browser/extensions/api/vpn_provider/vpn_service_factory.cc
+++ b/chrome/browser/extensions/api/vpn_provider/vpn_service_factory.cc
@@ -25,7 +25,7 @@ VpnService* VpnServiceFactory::GetForBrowserContext(
 
 // static
 VpnServiceFactory* VpnServiceFactory::GetInstance() {
-  return Singleton<VpnServiceFactory>::get();
+  return base::Singleton<VpnServiceFactory>::get();
 }
 
 VpnServiceFactory::VpnServiceFactory()
diff --git a/chrome/browser/extensions/blacklist_factory.cc b/chrome/browser/extensions/blacklist_factory.cc
index 2b277a98..a485498 100644
--- a/chrome/browser/extensions/blacklist_factory.cc
+++ b/chrome/browser/extensions/blacklist_factory.cc
@@ -21,7 +21,7 @@ Blacklist* BlacklistFactory::GetForBrowserContext(BrowserContext* context) {
 
 // static
 BlacklistFactory* BlacklistFactory::GetInstance() {
-  return Singleton<BlacklistFactory>::get();
+  return base::Singleton<BlacklistFactory>::get();
 }
 
 BlacklistFactory::BlacklistFactory()
diff --git a/chrome/browser/extensions/blacklist_factory.h b/chrome/browser/extensions/blacklist_factory.h
index 17b0ce86..127fce9 100644
--- a/chrome/browser/extensions/blacklist_factory.h
+++ b/chrome/browser/extensions/blacklist_factory.h
@@ -18,7 +18,7 @@ class BlacklistFactory : public BrowserContextKeyedServiceFactory {
   static BlacklistFactory* GetInstance();
 
  private:
-  friend struct DefaultSingletonTraits<BlacklistFactory>;
+  friend struct base::DefaultSingletonTraits<BlacklistFactory>;
 
   BlacklistFactory();
   ~BlacklistFactory() override;
diff --git a/chrome/browser/extensions/error_console/error_console_factory.cc b/chrome/browser/extensions/error_console/error_console_factory.cc
index 7ae25b0..0cc132f 100644
--- a/chrome/browser/extensions/error_console/error_console_factory.cc
+++ b/chrome/browser/extensions/error_console/error_console_factory.cc
@@ -23,7 +23,7 @@ ErrorConsole* ErrorConsoleFactory::GetForBrowserContext(
 
 // static
 ErrorConsoleFactory* ErrorConsoleFactory::GetInstance() {
-  return Singleton<ErrorConsoleFactory>::get();
+  return base::Singleton<ErrorConsoleFactory>::get();
 }
 
 ErrorConsoleFactory::ErrorConsoleFactory()
diff --git a/chrome/browser/extensions/error_console/error_console_factory.h b/chrome/browser/extensions/error_console/error_console_factory.h
index 740be0e..2a298ce 100644
--- a/chrome/browser/extensions/error_console/error_console_factory.h
+++ b/chrome/browser/extensions/error_console/error_console_factory.h
@@ -18,7 +18,7 @@ class ErrorConsoleFactory : public BrowserContextKeyedServiceFactory {
   static ErrorConsoleFactory* GetInstance();
 
  private:
-  friend struct DefaultSingletonTraits<ErrorConsoleFactory>;
+  friend struct base::DefaultSingletonTraits<ErrorConsoleFactory>;
 
   ErrorConsoleFactory();
   ~ErrorConsoleFactory() override;
diff --git a/chrome/browser/extensions/extension_action_manager.cc b/chrome/browser/extensions/extension_action_manager.cc
index 7e0f401..2bc8ba6 100644
--- a/chrome/browser/extensions/extension_action_manager.cc
+++ b/chrome/browser/extensions/extension_action_manager.cc
@@ -30,7 +30,7 @@ class ExtensionActionManagerFactory : public BrowserContextKeyedServiceFactory {
   static ExtensionActionManagerFactory* GetInstance();
 
  private:
-  friend struct DefaultSingletonTraits<ExtensionActionManagerFactory>;
+  friend struct base::DefaultSingletonTraits<ExtensionActionManagerFactory>;
 
   ExtensionActionManagerFactory()
       : BrowserContextKeyedServiceFactory(
@@ -51,7 +51,7 @@ class ExtensionActionManagerFactory : public BrowserContextKeyedServiceFactory {
 
 ExtensionActionManagerFactory*
 ExtensionActionManagerFactory::GetInstance() {
-  return Singleton<ExtensionActionManagerFactory>::get();
+  return base::Singleton<ExtensionActionManagerFactory>::get();
 }
 
 }  // namespace
diff --git a/chrome/browser/extensions/extension_assets_manager.cc b/chrome/browser/extensions/extension_assets_manager.cc
index bdb862d..b1921fb 100644
--- a/chrome/browser/extensions/extension_assets_manager.cc
+++ b/chrome/browser/extensions/extension_assets_manager.cc
@@ -18,7 +18,7 @@ namespace {
 class ExtensionAssetsManagerImpl :  public ExtensionAssetsManager {
  public:
   static ExtensionAssetsManagerImpl* GetInstance() {
-    return Singleton<ExtensionAssetsManagerImpl>::get();
+    return base::Singleton<ExtensionAssetsManagerImpl>::get();
   }
 
   // Override from ExtensionAssetsManager.
@@ -42,7 +42,7 @@ class ExtensionAssetsManagerImpl :  public ExtensionAssetsManager {
   }
 
  private:
-  friend struct DefaultSingletonTraits<ExtensionAssetsManagerImpl>;
+  friend struct base::DefaultSingletonTraits<ExtensionAssetsManagerImpl>;
 
   ExtensionAssetsManagerImpl() {}
   ~ExtensionAssetsManagerImpl() override {}
diff --git a/chrome/browser/extensions/extension_assets_manager_chromeos.cc b/chrome/browser/extensions/extension_assets_manager_chromeos.cc
index 3daea4e..8fc3425 100644
--- a/chrome/browser/extensions/extension_assets_manager_chromeos.cc
+++ b/chrome/browser/extensions/extension_assets_manager_chromeos.cc
@@ -56,7 +56,7 @@ class ExtensionAssetsManagerHelper {
 
   static ExtensionAssetsManagerHelper* GetInstance() {
     DCHECK_CURRENTLY_ON(BrowserThread::UI);
-    return Singleton<ExtensionAssetsManagerHelper>::get();
+    return base::Singleton<ExtensionAssetsManagerHelper>::get();
   }
 
   // Remember that shared install is in progress. Return true if there is no
@@ -94,7 +94,7 @@ class ExtensionAssetsManagerHelper {
   }
 
  private:
-  friend struct DefaultSingletonTraits<ExtensionAssetsManagerHelper>;
+  friend struct base::DefaultSingletonTraits<ExtensionAssetsManagerHelper>;
 
   ExtensionAssetsManagerHelper() {}
   ~ExtensionAssetsManagerHelper() {}
@@ -130,7 +130,7 @@ ExtensionAssetsManagerChromeOS::~ExtensionAssetsManagerChromeOS() {
 
 // static
 ExtensionAssetsManagerChromeOS* ExtensionAssetsManagerChromeOS::GetInstance() {
-  return Singleton<ExtensionAssetsManagerChromeOS>::get();
+  return base::Singleton<ExtensionAssetsManagerChromeOS>::get();
 }
 
 // static
diff --git a/chrome/browser/extensions/extension_assets_manager_chromeos.h b/chrome/browser/extensions/extension_assets_manager_chromeos.h
index bfb37ad..670a144 100644
--- a/chrome/browser/extensions/extension_assets_manager_chromeos.h
+++ b/chrome/browser/extensions/extension_assets_manager_chromeos.h
@@ -9,7 +9,10 @@
 
 #include "chrome/browser/extensions/extension_assets_manager.h"
 
+namespace base {
 template <typename T> struct DefaultSingletonTraits;
+}
+
 class PrefRegistrySimple;
 
 namespace base {
@@ -64,7 +67,7 @@ class ExtensionAssetsManagerChromeOS : public ExtensionAssetsManager {
   static void SetSharedInstallDirForTesting(const base::FilePath& install_dir);
 
  private:
-  friend struct DefaultSingletonTraits<ExtensionAssetsManagerChromeOS>;
+  friend struct base::DefaultSingletonTraits<ExtensionAssetsManagerChromeOS>;
 
   ExtensionAssetsManagerChromeOS();
   ~ExtensionAssetsManagerChromeOS() override;
diff --git a/chrome/browser/extensions/extension_garbage_collector_factory.cc b/chrome/browser/extensions/extension_garbage_collector_factory.cc
index debcaf0..0383b75 100644
--- a/chrome/browser/extensions/extension_garbage_collector_factory.cc
+++ b/chrome/browser/extensions/extension_garbage_collector_factory.cc
@@ -28,7 +28,7 @@ ExtensionGarbageCollectorFactory::GetForBrowserContext(
 // static
 ExtensionGarbageCollectorFactory*
 ExtensionGarbageCollectorFactory::GetInstance() {
-  return Singleton<ExtensionGarbageCollectorFactory>::get();
+  return base::Singleton<ExtensionGarbageCollectorFactory>::get();
 }
 
 ExtensionGarbageCollectorFactory::ExtensionGarbageCollectorFactory()
diff --git a/chrome/browser/extensions/extension_garbage_collector_factory.h b/chrome/browser/extensions/extension_garbage_collector_factory.h
index 5e5852c..000398f 100644
--- a/chrome/browser/extensions/extension_garbage_collector_factory.h
+++ b/chrome/browser/extensions/extension_garbage_collector_factory.h
@@ -7,8 +7,10 @@
 
 #include "components/keyed_service/content/browser_context_keyed_service_factory.h"
 
+namespace base {
 template <typename T>
 struct DefaultSingletonTraits;
+}
 
 class Profile;
 
@@ -28,7 +30,7 @@ class ExtensionGarbageCollectorFactory
       content::BrowserContext* context);
 
  private:
-  friend struct DefaultSingletonTraits<ExtensionGarbageCollectorFactory>;
+  friend struct base::DefaultSingletonTraits<ExtensionGarbageCollectorFactory>;
 
   ExtensionGarbageCollectorFactory();
   ~ExtensionGarbageCollectorFactory() override;
diff --git a/chrome/browser/extensions/extension_management.cc b/chrome/browser/extensions/extension_management.cc
index 7dab6756..8e801ca 100644
--- a/chrome/browser/extensions/extension_management.cc
+++ b/chrome/browser/extensions/extension_management.cc
@@ -466,7 +466,7 @@ ExtensionManagement* ExtensionManagementFactory::GetForBrowserContext(
 }
 
 ExtensionManagementFactory* ExtensionManagementFactory::GetInstance() {
-  return Singleton<ExtensionManagementFactory>::get();
+  return base::Singleton<ExtensionManagementFactory>::get();
 }
 
 ExtensionManagementFactory::ExtensionManagementFactory()
diff --git a/chrome/browser/extensions/extension_management.h b/chrome/browser/extensions/extension_management.h
index 6ea3874..d3ebb94 100644
--- a/chrome/browser/extensions/extension_management.h
+++ b/chrome/browser/extensions/extension_management.h
@@ -198,7 +198,7 @@ class ExtensionManagementFactory : public BrowserContextKeyedServiceFactory {
   static ExtensionManagementFactory* GetInstance();
 
  private:
-  friend struct DefaultSingletonTraits<ExtensionManagementFactory>;
+  friend struct base::DefaultSingletonTraits<ExtensionManagementFactory>;
 
   ExtensionManagementFactory();
   ~ExtensionManagementFactory() override;
diff --git a/chrome/browser/extensions/extension_renderer_state.cc b/chrome/browser/extensions/extension_renderer_state.cc
index 6e7cb0b..1792b60 100644
--- a/chrome/browser/extensions/extension_renderer_state.cc
+++ b/chrome/browser/extensions/extension_renderer_state.cc
@@ -176,7 +176,7 @@ ExtensionRendererState::~ExtensionRendererState() {
 
 // static
 ExtensionRendererState* ExtensionRendererState::GetInstance() {
-  return Singleton<ExtensionRendererState>::get();
+  return base::Singleton<ExtensionRendererState>::get();
 }
 
 void ExtensionRendererState::Init() {
diff --git a/chrome/browser/extensions/extension_renderer_state.h b/chrome/browser/extensions/extension_renderer_state.h
index 6aad734..413a726 100644
--- a/chrome/browser/extensions/extension_renderer_state.h
+++ b/chrome/browser/extensions/extension_renderer_state.h
@@ -37,7 +37,7 @@ class ExtensionRendererState {
   class RenderViewHostObserver;
   class TabObserver;
   friend class TabObserver;
-  friend struct DefaultSingletonTraits<ExtensionRendererState>;
+  friend struct base::DefaultSingletonTraits<ExtensionRendererState>;
 
   typedef std::pair<int, int> RenderId;
   typedef std::pair<int, int> TabAndWindowId;
diff --git a/chrome/browser/extensions/extension_storage_monitor_factory.cc b/chrome/browser/extensions/extension_storage_monitor_factory.cc
index 5fa6450..5aadc18 100644
--- a/chrome/browser/extensions/extension_storage_monitor_factory.cc
+++ b/chrome/browser/extensions/extension_storage_monitor_factory.cc
@@ -22,7 +22,7 @@ ExtensionStorageMonitorFactory::GetForBrowserContext(
 
 // static
 ExtensionStorageMonitorFactory* ExtensionStorageMonitorFactory::GetInstance() {
-  return Singleton<ExtensionStorageMonitorFactory>::get();
+  return base::Singleton<ExtensionStorageMonitorFactory>::get();
 }
 
 ExtensionStorageMonitorFactory::ExtensionStorageMonitorFactory()
diff --git a/chrome/browser/extensions/extension_storage_monitor_factory.h b/chrome/browser/extensions/extension_storage_monitor_factory.h
index 55d920e..4c5f168 100644
--- a/chrome/browser/extensions/extension_storage_monitor_factory.h
+++ b/chrome/browser/extensions/extension_storage_monitor_factory.h
@@ -21,7 +21,7 @@ class ExtensionStorageMonitorFactory
   static ExtensionStorageMonitorFactory* GetInstance();
 
  private:
-  friend struct DefaultSingletonTraits<ExtensionStorageMonitorFactory>;
+  friend struct base::DefaultSingletonTraits<ExtensionStorageMonitorFactory>;
 
   ExtensionStorageMonitorFactory();
   ~ExtensionStorageMonitorFactory() override;
diff --git a/chrome/browser/extensions/extension_sync_service_factory.cc b/chrome/browser/extensions/extension_sync_service_factory.cc
index 07c4f18..f7604ff 100644
--- a/chrome/browser/extensions/extension_sync_service_factory.cc
+++ b/chrome/browser/extensions/extension_sync_service_factory.cc
@@ -23,7 +23,7 @@ ExtensionSyncService* ExtensionSyncServiceFactory::GetForBrowserContext(
 
 // static
 ExtensionSyncServiceFactory* ExtensionSyncServiceFactory::GetInstance() {
-  return Singleton<ExtensionSyncServiceFactory>::get();
+  return base::Singleton<ExtensionSyncServiceFactory>::get();
 }
 
 ExtensionSyncServiceFactory::ExtensionSyncServiceFactory()
diff --git a/chrome/browser/extensions/extension_sync_service_factory.h b/chrome/browser/extensions/extension_sync_service_factory.h
index 82a36d2..d394c66 100644
--- a/chrome/browser/extensions/extension_sync_service_factory.h
+++ b/chrome/browser/extensions/extension_sync_service_factory.h
@@ -19,7 +19,7 @@ class ExtensionSyncServiceFactory : public BrowserContextKeyedServiceFactory {
   static ExtensionSyncServiceFactory* GetInstance();
 
  private:
-  friend struct DefaultSingletonTraits<ExtensionSyncServiceFactory>;
+  friend struct base::DefaultSingletonTraits<ExtensionSyncServiceFactory>;
 
   ExtensionSyncServiceFactory();
   ~ExtensionSyncServiceFactory() override;
diff --git a/chrome/browser/extensions/extension_system_factory.cc b/chrome/browser/extensions/extension_system_factory.cc
index bea8cfb..18266ff 100644
--- a/chrome/browser/extensions/extension_system_factory.cc
+++ b/chrome/browser/extensions/extension_system_factory.cc
@@ -35,7 +35,7 @@ ExtensionSystemSharedFactory::GetForBrowserContext(
 
 // static
 ExtensionSystemSharedFactory* ExtensionSystemSharedFactory::GetInstance() {
-  return Singleton<ExtensionSystemSharedFactory>::get();
+  return base::Singleton<ExtensionSystemSharedFactory>::get();
 }
 
 ExtensionSystemSharedFactory::ExtensionSystemSharedFactory()
@@ -84,7 +84,7 @@ ExtensionSystem* ExtensionSystemFactory::GetForBrowserContext(
 
 // static
 ExtensionSystemFactory* ExtensionSystemFactory::GetInstance() {
-  return Singleton<ExtensionSystemFactory>::get();
+  return base::Singleton<ExtensionSystemFactory>::get();
 }
 
 ExtensionSystemFactory::ExtensionSystemFactory()
diff --git a/chrome/browser/extensions/extension_system_factory.h b/chrome/browser/extensions/extension_system_factory.h
index 2edd556..128fdef 100644
--- a/chrome/browser/extensions/extension_system_factory.h
+++ b/chrome/browser/extensions/extension_system_factory.h
@@ -23,7 +23,7 @@ class ExtensionSystemSharedFactory : public BrowserContextKeyedServiceFactory {
   static ExtensionSystemSharedFactory* GetInstance();
 
  private:
-  friend struct DefaultSingletonTraits<ExtensionSystemSharedFactory>;
+  friend struct base::DefaultSingletonTraits<ExtensionSystemSharedFactory>;
 
   ExtensionSystemSharedFactory();
   ~ExtensionSystemSharedFactory() override;
@@ -48,7 +48,7 @@ class ExtensionSystemFactory : public ExtensionSystemProvider {
   static ExtensionSystemFactory* GetInstance();
 
  private:
-  friend struct DefaultSingletonTraits<ExtensionSystemFactory>;
+  friend struct base::DefaultSingletonTraits<ExtensionSystemFactory>;
 
   ExtensionSystemFactory();
   ~ExtensionSystemFactory() override;
diff --git a/chrome/browser/extensions/install_tracker_factory.cc b/chrome/browser/extensions/install_tracker_factory.cc
index b1b5e44..1e95a6d 100644
--- a/chrome/browser/extensions/install_tracker_factory.cc
+++ b/chrome/browser/extensions/install_tracker_factory.cc
@@ -22,7 +22,7 @@ InstallTracker* InstallTrackerFactory::GetForBrowserContext(
 }
 
 InstallTrackerFactory* InstallTrackerFactory::GetInstance() {
-  return Singleton<InstallTrackerFactory>::get();
+  return base::Singleton<InstallTrackerFactory>::get();
 }
 
 InstallTrackerFactory::InstallTrackerFactory()
diff --git a/chrome/browser/extensions/install_tracker_factory.h b/chrome/browser/extensions/install_tracker_factory.h
index 214bc95..6a58cf4 100644
--- a/chrome/browser/extensions/install_tracker_factory.h
+++ b/chrome/browser/extensions/install_tracker_factory.h
@@ -7,7 +7,9 @@
 
 #include "components/keyed_service/content/browser_context_keyed_service_factory.h"
 
+namespace base {
 template <typename T> struct DefaultSingletonTraits;
+}
 
 namespace extensions {
 
@@ -19,7 +21,7 @@ class InstallTrackerFactory : public BrowserContextKeyedServiceFactory {
   static InstallTrackerFactory* GetInstance();
 
  private:
-  friend struct DefaultSingletonTraits<InstallTrackerFactory>;
+  friend struct base::DefaultSingletonTraits<InstallTrackerFactory>;
 
   InstallTrackerFactory();
   ~InstallTrackerFactory() override;
diff --git a/chrome/browser/extensions/install_verifier_factory.cc b/chrome/browser/extensions/install_verifier_factory.cc
index 9ff1877..d267445 100644
--- a/chrome/browser/extensions/install_verifier_factory.cc
+++ b/chrome/browser/extensions/install_verifier_factory.cc
@@ -25,7 +25,7 @@ InstallVerifier* InstallVerifierFactory::GetForBrowserContext(
 
 // static
 InstallVerifierFactory* InstallVerifierFactory::GetInstance() {
-  return Singleton<InstallVerifierFactory>::get();
+  return base::Singleton<InstallVerifierFactory>::get();
 }
 
 InstallVerifierFactory::InstallVerifierFactory()
diff --git a/chrome/browser/extensions/install_verifier_factory.h b/chrome/browser/extensions/install_verifier_factory.h
index 09be420..f0da05a 100644
--- a/chrome/browser/extensions/install_verifier_factory.h
+++ b/chrome/browser/extensions/install_verifier_factory.h
@@ -19,7 +19,7 @@ class InstallVerifierFactory : public BrowserContextKeyedServiceFactory {
   static InstallVerifierFactory* GetInstance();
 
  private:
-  friend struct DefaultSingletonTraits<InstallVerifierFactory>;
+  friend struct base::DefaultSingletonTraits<InstallVerifierFactory>;
 
   InstallVerifierFactory();
   ~InstallVerifierFactory() override;
diff --git a/chrome/browser/extensions/menu_manager_factory.cc b/chrome/browser/extensions/menu_manager_factory.cc
index 2bfd3cb..ef06d7f 100644
--- a/chrome/browser/extensions/menu_manager_factory.cc
+++ b/chrome/browser/extensions/menu_manager_factory.cc
@@ -22,7 +22,7 @@ MenuManager* MenuManagerFactory::GetForBrowserContext(
 
 // static
 MenuManagerFactory* MenuManagerFactory::GetInstance() {
-  return Singleton<MenuManagerFactory>::get();
+  return base::Singleton<MenuManagerFactory>::get();
 }
 
 // static
diff --git a/chrome/browser/extensions/menu_manager_factory.h b/chrome/browser/extensions/menu_manager_factory.h
index 5e71738..df480db 100644
--- a/chrome/browser/extensions/menu_manager_factory.h
+++ b/chrome/browser/extensions/menu_manager_factory.h
@@ -26,7 +26,7 @@ class MenuManagerFactory : public BrowserContextKeyedServiceFactory {
       content::BrowserContext* context);
 
  private:
-  friend struct DefaultSingletonTraits<MenuManagerFactory>;
+  friend struct base::DefaultSingletonTraits<MenuManagerFactory>;
 
   MenuManagerFactory();
   ~MenuManagerFactory() override;
diff --git a/chrome/browser/extensions/token_cache/token_cache_service_factory.cc b/chrome/browser/extensions/token_cache/token_cache_service_factory.cc
index efde3ac..ee4b399 100644
--- a/chrome/browser/extensions/token_cache/token_cache_service_factory.cc
+++ b/chrome/browser/extensions/token_cache/token_cache_service_factory.cc
@@ -18,7 +18,7 @@ TokenCacheServiceFactory::GetForProfile(Profile* profile) {
 
 // static
 TokenCacheServiceFactory* TokenCacheServiceFactory::GetInstance() {
-  return Singleton<TokenCacheServiceFactory>::get();
+  return base::Singleton<TokenCacheServiceFactory>::get();
 }
 
 TokenCacheServiceFactory::TokenCacheServiceFactory()
diff --git a/chrome/browser/extensions/token_cache/token_cache_service_factory.h b/chrome/browser/extensions/token_cache/token_cache_service_factory.h
index a478e24..b2112f8 100644
--- a/chrome/browser/extensions/token_cache/token_cache_service_factory.h
+++ b/chrome/browser/extensions/token_cache/token_cache_service_factory.h
@@ -24,7 +24,7 @@ class TokenCacheServiceFactory : public BrowserContextKeyedServiceFactory {
   TokenCacheServiceFactory();
   ~TokenCacheServiceFactory() override;
 
-  friend struct DefaultSingletonTraits<TokenCacheServiceFactory>;
+  friend struct base::DefaultSingletonTraits<TokenCacheServiceFactory>;
 
   // Inherited from BrowserContextKeyedServiceFactory:
   KeyedService* BuildServiceInstanceFor(
diff --git a/chrome/browser/extensions/updater/extension_cache_impl.h b/chrome/browser/extensions/updater/extension_cache_impl.h
index f2ed0fe..58b0732 100644
--- a/chrome/browser/extensions/updater/extension_cache_impl.h
+++ b/chrome/browser/extensions/updater/extension_cache_impl.h
@@ -17,7 +17,9 @@
 #include "content/public/browser/notification_registrar.h"
 #include "extensions/browser/updater/extension_cache.h"
 
+namespace base {
 template <typename T> struct DefaultSingletonTraits;
+}
 
 namespace extensions {
 
diff --git a/chrome/browser/extensions/warning_badge_service_factory.cc b/chrome/browser/extensions/warning_badge_service_factory.cc
index 7917112..eaac902 100644
--- a/chrome/browser/extensions/warning_badge_service_factory.cc
+++ b/chrome/browser/extensions/warning_badge_service_factory.cc
@@ -23,7 +23,7 @@ WarningBadgeService* WarningBadgeServiceFactory::GetForBrowserContext(
 
 // static
 WarningBadgeServiceFactory* WarningBadgeServiceFactory::GetInstance() {
-  return Singleton<WarningBadgeServiceFactory>::get();
+  return base::Singleton<WarningBadgeServiceFactory>::get();
 }
 
 WarningBadgeServiceFactory::WarningBadgeServiceFactory()
diff --git a/chrome/browser/extensions/warning_badge_service_factory.h b/chrome/browser/extensions/warning_badge_service_factory.h
index 9d378e5..f748c04 100644
--- a/chrome/browser/extensions/warning_badge_service_factory.h
+++ b/chrome/browser/extensions/warning_badge_service_factory.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_WARNING_BADGE_SERVICE_FACTORY_H_
-#define CHROME_BROWSER_EXTENSIONS_EXTENSION_WARNING_BADGE_SERVICE_FACTORY_H_
+#ifndef CHROME_BROWSER_EXTENSIONS_WARNING_BADGE_SERVICE_FACTORY_H_
+#define CHROME_BROWSER_EXTENSIONS_WARNING_BADGE_SERVICE_FACTORY_H_
 
 #include "base/memory/singleton.h"
 #include "components/keyed_service/content/browser_context_keyed_service_factory.h"
@@ -19,7 +19,7 @@ class WarningBadgeServiceFactory : public BrowserContextKeyedServiceFactory {
   static WarningBadgeServiceFactory* GetInstance();
 
  private:
-  friend struct DefaultSingletonTraits<WarningBadgeServiceFactory>;
+  friend struct base::DefaultSingletonTraits<WarningBadgeServiceFactory>;
 
   WarningBadgeServiceFactory();
   ~WarningBadgeServiceFactory() override;
@@ -36,4 +36,4 @@ class WarningBadgeServiceFactory : public BrowserContextKeyedServiceFactory {
 
 }  // namespace extensions
 
-#endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_WARNING_BADGE_SERVICE_FACTORY_H_
+#endif  // CHROME_BROWSER_EXTENSIONS_WARNING_BADGE_SERVICE_FACTORY_H_
diff --git a/chrome/browser/extensions/window_controller_list.cc b/chrome/browser/extensions/window_controller_list.cc
index a141a34..c103789 100644
--- a/chrome/browser/extensions/window_controller_list.cc
+++ b/chrome/browser/extensions/window_controller_list.cc
@@ -21,7 +21,7 @@ namespace extensions {
 
 // static
 WindowControllerList* WindowControllerList::GetInstance() {
-  return Singleton<WindowControllerList>::get();
+  return base::Singleton<WindowControllerList>::get();
 }
 
 WindowControllerList::WindowControllerList() {
diff --git a/chrome/browser/extensions/window_controller_list.h b/chrome/browser/extensions/window_controller_list.h
index 2eaf233..ddb78b4 100644
--- a/chrome/browser/extensions/window_controller_list.h
+++ b/chrome/browser/extensions/window_controller_list.h
@@ -64,7 +64,7 @@ class WindowControllerList {
   static WindowControllerList* GetInstance();
 
  private:
-  friend struct DefaultSingletonTraits<WindowControllerList>;
+  friend struct base::DefaultSingletonTraits<WindowControllerList>;
 
   // Entries are not owned by this class and must be removed when destroyed.
   ControllerList windows_;