diff options
Diffstat (limited to 'chrome')
479 files changed, 685 insertions, 549 deletions
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc index ea8cb95..b3756b3 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc @@ -2115,7 +2115,7 @@ class FlagsState { // Returns the singleton instance of this class static FlagsState* GetInstance() { - return Singleton<FlagsState>::get(); + return base::Singleton<FlagsState>::get(); } private: diff --git a/chrome/browser/android/logo_service.cc b/chrome/browser/android/logo_service.cc index 35e3ce0..5277f7e 100644 --- a/chrome/browser/android/logo_service.cc +++ b/chrome/browser/android/logo_service.cc @@ -139,7 +139,7 @@ LogoService* LogoServiceFactory::GetForProfile(Profile* profile) { // static LogoServiceFactory* LogoServiceFactory::GetInstance() { - return Singleton<LogoServiceFactory>::get(); + return base::Singleton<LogoServiceFactory>::get(); } LogoServiceFactory::LogoServiceFactory() diff --git a/chrome/browser/android/logo_service.h b/chrome/browser/android/logo_service.h index 441c6e2..cc39b8b 100644 --- a/chrome/browser/android/logo_service.h +++ b/chrome/browser/android/logo_service.h @@ -43,7 +43,7 @@ class LogoServiceFactory : public BrowserContextKeyedServiceFactory { static LogoServiceFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<LogoServiceFactory>; + friend struct base::DefaultSingletonTraits<LogoServiceFactory>; LogoServiceFactory(); ~LogoServiceFactory() override; diff --git a/chrome/browser/android/offline_pages/offline_page_model_factory.cc b/chrome/browser/android/offline_pages/offline_page_model_factory.cc index 5c55b34..303cce1 100644 --- a/chrome/browser/android/offline_pages/offline_page_model_factory.cc +++ b/chrome/browser/android/offline_pages/offline_page_model_factory.cc @@ -28,7 +28,7 @@ OfflinePageModelFactory::OfflinePageModelFactory() // static OfflinePageModelFactory* OfflinePageModelFactory::GetInstance() { - return Singleton<OfflinePageModelFactory>::get(); + return base::Singleton<OfflinePageModelFactory>::get(); } // static diff --git a/chrome/browser/android/offline_pages/offline_page_model_factory.h b/chrome/browser/android/offline_pages/offline_page_model_factory.h index d92e366..25575cf 100644 --- a/chrome/browser/android/offline_pages/offline_page_model_factory.h +++ b/chrome/browser/android/offline_pages/offline_page_model_factory.h @@ -8,8 +8,10 @@ #include "base/macros.h" #include "components/keyed_service/content/browser_context_keyed_service_factory.h" +namespace base { template <typename T> struct DefaultSingletonTraits; +} // namespace base namespace offline_pages { @@ -23,7 +25,7 @@ class OfflinePageModelFactory : public BrowserContextKeyedServiceFactory { content::BrowserContext* context); private: - friend struct DefaultSingletonTraits<OfflinePageModelFactory>; + friend struct base::DefaultSingletonTraits<OfflinePageModelFactory>; OfflinePageModelFactory(); ~OfflinePageModelFactory() override {} diff --git a/chrome/browser/android/omnibox/autocomplete_controller_android.cc b/chrome/browser/android/omnibox/autocomplete_controller_android.cc index 221d172..d7b04c7 100644 --- a/chrome/browser/android/omnibox/autocomplete_controller_android.cc +++ b/chrome/browser/android/omnibox/autocomplete_controller_android.cc @@ -295,7 +295,7 @@ AutocompleteControllerAndroid::Factory::GetForProfile( AutocompleteControllerAndroid::Factory* AutocompleteControllerAndroid::Factory::GetInstance() { - return Singleton<AutocompleteControllerAndroid::Factory>::get(); + return base::Singleton<AutocompleteControllerAndroid::Factory>::get(); } content::BrowserContext* diff --git a/chrome/browser/android/omnibox/autocomplete_controller_android.h b/chrome/browser/android/omnibox/autocomplete_controller_android.h index 8ecd258..73f18f7 100644 --- a/chrome/browser/android/omnibox/autocomplete_controller_android.h +++ b/chrome/browser/android/omnibox/autocomplete_controller_android.h @@ -86,7 +86,7 @@ class AutocompleteControllerAndroid : public AutocompleteControllerDelegate, content::BrowserContext* context) const override; private: - friend struct DefaultSingletonTraits<Factory>; + friend struct base::DefaultSingletonTraits<Factory>; Factory(); ~Factory() override; diff --git a/chrome/browser/apps/app_shim/app_shim_handler_mac.cc b/chrome/browser/apps/app_shim/app_shim_handler_mac.cc index c7801ad..8b55be1 100644 --- a/chrome/browser/apps/app_shim/app_shim_handler_mac.cc +++ b/chrome/browser/apps/app_shim/app_shim_handler_mac.cc @@ -35,8 +35,9 @@ void TerminateIfNoAppWindows() { class AppShimHandlerRegistry : public content::NotificationObserver { public: static AppShimHandlerRegistry* GetInstance() { - return Singleton<AppShimHandlerRegistry, - LeakySingletonTraits<AppShimHandlerRegistry> >::get(); + return base::Singleton< + AppShimHandlerRegistry, + base::LeakySingletonTraits<AppShimHandlerRegistry>>::get(); } AppShimHandler* GetForAppMode(const std::string& app_mode_id) const { @@ -74,7 +75,7 @@ class AppShimHandlerRegistry : public content::NotificationObserver { } private: - friend struct DefaultSingletonTraits<AppShimHandlerRegistry>; + friend struct base::DefaultSingletonTraits<AppShimHandlerRegistry>; typedef std::map<std::string, AppShimHandler*> HandlerMap; AppShimHandlerRegistry() diff --git a/chrome/browser/apps/ephemeral_app_service_factory.cc b/chrome/browser/apps/ephemeral_app_service_factory.cc index 18ecb08..06a7c02 100644 --- a/chrome/browser/apps/ephemeral_app_service_factory.cc +++ b/chrome/browser/apps/ephemeral_app_service_factory.cc @@ -22,7 +22,7 @@ EphemeralAppServiceFactory::GetForProfile(Profile* profile) { // static EphemeralAppServiceFactory* EphemeralAppServiceFactory::GetInstance() { - return Singleton<EphemeralAppServiceFactory>::get(); + return base::Singleton<EphemeralAppServiceFactory>::get(); } EphemeralAppServiceFactory::EphemeralAppServiceFactory() diff --git a/chrome/browser/apps/ephemeral_app_service_factory.h b/chrome/browser/apps/ephemeral_app_service_factory.h index ea9b0eb..412027e 100644 --- a/chrome/browser/apps/ephemeral_app_service_factory.h +++ b/chrome/browser/apps/ephemeral_app_service_factory.h @@ -18,7 +18,7 @@ class EphemeralAppServiceFactory : public BrowserContextKeyedServiceFactory { static EphemeralAppServiceFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<EphemeralAppServiceFactory>; + friend struct base::DefaultSingletonTraits<EphemeralAppServiceFactory>; EphemeralAppServiceFactory(); ~EphemeralAppServiceFactory() override; diff --git a/chrome/browser/apps/per_app_settings_service_factory.cc b/chrome/browser/apps/per_app_settings_service_factory.cc index c7f008d..40704bd 100644 --- a/chrome/browser/apps/per_app_settings_service_factory.cc +++ b/chrome/browser/apps/per_app_settings_service_factory.cc @@ -11,7 +11,7 @@ // static PerAppSettingsServiceFactory* PerAppSettingsServiceFactory::GetInstance() { - return Singleton<PerAppSettingsServiceFactory>::get(); + return base::Singleton<PerAppSettingsServiceFactory>::get(); } // static diff --git a/chrome/browser/apps/per_app_settings_service_factory.h b/chrome/browser/apps/per_app_settings_service_factory.h index 1111848..23ee62b 100644 --- a/chrome/browser/apps/per_app_settings_service_factory.h +++ b/chrome/browser/apps/per_app_settings_service_factory.h @@ -13,7 +13,10 @@ class BrowserContext; class PerAppSettingsService; +namespace base { template <typename T> struct DefaultSingletonTraits; +} + class PerAppSettingsServiceFactory : public BrowserContextKeyedServiceFactory { public: static PerAppSettingsServiceFactory* GetInstance(); @@ -21,7 +24,7 @@ class PerAppSettingsServiceFactory : public BrowserContextKeyedServiceFactory { content::BrowserContext* browser_context); private: - friend struct DefaultSingletonTraits<PerAppSettingsServiceFactory>; + friend struct base::DefaultSingletonTraits<PerAppSettingsServiceFactory>; PerAppSettingsServiceFactory(); ~PerAppSettingsServiceFactory() override; diff --git a/chrome/browser/apps/shortcut_manager_factory.cc b/chrome/browser/apps/shortcut_manager_factory.cc index 06839ce..1327901 100644 --- a/chrome/browser/apps/shortcut_manager_factory.cc +++ b/chrome/browser/apps/shortcut_manager_factory.cc @@ -17,7 +17,7 @@ AppShortcutManager* AppShortcutManagerFactory::GetForProfile(Profile* profile) { } AppShortcutManagerFactory* AppShortcutManagerFactory::GetInstance() { - return Singleton<AppShortcutManagerFactory>::get(); + return base::Singleton<AppShortcutManagerFactory>::get(); } AppShortcutManagerFactory::AppShortcutManagerFactory() diff --git a/chrome/browser/apps/shortcut_manager_factory.h b/chrome/browser/apps/shortcut_manager_factory.h index 0c8f97c..1cb6e06 100644 --- a/chrome/browser/apps/shortcut_manager_factory.h +++ b/chrome/browser/apps/shortcut_manager_factory.h @@ -7,7 +7,9 @@ #include "components/keyed_service/content/browser_context_keyed_service_factory.h" +namespace base { template<typename Type> struct DefaultSingletonTraits; +} class Profile; @@ -24,7 +26,7 @@ class AppShortcutManagerFactory : public BrowserContextKeyedServiceFactory { static AppShortcutManagerFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<AppShortcutManagerFactory>; + friend struct base::DefaultSingletonTraits<AppShortcutManagerFactory>; AppShortcutManagerFactory(); ~AppShortcutManagerFactory() override; diff --git a/chrome/browser/autocomplete/autocomplete_classifier_factory.cc b/chrome/browser/autocomplete/autocomplete_classifier_factory.cc index 5bd8e7e..35cab6f 100644 --- a/chrome/browser/autocomplete/autocomplete_classifier_factory.cc +++ b/chrome/browser/autocomplete/autocomplete_classifier_factory.cc @@ -29,7 +29,7 @@ AutocompleteClassifier* AutocompleteClassifierFactory::GetForProfile( // static AutocompleteClassifierFactory* AutocompleteClassifierFactory::GetInstance() { - return Singleton<AutocompleteClassifierFactory>::get(); + return base::Singleton<AutocompleteClassifierFactory>::get(); } // static diff --git a/chrome/browser/autocomplete/autocomplete_classifier_factory.h b/chrome/browser/autocomplete/autocomplete_classifier_factory.h index bfacf21..1e2f04a 100644 --- a/chrome/browser/autocomplete/autocomplete_classifier_factory.h +++ b/chrome/browser/autocomplete/autocomplete_classifier_factory.h @@ -26,7 +26,7 @@ class AutocompleteClassifierFactory : public BrowserContextKeyedServiceFactory { content::BrowserContext* context); private: - friend struct DefaultSingletonTraits<AutocompleteClassifierFactory>; + friend struct base::DefaultSingletonTraits<AutocompleteClassifierFactory>; AutocompleteClassifierFactory(); ~AutocompleteClassifierFactory() override; diff --git a/chrome/browser/autocomplete/in_memory_url_index_factory.cc b/chrome/browser/autocomplete/in_memory_url_index_factory.cc index ae2550f..25d3a2a 100644 --- a/chrome/browser/autocomplete/in_memory_url_index_factory.cc +++ b/chrome/browser/autocomplete/in_memory_url_index_factory.cc @@ -25,7 +25,7 @@ InMemoryURLIndex* InMemoryURLIndexFactory::GetForProfile(Profile* profile) { // static InMemoryURLIndexFactory* InMemoryURLIndexFactory::GetInstance() { - return Singleton<InMemoryURLIndexFactory>::get(); + return base::Singleton<InMemoryURLIndexFactory>::get(); } InMemoryURLIndexFactory::InMemoryURLIndexFactory() diff --git a/chrome/browser/autocomplete/in_memory_url_index_factory.h b/chrome/browser/autocomplete/in_memory_url_index_factory.h index 4f62a4a..4f925e8 100644 --- a/chrome/browser/autocomplete/in_memory_url_index_factory.h +++ b/chrome/browser/autocomplete/in_memory_url_index_factory.h @@ -7,7 +7,9 @@ #include "components/keyed_service/content/browser_context_keyed_service_factory.h" +namespace base { template <typename T> struct DefaultSingletonTraits; +} class InMemoryURLIndex; class Profile; @@ -18,7 +20,7 @@ class InMemoryURLIndexFactory : public BrowserContextKeyedServiceFactory { static InMemoryURLIndexFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<InMemoryURLIndexFactory>; + friend struct base::DefaultSingletonTraits<InMemoryURLIndexFactory>; InMemoryURLIndexFactory(); ~InMemoryURLIndexFactory() override; diff --git a/chrome/browser/autocomplete/shortcuts_backend_factory.cc b/chrome/browser/autocomplete/shortcuts_backend_factory.cc index 1a3e7ae..cf4b42f 100644 --- a/chrome/browser/autocomplete/shortcuts_backend_factory.cc +++ b/chrome/browser/autocomplete/shortcuts_backend_factory.cc @@ -38,7 +38,7 @@ scoped_refptr<ShortcutsBackend> ShortcutsBackendFactory::GetForProfileIfExists( // static ShortcutsBackendFactory* ShortcutsBackendFactory::GetInstance() { - return Singleton<ShortcutsBackendFactory>::get(); + return base::Singleton<ShortcutsBackendFactory>::get(); } // static diff --git a/chrome/browser/autocomplete/shortcuts_backend_factory.h b/chrome/browser/autocomplete/shortcuts_backend_factory.h index bad596c..8401b49 100644 --- a/chrome/browser/autocomplete/shortcuts_backend_factory.h +++ b/chrome/browser/autocomplete/shortcuts_backend_factory.h @@ -35,7 +35,7 @@ class ShortcutsBackendFactory content::BrowserContext* profile); private: - friend struct DefaultSingletonTraits<ShortcutsBackendFactory>; + friend struct base::DefaultSingletonTraits<ShortcutsBackendFactory>; ShortcutsBackendFactory(); ~ShortcutsBackendFactory() override; diff --git a/chrome/browser/autofill/personal_data_manager_factory.cc b/chrome/browser/autofill/personal_data_manager_factory.cc index b67e2e5..790c6ee 100644 --- a/chrome/browser/autofill/personal_data_manager_factory.cc +++ b/chrome/browser/autofill/personal_data_manager_factory.cc @@ -27,7 +27,7 @@ PersonalDataManager* PersonalDataManagerFactory::GetForProfile( // static PersonalDataManagerFactory* PersonalDataManagerFactory::GetInstance() { - return Singleton<PersonalDataManagerFactory>::get(); + return base::Singleton<PersonalDataManagerFactory>::get(); } PersonalDataManagerFactory::PersonalDataManagerFactory() diff --git a/chrome/browser/autofill/personal_data_manager_factory.h b/chrome/browser/autofill/personal_data_manager_factory.h index 1f69b75..e0ed349 100644 --- a/chrome/browser/autofill/personal_data_manager_factory.h +++ b/chrome/browser/autofill/personal_data_manager_factory.h @@ -9,7 +9,10 @@ #include "components/keyed_service/content/browser_context_keyed_service_factory.h" #include "components/keyed_service/core/keyed_service.h" +namespace base { template <typename T> struct DefaultSingletonTraits; +} + class Profile; namespace autofill { @@ -29,7 +32,7 @@ class PersonalDataManagerFactory : public BrowserContextKeyedServiceFactory { static PersonalDataManagerFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<PersonalDataManagerFactory>; + friend struct base::DefaultSingletonTraits<PersonalDataManagerFactory>; PersonalDataManagerFactory(); ~PersonalDataManagerFactory() override; diff --git a/chrome/browser/background/background_contents_service_factory.cc b/chrome/browser/background/background_contents_service_factory.cc index de469a4..a507230 100644 --- a/chrome/browser/background/background_contents_service_factory.cc +++ b/chrome/browser/background/background_contents_service_factory.cc @@ -24,7 +24,7 @@ BackgroundContentsService* BackgroundContentsServiceFactory::GetForProfile( // static BackgroundContentsServiceFactory* BackgroundContentsServiceFactory:: GetInstance() { - return Singleton<BackgroundContentsServiceFactory>::get(); + return base::Singleton<BackgroundContentsServiceFactory>::get(); } BackgroundContentsServiceFactory::BackgroundContentsServiceFactory() diff --git a/chrome/browser/background/background_contents_service_factory.h b/chrome/browser/background/background_contents_service_factory.h index 1df96ca..850f3a9 100644 --- a/chrome/browser/background/background_contents_service_factory.h +++ b/chrome/browser/background/background_contents_service_factory.h @@ -23,7 +23,7 @@ class BackgroundContentsServiceFactory static BackgroundContentsServiceFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<BackgroundContentsServiceFactory>; + friend struct base::DefaultSingletonTraits<BackgroundContentsServiceFactory>; BackgroundContentsServiceFactory(); ~BackgroundContentsServiceFactory() override; diff --git a/chrome/browser/bitmap_fetcher/bitmap_fetcher_service_factory.cc b/chrome/browser/bitmap_fetcher/bitmap_fetcher_service_factory.cc index 9f1a7f6..ce8d4f2 100644 --- a/chrome/browser/bitmap_fetcher/bitmap_fetcher_service_factory.cc +++ b/chrome/browser/bitmap_fetcher/bitmap_fetcher_service_factory.cc @@ -16,7 +16,7 @@ BitmapFetcherService* BitmapFetcherServiceFactory::GetForBrowserContext( // static BitmapFetcherServiceFactory* BitmapFetcherServiceFactory::GetInstance() { - return Singleton<BitmapFetcherServiceFactory>::get(); + return base::Singleton<BitmapFetcherServiceFactory>::get(); } BitmapFetcherServiceFactory::BitmapFetcherServiceFactory() diff --git a/chrome/browser/bitmap_fetcher/bitmap_fetcher_service_factory.h b/chrome/browser/bitmap_fetcher/bitmap_fetcher_service_factory.h index 52662a5..a83f716 100644 --- a/chrome/browser/bitmap_fetcher/bitmap_fetcher_service_factory.h +++ b/chrome/browser/bitmap_fetcher/bitmap_fetcher_service_factory.h @@ -18,7 +18,7 @@ class BitmapFetcherServiceFactory : BrowserContextKeyedServiceFactory { static BitmapFetcherServiceFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<BitmapFetcherServiceFactory>; + friend struct base::DefaultSingletonTraits<BitmapFetcherServiceFactory>; BitmapFetcherServiceFactory(); ~BitmapFetcherServiceFactory() override; diff --git a/chrome/browser/bookmarks/bookmark_model_factory.cc b/chrome/browser/bookmarks/bookmark_model_factory.cc index ef36f5c..b4be798 100644 --- a/chrome/browser/bookmarks/bookmark_model_factory.cc +++ b/chrome/browser/bookmarks/bookmark_model_factory.cc @@ -46,7 +46,7 @@ BookmarkModel* BookmarkModelFactory::GetForProfileIfExists(Profile* profile) { // static BookmarkModelFactory* BookmarkModelFactory::GetInstance() { - return Singleton<BookmarkModelFactory>::get(); + return base::Singleton<BookmarkModelFactory>::get(); } BookmarkModelFactory::BookmarkModelFactory() diff --git a/chrome/browser/bookmarks/bookmark_model_factory.h b/chrome/browser/bookmarks/bookmark_model_factory.h index 57700f0..b4a67bf 100644 --- a/chrome/browser/bookmarks/bookmark_model_factory.h +++ b/chrome/browser/bookmarks/bookmark_model_factory.h @@ -8,7 +8,9 @@ #include "base/macros.h" #include "components/keyed_service/content/browser_context_keyed_service_factory.h" +namespace base { template <typename T> struct DefaultSingletonTraits; +} class Profile; @@ -26,7 +28,7 @@ class BookmarkModelFactory : public BrowserContextKeyedServiceFactory { static BookmarkModelFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<BookmarkModelFactory>; + friend struct base::DefaultSingletonTraits<BookmarkModelFactory>; BookmarkModelFactory(); ~BookmarkModelFactory() override; diff --git a/chrome/browser/bookmarks/chrome_bookmark_client_factory.cc b/chrome/browser/bookmarks/chrome_bookmark_client_factory.cc index 2626f78..c84a374 100644 --- a/chrome/browser/bookmarks/chrome_bookmark_client_factory.cc +++ b/chrome/browser/bookmarks/chrome_bookmark_client_factory.cc @@ -32,7 +32,7 @@ ChromeBookmarkClient* ChromeBookmarkClientFactory::GetForProfile( // static ChromeBookmarkClientFactory* ChromeBookmarkClientFactory::GetInstance() { - return Singleton<ChromeBookmarkClientFactory>::get(); + return base::Singleton<ChromeBookmarkClientFactory>::get(); } // static diff --git a/chrome/browser/bookmarks/chrome_bookmark_client_factory.h b/chrome/browser/bookmarks/chrome_bookmark_client_factory.h index a5971f6..6976098 100644 --- a/chrome/browser/bookmarks/chrome_bookmark_client_factory.h +++ b/chrome/browser/bookmarks/chrome_bookmark_client_factory.h @@ -8,8 +8,10 @@ #include "base/macros.h" #include "components/keyed_service/content/browser_context_keyed_service_factory.h" +namespace base { template <typename T> struct DefaultSingletonTraits; +} // namespace base class ChromeBookmarkClient; class Profile; @@ -23,7 +25,7 @@ class ChromeBookmarkClientFactory : public BrowserContextKeyedServiceFactory { static TestingFactoryFunction GetDefaultFactory(); private: - friend struct DefaultSingletonTraits<ChromeBookmarkClientFactory>; + friend struct base::DefaultSingletonTraits<ChromeBookmarkClientFactory>; ChromeBookmarkClientFactory(); ~ChromeBookmarkClientFactory() override; diff --git a/chrome/browser/bookmarks/managed_bookmark_service_factory.cc b/chrome/browser/bookmarks/managed_bookmark_service_factory.cc index ffeafb3..64fed09 100644 --- a/chrome/browser/bookmarks/managed_bookmark_service_factory.cc +++ b/chrome/browser/bookmarks/managed_bookmark_service_factory.cc @@ -45,7 +45,7 @@ bookmarks::ManagedBookmarkService* ManagedBookmarkServiceFactory::GetForProfile( // static ManagedBookmarkServiceFactory* ManagedBookmarkServiceFactory::GetInstance() { - return Singleton<ManagedBookmarkServiceFactory>::get(); + return base::Singleton<ManagedBookmarkServiceFactory>::get(); } // static diff --git a/chrome/browser/bookmarks/managed_bookmark_service_factory.h b/chrome/browser/bookmarks/managed_bookmark_service_factory.h index af1e102..3ce2f65 100644 --- a/chrome/browser/bookmarks/managed_bookmark_service_factory.h +++ b/chrome/browser/bookmarks/managed_bookmark_service_factory.h @@ -9,8 +9,11 @@ #include "base/memory/scoped_ptr.h" #include "components/keyed_service/content/browser_context_keyed_service_factory.h" +namespace base { template <typename T> struct DefaultSingletonTraits; +} // namespace base + class Profile; namespace bookmarks { @@ -26,7 +29,7 @@ class ManagedBookmarkServiceFactory : public BrowserContextKeyedServiceFactory { static TestingFactoryFunction GetDefaultFactory(); private: - friend struct DefaultSingletonTraits<ManagedBookmarkServiceFactory>; + friend struct base::DefaultSingletonTraits<ManagedBookmarkServiceFactory>; ManagedBookmarkServiceFactory(); ~ManagedBookmarkServiceFactory() override; diff --git a/chrome/browser/bookmarks/startup_task_runner_service_factory.cc b/chrome/browser/bookmarks/startup_task_runner_service_factory.cc index d252e61..875b4e4 100644 --- a/chrome/browser/bookmarks/startup_task_runner_service_factory.cc +++ b/chrome/browser/bookmarks/startup_task_runner_service_factory.cc @@ -28,7 +28,7 @@ StartupTaskRunnerService* StartupTaskRunnerServiceFactory::GetForProfile( // static StartupTaskRunnerServiceFactory* StartupTaskRunnerServiceFactory::GetInstance() { - return Singleton<StartupTaskRunnerServiceFactory>::get(); + return base::Singleton<StartupTaskRunnerServiceFactory>::get(); } KeyedService* StartupTaskRunnerServiceFactory::BuildServiceInstanceFor( diff --git a/chrome/browser/bookmarks/startup_task_runner_service_factory.h b/chrome/browser/bookmarks/startup_task_runner_service_factory.h index 75a4738..9450e41 100644 --- a/chrome/browser/bookmarks/startup_task_runner_service_factory.h +++ b/chrome/browser/bookmarks/startup_task_runner_service_factory.h @@ -28,7 +28,7 @@ class StartupTaskRunnerServiceFactory static StartupTaskRunnerServiceFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<StartupTaskRunnerServiceFactory>; + friend struct base::DefaultSingletonTraits<StartupTaskRunnerServiceFactory>; StartupTaskRunnerServiceFactory(); ~StartupTaskRunnerServiceFactory() override; diff --git a/chrome/browser/captive_portal/captive_portal_service_factory.cc b/chrome/browser/captive_portal/captive_portal_service_factory.cc index b64f944..08b580c 100644 --- a/chrome/browser/captive_portal/captive_portal_service_factory.cc +++ b/chrome/browser/captive_portal/captive_portal_service_factory.cc @@ -18,7 +18,7 @@ CaptivePortalService* CaptivePortalServiceFactory::GetForProfile( // static CaptivePortalServiceFactory* CaptivePortalServiceFactory::GetInstance() { - return Singleton<CaptivePortalServiceFactory>::get(); + return base::Singleton<CaptivePortalServiceFactory>::get(); } CaptivePortalServiceFactory::CaptivePortalServiceFactory() diff --git a/chrome/browser/captive_portal/captive_portal_service_factory.h b/chrome/browser/captive_portal/captive_portal_service_factory.h index 1c1269b..0b01e50 100644 --- a/chrome/browser/captive_portal/captive_portal_service_factory.h +++ b/chrome/browser/captive_portal/captive_portal_service_factory.h @@ -28,7 +28,7 @@ class CaptivePortalServiceFactory : public BrowserContextKeyedServiceFactory { private: friend class CaptivePortalBrowserTest; friend class CaptivePortalServiceTest; - friend struct DefaultSingletonTraits<CaptivePortalServiceFactory>; + friend struct base::DefaultSingletonTraits<CaptivePortalServiceFactory>; CaptivePortalServiceFactory(); ~CaptivePortalServiceFactory() override; diff --git a/chrome/browser/chromeos/app_mode/kiosk_app_update_service.cc b/chrome/browser/chromeos/app_mode/kiosk_app_update_service.cc index 14f6f5e..40e00ad 100644 --- a/chrome/browser/chromeos/app_mode/kiosk_app_update_service.cc +++ b/chrome/browser/chromeos/app_mode/kiosk_app_update_service.cc @@ -165,7 +165,7 @@ KioskAppUpdateService* KioskAppUpdateServiceFactory::GetForProfile( // static KioskAppUpdateServiceFactory* KioskAppUpdateServiceFactory::GetInstance() { - return Singleton<KioskAppUpdateServiceFactory>::get(); + return base::Singleton<KioskAppUpdateServiceFactory>::get(); } KeyedService* KioskAppUpdateServiceFactory::BuildServiceInstanceFor( diff --git a/chrome/browser/chromeos/app_mode/kiosk_app_update_service.h b/chrome/browser/chromeos/app_mode/kiosk_app_update_service.h index 5610f41..a61af71 100644 --- a/chrome/browser/chromeos/app_mode/kiosk_app_update_service.h +++ b/chrome/browser/chromeos/app_mode/kiosk_app_update_service.h @@ -87,7 +87,7 @@ class KioskAppUpdateServiceFactory : public BrowserContextKeyedServiceFactory { static KioskAppUpdateServiceFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<KioskAppUpdateServiceFactory>; + friend struct base::DefaultSingletonTraits<KioskAppUpdateServiceFactory>; KioskAppUpdateServiceFactory(); ~KioskAppUpdateServiceFactory() override; diff --git a/chrome/browser/chromeos/app_mode/kiosk_diagnosis_runner.cc b/chrome/browser/chromeos/app_mode/kiosk_diagnosis_runner.cc index 659c94b..59631ea 100644 --- a/chrome/browser/chromeos/app_mode/kiosk_diagnosis_runner.cc +++ b/chrome/browser/chromeos/app_mode/kiosk_diagnosis_runner.cc @@ -28,12 +28,10 @@ class KioskDiagnosisRunner::Factory : public BrowserContextKeyedServiceFactory { GetInstance()->GetServiceForBrowserContext(profile, true)); } - static Factory* GetInstance() { - return Singleton<Factory>::get(); - } + static Factory* GetInstance() { return base::Singleton<Factory>::get(); } private: - friend struct DefaultSingletonTraits<Factory>; + friend struct base::DefaultSingletonTraits<Factory>; Factory() : BrowserContextKeyedServiceFactory( diff --git a/chrome/browser/chromeos/camera_presence_notifier.cc b/chrome/browser/chromeos/camera_presence_notifier.cc index 4836364..2d44dd9 100644 --- a/chrome/browser/chromeos/camera_presence_notifier.cc +++ b/chrome/browser/chromeos/camera_presence_notifier.cc @@ -26,7 +26,7 @@ CameraPresenceNotifier::~CameraPresenceNotifier() {} // static CameraPresenceNotifier* CameraPresenceNotifier::GetInstance() { - return Singleton<CameraPresenceNotifier>::get(); + return base::Singleton<CameraPresenceNotifier>::get(); } void CameraPresenceNotifier::AddObserver( diff --git a/chrome/browser/chromeos/camera_presence_notifier.h b/chrome/browser/chromeos/camera_presence_notifier.h index 5bf089c..d9e9170 100644 --- a/chrome/browser/chromeos/camera_presence_notifier.h +++ b/chrome/browser/chromeos/camera_presence_notifier.h @@ -28,7 +28,7 @@ class CameraPresenceNotifier { void RemoveObserver(CameraPresenceNotifier::Observer* observer); private: - friend struct DefaultSingletonTraits<CameraPresenceNotifier>; + friend struct base::DefaultSingletonTraits<CameraPresenceNotifier>; CameraPresenceNotifier(); ~CameraPresenceNotifier(); diff --git a/chrome/browser/chromeos/certificate_provider/certificate_provider_service_factory.cc b/chrome/browser/chromeos/certificate_provider/certificate_provider_service_factory.cc index d61468b..22c4c25 100644 --- a/chrome/browser/chromeos/certificate_provider/certificate_provider_service_factory.cc +++ b/chrome/browser/chromeos/certificate_provider/certificate_provider_service_factory.cc @@ -169,7 +169,7 @@ CertificateProviderServiceFactory::GetForBrowserContext( // static CertificateProviderServiceFactory* CertificateProviderServiceFactory::GetInstance() { - return Singleton<CertificateProviderServiceFactory>::get(); + return base::Singleton<CertificateProviderServiceFactory>::get(); } CertificateProviderServiceFactory::CertificateProviderServiceFactory() diff --git a/chrome/browser/chromeos/certificate_provider/certificate_provider_service_factory.h b/chrome/browser/chromeos/certificate_provider/certificate_provider_service_factory.h index 57707c4..6b209ab 100644 --- a/chrome/browser/chromeos/certificate_provider/certificate_provider_service_factory.h +++ b/chrome/browser/chromeos/certificate_provider/certificate_provider_service_factory.h @@ -8,8 +8,10 @@ #include "base/macros.h" #include "components/keyed_service/content/browser_context_keyed_service_factory.h" +namespace base { template <typename T> struct DefaultSingletonTraits; +} namespace content { class BrowserContext; @@ -29,7 +31,7 @@ class CertificateProviderServiceFactory static CertificateProviderServiceFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<CertificateProviderServiceFactory>; + friend struct base::DefaultSingletonTraits<CertificateProviderServiceFactory>; CertificateProviderServiceFactory(); diff --git a/chrome/browser/chromeos/customization/customization_document.cc b/chrome/browser/chromeos/customization/customization_document.cc index 780ba16..9363a57 100644 --- a/chrome/browser/chromeos/customization/customization_document.cc +++ b/chrome/browser/chromeos/customization/customization_document.cc @@ -277,8 +277,9 @@ StartupCustomizationDocument::StartupCustomizationDocument( StartupCustomizationDocument::~StartupCustomizationDocument() {} StartupCustomizationDocument* StartupCustomizationDocument::GetInstance() { - return Singleton<StartupCustomizationDocument, - DefaultSingletonTraits<StartupCustomizationDocument> >::get(); + return base::Singleton< + StartupCustomizationDocument, + base::DefaultSingletonTraits<StartupCustomizationDocument>>::get(); } void StartupCustomizationDocument::Init( @@ -427,8 +428,9 @@ ServicesCustomizationDocument* ServicesCustomizationDocument::GetInstance() { if (g_test_services_customization_document) return g_test_services_customization_document; - return Singleton<ServicesCustomizationDocument, - DefaultSingletonTraits<ServicesCustomizationDocument> >::get(); + return base::Singleton< + ServicesCustomizationDocument, + base::DefaultSingletonTraits<ServicesCustomizationDocument>>::get(); } // static diff --git a/chrome/browser/chromeos/customization/customization_document.h b/chrome/browser/chromeos/customization/customization_document.h index e1cb471..24dfdac 100644 --- a/chrome/browser/chromeos/customization/customization_document.h +++ b/chrome/browser/chromeos/customization/customization_document.h @@ -108,7 +108,7 @@ class StartupCustomizationDocument : public CustomizationDocument { friend class OobeLocalizationTest; friend void InitStartupCustomizationDocumentForTesting( const std::string& manifest); - friend struct DefaultSingletonTraits<StartupCustomizationDocument>; + friend struct base::DefaultSingletonTraits<StartupCustomizationDocument>; // C-tor for singleton construction. StartupCustomizationDocument(); @@ -198,7 +198,7 @@ class ServicesCustomizationDocument : public CustomizationDocument, } private: - friend struct DefaultSingletonTraits<ServicesCustomizationDocument>; + friend struct base::DefaultSingletonTraits<ServicesCustomizationDocument>; FRIEND_TEST_ALL_PREFIXES(CustomizationWallpaperDownloaderBrowserTest, OEMWallpaperIsPresent); FRIEND_TEST_ALL_PREFIXES(CustomizationWallpaperDownloaderBrowserTest, diff --git a/chrome/browser/chromeos/device_uma.cc b/chrome/browser/chromeos/device_uma.cc index e2e3954..defb00b 100644 --- a/chrome/browser/chromeos/device_uma.cc +++ b/chrome/browser/chromeos/device_uma.cc @@ -29,7 +29,7 @@ enum UMACrosGestureMetricsType{ namespace chromeos { DeviceUMA* DeviceUMA::GetInstance() { - return Singleton<DeviceUMA>::get(); + return base::Singleton<DeviceUMA>::get(); } DeviceUMA::DeviceUMA() diff --git a/chrome/browser/chromeos/device_uma.h b/chrome/browser/chromeos/device_uma.h index e26d41a..d6c16d6 100644 --- a/chrome/browser/chromeos/device_uma.h +++ b/chrome/browser/chromeos/device_uma.h @@ -8,7 +8,9 @@ #include "base/basictypes.h" #include "ui/events/platform/platform_event_observer.h" +namespace base { template <typename T> struct DefaultSingletonTraits; +} namespace chromeos { @@ -22,7 +24,7 @@ class DeviceUMA : public ui::PlatformEventObserver { void Stop(); private: - friend struct DefaultSingletonTraits<DeviceUMA>; + friend struct base::DefaultSingletonTraits<DeviceUMA>; DeviceUMA(); ~DeviceUMA() override; diff --git a/chrome/browser/chromeos/drive/drive_integration_service.cc b/chrome/browser/chromeos/drive/drive_integration_service.cc index f64bc77..a9951e3 100644 --- a/chrome/browser/chromeos/drive/drive_integration_service.cc +++ b/chrome/browser/chromeos/drive/drive_integration_service.cc @@ -605,7 +605,7 @@ DriveIntegrationService* DriveIntegrationServiceFactory::FindForProfile( // static DriveIntegrationServiceFactory* DriveIntegrationServiceFactory::GetInstance() { - return Singleton<DriveIntegrationServiceFactory>::get(); + return base::Singleton<DriveIntegrationServiceFactory>::get(); } DriveIntegrationServiceFactory::DriveIntegrationServiceFactory() diff --git a/chrome/browser/chromeos/drive/drive_integration_service.h b/chrome/browser/chromeos/drive/drive_integration_service.h index 1777f4e..dbb1e63 100644 --- a/chrome/browser/chromeos/drive/drive_integration_service.h +++ b/chrome/browser/chromeos/drive/drive_integration_service.h @@ -222,7 +222,7 @@ class DriveIntegrationServiceFactory static DriveIntegrationServiceFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<DriveIntegrationServiceFactory>; + friend struct base::DefaultSingletonTraits<DriveIntegrationServiceFactory>; DriveIntegrationServiceFactory(); ~DriveIntegrationServiceFactory() override; diff --git a/chrome/browser/chromeos/events/system_key_event_listener.h b/chrome/browser/chromeos/events/system_key_event_listener.h index d26335b..2c46e6c 100644 --- a/chrome/browser/chromeos/events/system_key_event_listener.h +++ b/chrome/browser/chromeos/events/system_key_event_listener.h @@ -24,7 +24,7 @@ class SystemKeyEventListener : public ui::PlatformEventObserver { private: // Defines the delete on exit Singleton traits we like. Best to have this // and const/dest private as recommended for Singletons. - friend struct DefaultSingletonTraits<SystemKeyEventListener>; + friend struct base::DefaultSingletonTraits<SystemKeyEventListener>; friend class SystemKeyEventListenerTest; SystemKeyEventListener(); diff --git a/chrome/browser/chromeos/events/xinput_hierarchy_changed_event_listener.cc b/chrome/browser/chromeos/events/xinput_hierarchy_changed_event_listener.cc index c208667..75cd89f 100644 --- a/chrome/browser/chromeos/events/xinput_hierarchy_changed_event_listener.cc +++ b/chrome/browser/chromeos/events/xinput_hierarchy_changed_event_listener.cc @@ -44,7 +44,7 @@ void HandleHierarchyChangedEvent(XIHierarchyEvent* event) { // static XInputHierarchyChangedEventListener* XInputHierarchyChangedEventListener::GetInstance() { - return Singleton<XInputHierarchyChangedEventListener>::get(); + return base::Singleton<XInputHierarchyChangedEventListener>::get(); } XInputHierarchyChangedEventListener::XInputHierarchyChangedEventListener() diff --git a/chrome/browser/chromeos/events/xinput_hierarchy_changed_event_listener.h b/chrome/browser/chromeos/events/xinput_hierarchy_changed_event_listener.h index 8170f2b..0332e349 100644 --- a/chrome/browser/chromeos/events/xinput_hierarchy_changed_event_listener.h +++ b/chrome/browser/chromeos/events/xinput_hierarchy_changed_event_listener.h @@ -26,7 +26,8 @@ class XInputHierarchyChangedEventListener : public ui::PlatformEventObserver { private: // Defines the delete on exit Singleton traits we like. Best to have this // and const/dest private as recommended for Singletons. - friend struct DefaultSingletonTraits<XInputHierarchyChangedEventListener>; + friend struct base::DefaultSingletonTraits< + XInputHierarchyChangedEventListener>; XInputHierarchyChangedEventListener(); ~XInputHierarchyChangedEventListener() override; diff --git a/chrome/browser/chromeos/extensions/file_manager/event_router_factory.cc b/chrome/browser/chromeos/extensions/file_manager/event_router_factory.cc index 80fd18b..62b8f0e 100644 --- a/chrome/browser/chromeos/extensions/file_manager/event_router_factory.cc +++ b/chrome/browser/chromeos/extensions/file_manager/event_router_factory.cc @@ -23,7 +23,7 @@ EventRouter* EventRouterFactory::GetForProfile(Profile* profile) { // static EventRouterFactory* EventRouterFactory::GetInstance() { - return Singleton<EventRouterFactory>::get(); + return base::Singleton<EventRouterFactory>::get(); } EventRouterFactory::EventRouterFactory() diff --git a/chrome/browser/chromeos/extensions/file_manager/event_router_factory.h b/chrome/browser/chromeos/extensions/file_manager/event_router_factory.h index e30de225..40d5bff 100644 --- a/chrome/browser/chromeos/extensions/file_manager/event_router_factory.h +++ b/chrome/browser/chromeos/extensions/file_manager/event_router_factory.h @@ -31,7 +31,7 @@ class EventRouterFactory : public BrowserContextKeyedServiceFactory { bool ServiceIsNULLWhileTesting() const override; private: - friend struct DefaultSingletonTraits<EventRouterFactory>; + friend struct base::DefaultSingletonTraits<EventRouterFactory>; EventRouterFactory(); ~EventRouterFactory() override; diff --git a/chrome/browser/chromeos/extensions/install_limiter_factory.cc b/chrome/browser/chromeos/extensions/install_limiter_factory.cc index e93d54a..aeb869b 100644 --- a/chrome/browser/chromeos/extensions/install_limiter_factory.cc +++ b/chrome/browser/chromeos/extensions/install_limiter_factory.cc @@ -20,7 +20,7 @@ InstallLimiter* InstallLimiterFactory::GetForProfile(Profile* profile) { // static InstallLimiterFactory* InstallLimiterFactory::GetInstance() { - return Singleton<InstallLimiterFactory>::get(); + return base::Singleton<InstallLimiterFactory>::get(); } InstallLimiterFactory::InstallLimiterFactory() diff --git a/chrome/browser/chromeos/extensions/install_limiter_factory.h b/chrome/browser/chromeos/extensions/install_limiter_factory.h index 2f7981e..66aeba0 100644 --- a/chrome/browser/chromeos/extensions/install_limiter_factory.h +++ b/chrome/browser/chromeos/extensions/install_limiter_factory.h @@ -24,7 +24,7 @@ class InstallLimiterFactory : public BrowserContextKeyedServiceFactory { static InstallLimiterFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<InstallLimiterFactory>; + friend struct base::DefaultSingletonTraits<InstallLimiterFactory>; InstallLimiterFactory(); ~InstallLimiterFactory() override; diff --git a/chrome/browser/chromeos/extensions/users_private/users_private_delegate_factory.cc b/chrome/browser/chromeos/extensions/users_private/users_private_delegate_factory.cc index 0fe48db..115403e 100644 --- a/chrome/browser/chromeos/extensions/users_private/users_private_delegate_factory.cc +++ b/chrome/browser/chromeos/extensions/users_private/users_private_delegate_factory.cc @@ -23,7 +23,7 @@ UsersPrivateDelegate* UsersPrivateDelegateFactory::GetForBrowserContext( // static UsersPrivateDelegateFactory* UsersPrivateDelegateFactory::GetInstance() { - return Singleton<UsersPrivateDelegateFactory>::get(); + return base::Singleton<UsersPrivateDelegateFactory>::get(); } UsersPrivateDelegateFactory::UsersPrivateDelegateFactory() diff --git a/chrome/browser/chromeos/extensions/users_private/users_private_delegate_factory.h b/chrome/browser/chromeos/extensions/users_private/users_private_delegate_factory.h index 93d88ad7..32d493a 100644 --- a/chrome/browser/chromeos/extensions/users_private/users_private_delegate_factory.h +++ b/chrome/browser/chromeos/extensions/users_private/users_private_delegate_factory.h @@ -24,7 +24,7 @@ class UsersPrivateDelegateFactory : public BrowserContextKeyedServiceFactory { static UsersPrivateDelegateFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<UsersPrivateDelegateFactory>; + friend struct base::DefaultSingletonTraits<UsersPrivateDelegateFactory>; UsersPrivateDelegateFactory(); ~UsersPrivateDelegateFactory() override; diff --git a/chrome/browser/chromeos/file_manager/volume_manager_factory.cc b/chrome/browser/chromeos/file_manager/volume_manager_factory.cc index 4b64ecb..73d8c39 100644 --- a/chrome/browser/chromeos/file_manager/volume_manager_factory.cc +++ b/chrome/browser/chromeos/file_manager/volume_manager_factory.cc @@ -26,7 +26,7 @@ VolumeManager* VolumeManagerFactory::Get(content::BrowserContext* context) { } VolumeManagerFactory* VolumeManagerFactory::GetInstance() { - return Singleton<VolumeManagerFactory>::get(); + return base::Singleton<VolumeManagerFactory>::get(); } content::BrowserContext* VolumeManagerFactory::GetBrowserContextToUse( diff --git a/chrome/browser/chromeos/file_manager/volume_manager_factory.h b/chrome/browser/chromeos/file_manager/volume_manager_factory.h index 7255a51..7a87d9b 100644 --- a/chrome/browser/chromeos/file_manager/volume_manager_factory.h +++ b/chrome/browser/chromeos/file_manager/volume_manager_factory.h @@ -8,7 +8,10 @@ #ifndef CHROME_BROWSER_CHROMEOS_FILE_MANAGER_VOLUME_MANAGER_FACTORY_H_ #define CHROME_BROWSER_CHROMEOS_FILE_MANAGER_VOLUME_MANAGER_FACTORY_H_ -template<typename T> struct DefaultSingletonTraits; +namespace base { +template <typename T> +struct DefaultSingletonTraits; +} // namespace base namespace content { class BrowserContext; @@ -39,7 +42,7 @@ class VolumeManagerFactory : public BrowserContextKeyedServiceFactory { private: // For Singleton. - friend struct DefaultSingletonTraits<VolumeManagerFactory>; + friend struct base::DefaultSingletonTraits<VolumeManagerFactory>; VolumeManagerFactory(); ~VolumeManagerFactory() override; diff --git a/chrome/browser/chromeos/file_system_provider/service_factory.cc b/chrome/browser/chromeos/file_system_provider/service_factory.cc index b54a11e..463246d 100644 --- a/chrome/browser/chromeos/file_system_provider/service_factory.cc +++ b/chrome/browser/chromeos/file_system_provider/service_factory.cc @@ -27,7 +27,7 @@ Service* ServiceFactory::FindExisting(content::BrowserContext* context) { } ServiceFactory* ServiceFactory::GetInstance() { - return Singleton<ServiceFactory>::get(); + return base::Singleton<ServiceFactory>::get(); } ServiceFactory::ServiceFactory() diff --git a/chrome/browser/chromeos/file_system_provider/service_factory.h b/chrome/browser/chromeos/file_system_provider/service_factory.h index 44b152d..de5dd33 100644 --- a/chrome/browser/chromeos/file_system_provider/service_factory.h +++ b/chrome/browser/chromeos/file_system_provider/service_factory.h @@ -32,7 +32,7 @@ class ServiceFactory : public BrowserContextKeyedServiceFactory { static ServiceFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<ServiceFactory>; + friend struct base::DefaultSingletonTraits<ServiceFactory>; ServiceFactory(); ~ServiceFactory() override; diff --git a/chrome/browser/chromeos/launcher_search_provider/launcher_search_provider_service_factory.cc b/chrome/browser/chromeos/launcher_search_provider/launcher_search_provider_service_factory.cc index cf49dde..6f3f345 100644 --- a/chrome/browser/chromeos/launcher_search_provider/launcher_search_provider_service_factory.cc +++ b/chrome/browser/chromeos/launcher_search_provider/launcher_search_provider_service_factory.cc @@ -25,7 +25,7 @@ Service* ServiceFactory::Get(content::BrowserContext* context) { // static ServiceFactory* ServiceFactory::GetInstance() { - return Singleton<ServiceFactory>::get(); + return base::Singleton<ServiceFactory>::get(); } ServiceFactory::ServiceFactory() diff --git a/chrome/browser/chromeos/launcher_search_provider/launcher_search_provider_service_factory.h b/chrome/browser/chromeos/launcher_search_provider/launcher_search_provider_service_factory.h index 8da5962..3bbd42d 100644 --- a/chrome/browser/chromeos/launcher_search_provider/launcher_search_provider_service_factory.h +++ b/chrome/browser/chromeos/launcher_search_provider/launcher_search_provider_service_factory.h @@ -24,7 +24,7 @@ class ServiceFactory : public BrowserContextKeyedServiceFactory { static ServiceFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<ServiceFactory>; + friend struct base::DefaultSingletonTraits<ServiceFactory>; ServiceFactory(); ~ServiceFactory() override; diff --git a/chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager_factory.cc b/chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager_factory.cc index c12f2fb..00d1d0e 100644 --- a/chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager_factory.cc +++ b/chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager_factory.cc @@ -23,7 +23,7 @@ PrefService* GetLocalState() { // static EasyUnlockTpmKeyManagerFactory* EasyUnlockTpmKeyManagerFactory::GetInstance() { - return Singleton<EasyUnlockTpmKeyManagerFactory>::get(); + return base::Singleton<EasyUnlockTpmKeyManagerFactory>::get(); } // static diff --git a/chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager_factory.h b/chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager_factory.h index 4c85d4f..df0c0db 100644 --- a/chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager_factory.h +++ b/chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager_factory.h @@ -14,7 +14,11 @@ namespace content { class BrowserContext; } -template <typename T> struct DefaultSingletonTraits; +namespace base { +template <typename T> +struct DefaultSingletonTraits; +} // namespace base + class EasyUnlockTpmKeyManager; // Singleton factory that builds and owns all EasyUnlockTpmKeyManager services. @@ -27,7 +31,7 @@ class EasyUnlockTpmKeyManagerFactory static EasyUnlockTpmKeyManager* GetForUser(const std::string& user_id); private: - friend struct DefaultSingletonTraits<EasyUnlockTpmKeyManagerFactory>; + friend struct base::DefaultSingletonTraits<EasyUnlockTpmKeyManagerFactory>; EasyUnlockTpmKeyManagerFactory(); ~EasyUnlockTpmKeyManagerFactory() override; diff --git a/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter_factory.cc b/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter_factory.cc index c524726..76d4add 100644 --- a/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter_factory.cc +++ b/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter_factory.cc @@ -18,7 +18,7 @@ base::Clock* SAMLOfflineSigninLimiterFactory::clock_for_testing_ = NULL; // static SAMLOfflineSigninLimiterFactory* SAMLOfflineSigninLimiterFactory::GetInstance() { - return Singleton<SAMLOfflineSigninLimiterFactory>::get(); + return base::Singleton<SAMLOfflineSigninLimiterFactory>::get(); } // static diff --git a/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter_factory.h b/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter_factory.h index f81baae..080f51e 100644 --- a/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter_factory.h +++ b/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter_factory.h @@ -34,7 +34,7 @@ class SAMLOfflineSigninLimiterFactory static void SetClockForTesting(base::Clock* clock); private: - friend struct DefaultSingletonTraits<SAMLOfflineSigninLimiterFactory>; + friend struct base::DefaultSingletonTraits<SAMLOfflineSigninLimiterFactory>; SAMLOfflineSigninLimiterFactory(); ~SAMLOfflineSigninLimiterFactory() override; diff --git a/chrome/browser/chromeos/login/session/user_session_manager.cc b/chrome/browser/chromeos/login/session/user_session_manager.cc index a3a7ab0..f30aab8 100644 --- a/chrome/browser/chromeos/login/session/user_session_manager.cc +++ b/chrome/browser/chromeos/login/session/user_session_manager.cc @@ -323,8 +323,8 @@ UserSessionStateObserver::~UserSessionStateObserver() { // static UserSessionManager* UserSessionManager::GetInstance() { - return Singleton<UserSessionManager, - DefaultSingletonTraits<UserSessionManager> >::get(); + return base::Singleton<UserSessionManager, base::DefaultSingletonTraits< + UserSessionManager>>::get(); } // static diff --git a/chrome/browser/chromeos/login/session/user_session_manager.h b/chrome/browser/chromeos/login/session/user_session_manager.h index 51f7bba..dee2273 100644 --- a/chrome/browser/chromeos/login/session/user_session_manager.h +++ b/chrome/browser/chromeos/login/session/user_session_manager.h @@ -246,7 +246,7 @@ class UserSessionManager private: friend class test::UserSessionManagerTestApi; - friend struct DefaultSingletonTraits<UserSessionManager>; + friend struct base::DefaultSingletonTraits<UserSessionManager>; typedef std::set<std::string> SigninSessionRestoreStateSet; diff --git a/chrome/browser/chromeos/login/signin/auth_sync_observer_factory.cc b/chrome/browser/chromeos/login/signin/auth_sync_observer_factory.cc index 3c8121f..7bbd5b7 100644 --- a/chrome/browser/chromeos/login/signin/auth_sync_observer_factory.cc +++ b/chrome/browser/chromeos/login/signin/auth_sync_observer_factory.cc @@ -31,7 +31,7 @@ AuthSyncObserver* AuthSyncObserverFactory::GetForProfile( // static AuthSyncObserverFactory* AuthSyncObserverFactory::GetInstance() { - return Singleton<AuthSyncObserverFactory>::get(); + return base::Singleton<AuthSyncObserverFactory>::get(); } KeyedService* AuthSyncObserverFactory::BuildServiceInstanceFor( diff --git a/chrome/browser/chromeos/login/signin/auth_sync_observer_factory.h b/chrome/browser/chromeos/login/signin/auth_sync_observer_factory.h index 34648f7..3f708a7 100644 --- a/chrome/browser/chromeos/login/signin/auth_sync_observer_factory.h +++ b/chrome/browser/chromeos/login/signin/auth_sync_observer_factory.h @@ -28,7 +28,7 @@ class AuthSyncObserverFactory static AuthSyncObserverFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<AuthSyncObserverFactory>; + friend struct base::DefaultSingletonTraits<AuthSyncObserverFactory>; AuthSyncObserverFactory(); ~AuthSyncObserverFactory() override; diff --git a/chrome/browser/chromeos/login/signin/oauth2_login_manager_factory.cc b/chrome/browser/chromeos/login/signin/oauth2_login_manager_factory.cc index 8a53401..976b939 100644 --- a/chrome/browser/chromeos/login/signin/oauth2_login_manager_factory.cc +++ b/chrome/browser/chromeos/login/signin/oauth2_login_manager_factory.cc @@ -39,7 +39,7 @@ OAuth2LoginManager* OAuth2LoginManagerFactory::GetForProfile( // static OAuth2LoginManagerFactory* OAuth2LoginManagerFactory::GetInstance() { - return Singleton<OAuth2LoginManagerFactory>::get(); + return base::Singleton<OAuth2LoginManagerFactory>::get(); } KeyedService* OAuth2LoginManagerFactory::BuildServiceInstanceFor( diff --git a/chrome/browser/chromeos/login/signin/oauth2_login_manager_factory.h b/chrome/browser/chromeos/login/signin/oauth2_login_manager_factory.h index bf51514..64e76b7 100644 --- a/chrome/browser/chromeos/login/signin/oauth2_login_manager_factory.h +++ b/chrome/browser/chromeos/login/signin/oauth2_login_manager_factory.h @@ -28,7 +28,7 @@ class OAuth2LoginManagerFactory static OAuth2LoginManagerFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<OAuth2LoginManagerFactory>; + friend struct base::DefaultSingletonTraits<OAuth2LoginManagerFactory>; OAuth2LoginManagerFactory(); ~OAuth2LoginManagerFactory() override; diff --git a/chrome/browser/chromeos/login/signin/token_handle_fetcher.cc b/chrome/browser/chromeos/login/signin/token_handle_fetcher.cc index c7ee2ae..3f79988 100644 --- a/chrome/browser/chromeos/login/signin/token_handle_fetcher.cc +++ b/chrome/browser/chromeos/login/signin/token_handle_fetcher.cc @@ -23,11 +23,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/chromeos/login/ui/user_adding_screen.cc b/chrome/browser/chromeos/login/ui/user_adding_screen.cc index 46cd6e8..8f6ba74 100644 --- a/chrome/browser/chromeos/login/ui/user_adding_screen.cc +++ b/chrome/browser/chromeos/login/ui/user_adding_screen.cc @@ -34,7 +34,7 @@ class UserAddingScreenImpl : public UserAddingScreen { static UserAddingScreenImpl* GetInstance(); private: - friend struct DefaultSingletonTraits<UserAddingScreenImpl>; + friend struct base::DefaultSingletonTraits<UserAddingScreenImpl>; void OnDisplayHostCompletion(); @@ -97,7 +97,7 @@ void UserAddingScreenImpl::OnDisplayHostCompletion() { // static UserAddingScreenImpl* UserAddingScreenImpl::GetInstance() { - return Singleton<UserAddingScreenImpl>::get(); + return base::Singleton<UserAddingScreenImpl>::get(); } UserAddingScreenImpl::UserAddingScreenImpl() diff --git a/chrome/browser/chromeos/mobile/mobile_activator.cc b/chrome/browser/chromeos/mobile/mobile_activator.cc index ce76574a..7978921 100644 --- a/chrome/browser/chromeos/mobile/mobile_activator.cc +++ b/chrome/browser/chromeos/mobile/mobile_activator.cc @@ -182,7 +182,7 @@ MobileActivator::~MobileActivator() { } MobileActivator* MobileActivator::GetInstance() { - return Singleton<MobileActivator>::get(); + return base::Singleton<MobileActivator>::get(); } void MobileActivator::TerminateActivation() { diff --git a/chrome/browser/chromeos/mobile/mobile_activator.h b/chrome/browser/chromeos/mobile/mobile_activator.h index ac6d6de6..2c51419 100644 --- a/chrome/browser/chromeos/mobile/mobile_activator.h +++ b/chrome/browser/chromeos/mobile/mobile_activator.h @@ -155,7 +155,7 @@ class MobileActivator virtual const NetworkState* GetDefaultNetwork(); private: - friend struct DefaultSingletonTraits<MobileActivator>; + friend struct base::DefaultSingletonTraits<MobileActivator>; friend class TestMobileActivator; friend class MobileActivatorTest; diff --git a/chrome/browser/chromeos/mobile_config.cc b/chrome/browser/chromeos/mobile_config.cc index 63eaebe..6e560f8 100644 --- a/chrome/browser/chromeos/mobile_config.cc +++ b/chrome/browser/chromeos/mobile_config.cc @@ -213,8 +213,8 @@ void MobileConfig::LocaleConfig::InitFromDictionary( // static MobileConfig* MobileConfig::GetInstance() { - return Singleton<MobileConfig, - DefaultSingletonTraits<MobileConfig> >::get(); + return base::Singleton<MobileConfig, + base::DefaultSingletonTraits<MobileConfig>>::get(); } const MobileConfig::Carrier* MobileConfig::GetCarrier( diff --git a/chrome/browser/chromeos/mobile_config.h b/chrome/browser/chromeos/mobile_config.h index 37f223c..8c33a9a 100644 --- a/chrome/browser/chromeos/mobile_config.h +++ b/chrome/browser/chromeos/mobile_config.h @@ -160,7 +160,7 @@ class MobileConfig : public CustomizationDocument { FRIEND_TEST_ALL_PREFIXES(MobileConfigTest, OldDeal); FRIEND_TEST_ALL_PREFIXES(MobileConfigTest, LocalConfigNoDeals); FRIEND_TEST_ALL_PREFIXES(MobileConfigTest, LocalConfig); - friend struct DefaultSingletonTraits<MobileConfig>; + friend struct base::DefaultSingletonTraits<MobileConfig>; // C-tor for singleton construction. MobileConfig(); diff --git a/chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.cc b/chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.cc index 3abecb5..bbd4ca4 100644 --- a/chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.cc +++ b/chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.cc @@ -49,7 +49,7 @@ OwnerSettingsServiceChromeOSFactory::GetForBrowserContext( // static OwnerSettingsServiceChromeOSFactory* OwnerSettingsServiceChromeOSFactory::GetInstance() { - return Singleton<OwnerSettingsServiceChromeOSFactory>::get(); + return base::Singleton<OwnerSettingsServiceChromeOSFactory>::get(); } // static diff --git a/chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.h b/chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.h index 8799ac1..47df71d 100644 --- a/chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.h +++ b/chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.h @@ -43,7 +43,8 @@ class OwnerSettingsServiceChromeOSFactory const scoped_refptr<ownership::OwnerKeyUtil>& owner_key_util); private: - friend struct DefaultSingletonTraits<OwnerSettingsServiceChromeOSFactory>; + friend struct base::DefaultSingletonTraits< + OwnerSettingsServiceChromeOSFactory>; OwnerSettingsServiceChromeOSFactory(); ~OwnerSettingsServiceChromeOSFactory() override; diff --git a/chrome/browser/chromeos/platform_keys/platform_keys_service_factory.cc b/chrome/browser/chromeos/platform_keys/platform_keys_service_factory.cc index 2f529b6..c3595e4 100644 --- a/chrome/browser/chromeos/platform_keys/platform_keys_service_factory.cc +++ b/chrome/browser/chromeos/platform_keys/platform_keys_service_factory.cc @@ -78,7 +78,7 @@ PlatformKeysService* PlatformKeysServiceFactory::GetForBrowserContext( // static PlatformKeysServiceFactory* PlatformKeysServiceFactory::GetInstance() { - return Singleton<PlatformKeysServiceFactory>::get(); + return base::Singleton<PlatformKeysServiceFactory>::get(); } PlatformKeysServiceFactory::PlatformKeysServiceFactory() diff --git a/chrome/browser/chromeos/platform_keys/platform_keys_service_factory.h b/chrome/browser/chromeos/platform_keys/platform_keys_service_factory.h index deb9479..8042797 100644 --- a/chrome/browser/chromeos/platform_keys/platform_keys_service_factory.h +++ b/chrome/browser/chromeos/platform_keys/platform_keys_service_factory.h @@ -8,8 +8,10 @@ #include "base/macros.h" #include "components/keyed_service/content/browser_context_keyed_service_factory.h" +namespace base { template <typename T> struct DefaultSingletonTraits; +} // namespace base namespace chromeos { @@ -24,7 +26,7 @@ class PlatformKeysServiceFactory : public BrowserContextKeyedServiceFactory { static PlatformKeysServiceFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<PlatformKeysServiceFactory>; + friend struct base::DefaultSingletonTraits<PlatformKeysServiceFactory>; PlatformKeysServiceFactory(); ~PlatformKeysServiceFactory() override; diff --git a/chrome/browser/chromeos/policy/consumer_enrollment_handler_factory.cc b/chrome/browser/chromeos/policy/consumer_enrollment_handler_factory.cc index be40a02..93756c2 100644 --- a/chrome/browser/chromeos/policy/consumer_enrollment_handler_factory.cc +++ b/chrome/browser/chromeos/policy/consumer_enrollment_handler_factory.cc @@ -29,7 +29,7 @@ ConsumerEnrollmentHandlerFactory::GetForBrowserContext( // static ConsumerEnrollmentHandlerFactory* ConsumerEnrollmentHandlerFactory::GetInstance() { - return Singleton<ConsumerEnrollmentHandlerFactory>::get(); + return base::Singleton<ConsumerEnrollmentHandlerFactory>::get(); } ConsumerEnrollmentHandlerFactory::ConsumerEnrollmentHandlerFactory() diff --git a/chrome/browser/chromeos/policy/consumer_enrollment_handler_factory.h b/chrome/browser/chromeos/policy/consumer_enrollment_handler_factory.h index b615761..72436fde 100644 --- a/chrome/browser/chromeos/policy/consumer_enrollment_handler_factory.h +++ b/chrome/browser/chromeos/policy/consumer_enrollment_handler_factory.h @@ -28,7 +28,7 @@ class ConsumerEnrollmentHandlerFactory static ConsumerEnrollmentHandlerFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<ConsumerEnrollmentHandlerFactory>; + friend struct base::DefaultSingletonTraits<ConsumerEnrollmentHandlerFactory>; ConsumerEnrollmentHandlerFactory(); ~ConsumerEnrollmentHandlerFactory() override; diff --git a/chrome/browser/chromeos/policy/consumer_management_notifier_factory.cc b/chrome/browser/chromeos/policy/consumer_management_notifier_factory.cc index a63c772..1df6863 100644 --- a/chrome/browser/chromeos/policy/consumer_management_notifier_factory.cc +++ b/chrome/browser/chromeos/policy/consumer_management_notifier_factory.cc @@ -26,7 +26,7 @@ ConsumerManagementNotifierFactory::GetForBrowserContext( // static ConsumerManagementNotifierFactory* ConsumerManagementNotifierFactory::GetInstance() { - return Singleton<ConsumerManagementNotifierFactory>::get(); + return base::Singleton<ConsumerManagementNotifierFactory>::get(); } ConsumerManagementNotifierFactory::ConsumerManagementNotifierFactory() diff --git a/chrome/browser/chromeos/policy/consumer_management_notifier_factory.h b/chrome/browser/chromeos/policy/consumer_management_notifier_factory.h index ae5c934..f8e935a 100644 --- a/chrome/browser/chromeos/policy/consumer_management_notifier_factory.h +++ b/chrome/browser/chromeos/policy/consumer_management_notifier_factory.h @@ -26,7 +26,7 @@ class ConsumerManagementNotifierFactory static ConsumerManagementNotifierFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<ConsumerManagementNotifierFactory>; + friend struct base::DefaultSingletonTraits<ConsumerManagementNotifierFactory>; ConsumerManagementNotifierFactory(); ~ConsumerManagementNotifierFactory() override; diff --git a/chrome/browser/chromeos/policy/consumer_unenrollment_handler_factory.cc b/chrome/browser/chromeos/policy/consumer_unenrollment_handler_factory.cc index b44377e..f062203 100644 --- a/chrome/browser/chromeos/policy/consumer_unenrollment_handler_factory.cc +++ b/chrome/browser/chromeos/policy/consumer_unenrollment_handler_factory.cc @@ -25,7 +25,7 @@ ConsumerUnenrollmentHandlerFactory::GetForBrowserContext( // static ConsumerUnenrollmentHandlerFactory* ConsumerUnenrollmentHandlerFactory::GetInstance() { - return Singleton<ConsumerUnenrollmentHandlerFactory>::get(); + return base::Singleton<ConsumerUnenrollmentHandlerFactory>::get(); } ConsumerUnenrollmentHandlerFactory::ConsumerUnenrollmentHandlerFactory() diff --git a/chrome/browser/chromeos/policy/consumer_unenrollment_handler_factory.h b/chrome/browser/chromeos/policy/consumer_unenrollment_handler_factory.h index 77b11bb..c706eb3 100644 --- a/chrome/browser/chromeos/policy/consumer_unenrollment_handler_factory.h +++ b/chrome/browser/chromeos/policy/consumer_unenrollment_handler_factory.h @@ -22,7 +22,8 @@ class ConsumerUnenrollmentHandlerFactory static ConsumerUnenrollmentHandlerFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<ConsumerUnenrollmentHandlerFactory>; + friend struct base::DefaultSingletonTraits< + ConsumerUnenrollmentHandlerFactory>; ConsumerUnenrollmentHandlerFactory(); ~ConsumerUnenrollmentHandlerFactory() override; diff --git a/chrome/browser/chromeos/policy/policy_cert_service_factory.cc b/chrome/browser/chromeos/policy/policy_cert_service_factory.cc index 52a69f3..9b999a9 100644 --- a/chrome/browser/chromeos/policy/policy_cert_service_factory.cc +++ b/chrome/browser/chromeos/policy/policy_cert_service_factory.cc @@ -42,7 +42,7 @@ scoped_ptr<PolicyCertVerifier> PolicyCertServiceFactory::CreateForProfile( // static PolicyCertServiceFactory* PolicyCertServiceFactory::GetInstance() { - return Singleton<PolicyCertServiceFactory>::get(); + return base::Singleton<PolicyCertServiceFactory>::get(); } // static diff --git a/chrome/browser/chromeos/policy/policy_cert_service_factory.h b/chrome/browser/chromeos/policy/policy_cert_service_factory.h index b2851ba..5d5b74b 100644 --- a/chrome/browser/chromeos/policy/policy_cert_service_factory.h +++ b/chrome/browser/chromeos/policy/policy_cert_service_factory.h @@ -12,7 +12,10 @@ #include "base/memory/scoped_ptr.h" #include "components/keyed_service/content/browser_context_keyed_service_factory.h" -template <typename T> struct DefaultSingletonTraits; +namespace base { +template <typename T> +struct DefaultSingletonTraits; +} // namespace base class PrefRegistrySimple; class Profile; @@ -49,7 +52,7 @@ class PolicyCertServiceFactory : public BrowserContextKeyedServiceFactory { static void RegisterPrefs(PrefRegistrySimple* local_state); private: - friend struct DefaultSingletonTraits<PolicyCertServiceFactory>; + friend struct base::DefaultSingletonTraits<PolicyCertServiceFactory>; PolicyCertServiceFactory(); ~PolicyCertServiceFactory() override; diff --git a/chrome/browser/chromeos/policy/recommendation_restorer_factory.cc b/chrome/browser/chromeos/policy/recommendation_restorer_factory.cc index 23961aa..0c791df 100644 --- a/chrome/browser/chromeos/policy/recommendation_restorer_factory.cc +++ b/chrome/browser/chromeos/policy/recommendation_restorer_factory.cc @@ -13,7 +13,7 @@ namespace policy { // static RecommendationRestorerFactory* RecommendationRestorerFactory::GetInstance() { - return Singleton<RecommendationRestorerFactory>::get(); + return base::Singleton<RecommendationRestorerFactory>::get(); } // static diff --git a/chrome/browser/chromeos/policy/recommendation_restorer_factory.h b/chrome/browser/chromeos/policy/recommendation_restorer_factory.h index fdf7dfa..a683c4a 100644 --- a/chrome/browser/chromeos/policy/recommendation_restorer_factory.h +++ b/chrome/browser/chromeos/policy/recommendation_restorer_factory.h @@ -29,7 +29,7 @@ class RecommendationRestorerFactory : public BrowserContextKeyedServiceFactory { bool ServiceIsCreatedWithBrowserContext() const override; private: - friend struct DefaultSingletonTraits<RecommendationRestorerFactory>; + friend struct base::DefaultSingletonTraits<RecommendationRestorerFactory>; RecommendationRestorerFactory(); ~RecommendationRestorerFactory() override; diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc b/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc index 65da55c..d18bed6 100644 --- a/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc +++ b/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc @@ -73,7 +73,7 @@ const int kInitialPolicyFetchTimeoutSeconds = 10; // static UserCloudPolicyManagerFactoryChromeOS* UserCloudPolicyManagerFactoryChromeOS::GetInstance() { - return Singleton<UserCloudPolicyManagerFactoryChromeOS>::get(); + return base::Singleton<UserCloudPolicyManagerFactoryChromeOS>::get(); } // static diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.h b/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.h index 1762cc6..d018515 100644 --- a/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.h +++ b/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.h @@ -62,7 +62,8 @@ class UserCloudPolicyManagerFactoryChromeOS scoped_refptr<base::SequencedTaskRunner> background_task_runner); private: - friend struct DefaultSingletonTraits<UserCloudPolicyManagerFactoryChromeOS>; + friend struct base::DefaultSingletonTraits< + UserCloudPolicyManagerFactoryChromeOS>; UserCloudPolicyManagerFactoryChromeOS(); ~UserCloudPolicyManagerFactoryChromeOS() override; diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder_factory.cc b/chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder_factory.cc index 0d498c6..731b269 100644 --- a/chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder_factory.cc +++ b/chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder_factory.cc @@ -19,7 +19,7 @@ namespace policy { // static UserCloudPolicyTokenForwarderFactory* UserCloudPolicyTokenForwarderFactory::GetInstance() { - return Singleton<UserCloudPolicyTokenForwarderFactory>::get(); + return base::Singleton<UserCloudPolicyTokenForwarderFactory>::get(); } UserCloudPolicyTokenForwarderFactory::UserCloudPolicyTokenForwarderFactory() diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder_factory.h b/chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder_factory.h index c34cb2e..53f5d8b 100644 --- a/chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder_factory.h +++ b/chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder_factory.h @@ -24,7 +24,8 @@ class UserCloudPolicyTokenForwarderFactory static UserCloudPolicyTokenForwarderFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<UserCloudPolicyTokenForwarderFactory>; + friend struct base::DefaultSingletonTraits< + UserCloudPolicyTokenForwarderFactory>; UserCloudPolicyTokenForwarderFactory(); ~UserCloudPolicyTokenForwarderFactory() override; diff --git a/chrome/browser/chromeos/policy/user_network_configuration_updater_factory.cc b/chrome/browser/chromeos/policy/user_network_configuration_updater_factory.cc index 9d66ff0..e13ed61 100644 --- a/chrome/browser/chromeos/policy/user_network_configuration_updater_factory.cc +++ b/chrome/browser/chromeos/policy/user_network_configuration_updater_factory.cc @@ -29,7 +29,7 @@ UserNetworkConfigurationUpdaterFactory::GetForProfile(Profile* profile) { // static UserNetworkConfigurationUpdaterFactory* UserNetworkConfigurationUpdaterFactory::GetInstance() { - return Singleton<UserNetworkConfigurationUpdaterFactory>::get(); + return base::Singleton<UserNetworkConfigurationUpdaterFactory>::get(); } UserNetworkConfigurationUpdaterFactory::UserNetworkConfigurationUpdaterFactory() diff --git a/chrome/browser/chromeos/policy/user_network_configuration_updater_factory.h b/chrome/browser/chromeos/policy/user_network_configuration_updater_factory.h index 13866a8..d91dcab 100644 --- a/chrome/browser/chromeos/policy/user_network_configuration_updater_factory.h +++ b/chrome/browser/chromeos/policy/user_network_configuration_updater_factory.h @@ -9,9 +9,10 @@ #include "base/compiler_specific.h" #include "components/keyed_service/content/browser_context_keyed_service_factory.h" +namespace base { template <typename T> struct DefaultSingletonTraits; - +} // namespace base class Profile; namespace policy { @@ -30,7 +31,8 @@ class UserNetworkConfigurationUpdaterFactory static UserNetworkConfigurationUpdaterFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<UserNetworkConfigurationUpdaterFactory>; + friend struct base::DefaultSingletonTraits< + UserNetworkConfigurationUpdaterFactory>; UserNetworkConfigurationUpdaterFactory(); ~UserNetworkConfigurationUpdaterFactory() override; diff --git a/chrome/browser/chromeos/ui/accessibility_focus_ring_controller.cc b/chrome/browser/chromeos/ui/accessibility_focus_ring_controller.cc index 02bd975..2163066 100644 --- a/chrome/browser/chromeos/ui/accessibility_focus_ring_controller.cc +++ b/chrome/browser/chromeos/ui/accessibility_focus_ring_controller.cc @@ -39,7 +39,7 @@ struct Region { // static AccessibilityFocusRingController* AccessibilityFocusRingController::GetInstance() { - return Singleton<AccessibilityFocusRingController>::get(); + return base::Singleton<AccessibilityFocusRingController>::get(); } AccessibilityFocusRingController::AccessibilityFocusRingController() diff --git a/chrome/browser/chromeos/ui/accessibility_focus_ring_controller.h b/chrome/browser/chromeos/ui/accessibility_focus_ring_controller.h index 5738e8d..22c9a0d 100644 --- a/chrome/browser/chromeos/ui/accessibility_focus_ring_controller.h +++ b/chrome/browser/chromeos/ui/accessibility_focus_ring_controller.h @@ -74,7 +74,7 @@ class AccessibilityFocusRingController base::TimeTicks focus_change_time_; ui::Compositor* compositor_; - friend struct DefaultSingletonTraits<AccessibilityFocusRingController>; + friend struct base::DefaultSingletonTraits<AccessibilityFocusRingController>; DISALLOW_COPY_AND_ASSIGN(AccessibilityFocusRingController); }; diff --git a/chrome/browser/chromeos/upgrade_detector_chromeos.cc b/chrome/browser/chromeos/upgrade_detector_chromeos.cc index 5465584..41c533b 100644 --- a/chrome/browser/chromeos/upgrade_detector_chromeos.cc +++ b/chrome/browser/chromeos/upgrade_detector_chromeos.cc @@ -150,7 +150,7 @@ void UpgradeDetectorChromeos::OnChannelsReceived( // static UpgradeDetectorChromeos* UpgradeDetectorChromeos::GetInstance() { - return Singleton<UpgradeDetectorChromeos>::get(); + return base::Singleton<UpgradeDetectorChromeos>::get(); } // static diff --git a/chrome/browser/chromeos/upgrade_detector_chromeos.h b/chrome/browser/chromeos/upgrade_detector_chromeos.h index 0bca5ea..467c15b 100644 --- a/chrome/browser/chromeos/upgrade_detector_chromeos.h +++ b/chrome/browser/chromeos/upgrade_detector_chromeos.h @@ -11,7 +11,10 @@ #include "chrome/browser/upgrade_detector.h" #include "chromeos/dbus/update_engine_client.h" -template <typename T> struct DefaultSingletonTraits; +namespace base { +template <typename T> +struct DefaultSingletonTraits; +} // namespace base class UpgradeDetectorChromeos : public UpgradeDetector, public chromeos::UpdateEngineClient::Observer { @@ -29,7 +32,7 @@ class UpgradeDetectorChromeos : public UpgradeDetector, void Shutdown(); private: - friend struct DefaultSingletonTraits<UpgradeDetectorChromeos>; + friend struct base::DefaultSingletonTraits<UpgradeDetectorChromeos>; class ChannelsRequester; UpgradeDetectorChromeos(); diff --git a/chrome/browser/content_settings/cookie_settings_factory.cc b/chrome/browser/content_settings/cookie_settings_factory.cc index b4b5d5ce..09c68c8 100644 --- a/chrome/browser/content_settings/cookie_settings_factory.cc +++ b/chrome/browser/content_settings/cookie_settings_factory.cc @@ -28,7 +28,7 @@ CookieSettingsFactory::GetForProfile(Profile* profile) { // static CookieSettingsFactory* CookieSettingsFactory::GetInstance() { - return Singleton<CookieSettingsFactory>::get(); + return base::Singleton<CookieSettingsFactory>::get(); } CookieSettingsFactory::CookieSettingsFactory() diff --git a/chrome/browser/content_settings/cookie_settings_factory.h b/chrome/browser/content_settings/cookie_settings_factory.h index c36469b..3a255ab 100644 --- a/chrome/browser/content_settings/cookie_settings_factory.h +++ b/chrome/browser/content_settings/cookie_settings_factory.h @@ -30,7 +30,7 @@ class CookieSettingsFactory static CookieSettingsFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<CookieSettingsFactory>; + friend struct base::DefaultSingletonTraits<CookieSettingsFactory>; CookieSettingsFactory(); ~CookieSettingsFactory() override; diff --git a/chrome/browser/content_settings/host_content_settings_map_factory.cc b/chrome/browser/content_settings/host_content_settings_map_factory.cc index 79d2395..9767b08 100644 --- a/chrome/browser/content_settings/host_content_settings_map_factory.cc +++ b/chrome/browser/content_settings/host_content_settings_map_factory.cc @@ -50,7 +50,7 @@ HostContentSettingsMap* HostContentSettingsMapFactory::GetForProfile( // static HostContentSettingsMapFactory* HostContentSettingsMapFactory::GetInstance() { - return Singleton<HostContentSettingsMapFactory>::get(); + return base::Singleton<HostContentSettingsMapFactory>::get(); } scoped_refptr<RefcountedKeyedService> diff --git a/chrome/browser/content_settings/host_content_settings_map_factory.h b/chrome/browser/content_settings/host_content_settings_map_factory.h index 26f6d89..5e942c9 100644 --- a/chrome/browser/content_settings/host_content_settings_map_factory.h +++ b/chrome/browser/content_settings/host_content_settings_map_factory.h @@ -19,7 +19,7 @@ class HostContentSettingsMapFactory static HostContentSettingsMapFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<HostContentSettingsMapFactory>; + friend struct base::DefaultSingletonTraits<HostContentSettingsMapFactory>; HostContentSettingsMapFactory(); ~HostContentSettingsMapFactory() override; diff --git a/chrome/browser/custom_handlers/protocol_handler_registry_factory.cc b/chrome/browser/custom_handlers/protocol_handler_registry_factory.cc index 9a975cd..20c7cc8 100644 --- a/chrome/browser/custom_handlers/protocol_handler_registry_factory.cc +++ b/chrome/browser/custom_handlers/protocol_handler_registry_factory.cc @@ -11,7 +11,7 @@ // static ProtocolHandlerRegistryFactory* ProtocolHandlerRegistryFactory::GetInstance() { - return Singleton<ProtocolHandlerRegistryFactory>::get(); + return base::Singleton<ProtocolHandlerRegistryFactory>::get(); } // static diff --git a/chrome/browser/custom_handlers/protocol_handler_registry_factory.h b/chrome/browser/custom_handlers/protocol_handler_registry_factory.h index 2002de3..fc38b59 100644 --- a/chrome/browser/custom_handlers/protocol_handler_registry_factory.h +++ b/chrome/browser/custom_handlers/protocol_handler_registry_factory.h @@ -11,7 +11,10 @@ class Profile; class ProtocolHandlerRegistry; + +namespace base { template <typename T> struct DefaultSingletonTraits; +} // Singleton that owns all ProtocolHandlerRegistrys and associates them with // Profiles. Listens for the Profile's destruction notification and cleans up @@ -35,7 +38,7 @@ class ProtocolHandlerRegistryFactory bool ServiceIsNULLWhileTesting() const override; private: - friend struct DefaultSingletonTraits<ProtocolHandlerRegistryFactory>; + friend struct base::DefaultSingletonTraits<ProtocolHandlerRegistryFactory>; ProtocolHandlerRegistryFactory(); ~ProtocolHandlerRegistryFactory() override; diff --git a/chrome/browser/devtools/device/devtools_android_bridge.cc b/chrome/browser/devtools/device/devtools_android_bridge.cc index 1536f24..ff1868a 100644 --- a/chrome/browser/devtools/device/devtools_android_bridge.cc +++ b/chrome/browser/devtools/device/devtools_android_bridge.cc @@ -257,7 +257,7 @@ ProtocolCommand::~ProtocolCommand() { // static DevToolsAndroidBridge::Factory* DevToolsAndroidBridge::Factory::GetInstance() { - return Singleton<DevToolsAndroidBridge::Factory>::get(); + return base::Singleton<DevToolsAndroidBridge::Factory>::get(); } // static diff --git a/chrome/browser/devtools/device/devtools_android_bridge.h b/chrome/browser/devtools/device/devtools_android_bridge.h index b112ff9..3b989a3 100644 --- a/chrome/browser/devtools/device/devtools_android_bridge.h +++ b/chrome/browser/devtools/device/devtools_android_bridge.h @@ -20,14 +20,14 @@ #include "content/public/browser/devtools_agent_host.h" #include "ui/gfx/geometry/size.h" +namespace base { template<typename T> struct DefaultSingletonTraits; -namespace base { class MessageLoop; class DictionaryValue; class ListValue; class Thread; -} +} // namespace base namespace content { class BrowserContext; @@ -51,7 +51,7 @@ class DevToolsAndroidBridge : public KeyedService { static DevToolsAndroidBridge* GetForProfile(Profile* profile); private: - friend struct DefaultSingletonTraits<Factory>; + friend struct base::DefaultSingletonTraits<Factory>; Factory(); ~Factory() override; diff --git a/chrome/browser/diagnostics/diagnostics_controller.cc b/chrome/browser/diagnostics/diagnostics_controller.cc index c4c8c0d..0deef5f 100644 --- a/chrome/browser/diagnostics/diagnostics_controller.cc +++ b/chrome/browser/diagnostics/diagnostics_controller.cc @@ -23,7 +23,7 @@ namespace diagnostics { DiagnosticsController* DiagnosticsController::GetInstance() { - return Singleton<DiagnosticsController>::get(); + return base::Singleton<DiagnosticsController>::get(); } DiagnosticsController::DiagnosticsController() : writer_(NULL) {} diff --git a/chrome/browser/diagnostics/diagnostics_controller.h b/chrome/browser/diagnostics/diagnostics_controller.h index 7e7ee17..af3b295 100644 --- a/chrome/browser/diagnostics/diagnostics_controller.h +++ b/chrome/browser/diagnostics/diagnostics_controller.h @@ -47,7 +47,7 @@ class DiagnosticsController { void RecordRegularStartup(); private: - friend struct DefaultSingletonTraits<DiagnosticsController>; + friend struct base::DefaultSingletonTraits<DiagnosticsController>; DiagnosticsController(); ~DiagnosticsController(); diff --git a/chrome/browser/dom_distiller/dom_distiller_service_factory.cc b/chrome/browser/dom_distiller/dom_distiller_service_factory.cc index a5a6d91..497d5a1 100644 --- a/chrome/browser/dom_distiller/dom_distiller_service_factory.cc +++ b/chrome/browser/dom_distiller/dom_distiller_service_factory.cc @@ -32,7 +32,7 @@ DomDistillerContextKeyedService::DomDistillerContextKeyedService( // static DomDistillerServiceFactory* DomDistillerServiceFactory::GetInstance() { - return Singleton<DomDistillerServiceFactory>::get(); + return base::Singleton<DomDistillerServiceFactory>::get(); } // static diff --git a/chrome/browser/dom_distiller/dom_distiller_service_factory.h b/chrome/browser/dom_distiller/dom_distiller_service_factory.h index f84beff..38e29b6 100644 --- a/chrome/browser/dom_distiller/dom_distiller_service_factory.h +++ b/chrome/browser/dom_distiller/dom_distiller_service_factory.h @@ -40,7 +40,7 @@ class DomDistillerServiceFactory : public BrowserContextKeyedServiceFactory { content::BrowserContext* context); private: - friend struct DefaultSingletonTraits<DomDistillerServiceFactory>; + friend struct base::DefaultSingletonTraits<DomDistillerServiceFactory>; DomDistillerServiceFactory(); ~DomDistillerServiceFactory() override; diff --git a/chrome/browser/domain_reliability/service_factory.cc b/chrome/browser/domain_reliability/service_factory.cc index cd1ee3b..a161be1 100644 --- a/chrome/browser/domain_reliability/service_factory.cc +++ b/chrome/browser/domain_reliability/service_factory.cc @@ -76,7 +76,7 @@ DomainReliabilityServiceFactory::GetForBrowserContext( // static DomainReliabilityServiceFactory* DomainReliabilityServiceFactory::GetInstance() { - return Singleton<DomainReliabilityServiceFactory>::get(); + return base::Singleton<DomainReliabilityServiceFactory>::get(); } DomainReliabilityServiceFactory::DomainReliabilityServiceFactory() diff --git a/chrome/browser/domain_reliability/service_factory.h b/chrome/browser/domain_reliability/service_factory.h index 9fae80a..2b43e1b 100644 --- a/chrome/browser/domain_reliability/service_factory.h +++ b/chrome/browser/domain_reliability/service_factory.h @@ -27,7 +27,7 @@ class DomainReliabilityServiceFactory static DomainReliabilityServiceFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<DomainReliabilityServiceFactory>; + friend struct base::DefaultSingletonTraits<DomainReliabilityServiceFactory>; DomainReliabilityServiceFactory(); ~DomainReliabilityServiceFactory() override; diff --git a/chrome/browser/download/download_service_factory.cc b/chrome/browser/download/download_service_factory.cc index fb0b919..bde97b8 100644 --- a/chrome/browser/download/download_service_factory.cc +++ b/chrome/browser/download/download_service_factory.cc @@ -19,7 +19,7 @@ DownloadService* DownloadServiceFactory::GetForBrowserContext( // static DownloadServiceFactory* DownloadServiceFactory::GetInstance() { - return Singleton<DownloadServiceFactory>::get(); + return base::Singleton<DownloadServiceFactory>::get(); } DownloadServiceFactory::DownloadServiceFactory() diff --git a/chrome/browser/download/download_service_factory.h b/chrome/browser/download/download_service_factory.h index 8958fe1..b07e107 100644 --- a/chrome/browser/download/download_service_factory.h +++ b/chrome/browser/download/download_service_factory.h @@ -30,7 +30,7 @@ class DownloadServiceFactory : public BrowserContextKeyedServiceFactory { content::BrowserContext* context) const override; private: - friend struct DefaultSingletonTraits<DownloadServiceFactory>; + friend struct base::DefaultSingletonTraits<DownloadServiceFactory>; DownloadServiceFactory(); ~DownloadServiceFactory() override; diff --git a/chrome/browser/drive/drive_notification_manager_factory.cc b/chrome/browser/drive/drive_notification_manager_factory.cc index 8575d9a..ed949b9 100644 --- a/chrome/browser/drive/drive_notification_manager_factory.cc +++ b/chrome/browser/drive/drive_notification_manager_factory.cc @@ -43,7 +43,7 @@ DriveNotificationManagerFactory::GetForBrowserContext( // static DriveNotificationManagerFactory* DriveNotificationManagerFactory::GetInstance() { - return Singleton<DriveNotificationManagerFactory>::get(); + return base::Singleton<DriveNotificationManagerFactory>::get(); } DriveNotificationManagerFactory::DriveNotificationManagerFactory() diff --git a/chrome/browser/drive/drive_notification_manager_factory.h b/chrome/browser/drive/drive_notification_manager_factory.h index 672cc2b..bd2ac55 100644 --- a/chrome/browser/drive/drive_notification_manager_factory.h +++ b/chrome/browser/drive/drive_notification_manager_factory.h @@ -34,7 +34,7 @@ class DriveNotificationManagerFactory static DriveNotificationManagerFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<DriveNotificationManagerFactory>; + friend struct base::DefaultSingletonTraits<DriveNotificationManagerFactory>; DriveNotificationManagerFactory(); ~DriveNotificationManagerFactory() override; diff --git a/chrome/browser/engagement/site_engagement_service_factory.cc b/chrome/browser/engagement/site_engagement_service_factory.cc index ce9070a..882e375 100644 --- a/chrome/browser/engagement/site_engagement_service_factory.cc +++ b/chrome/browser/engagement/site_engagement_service_factory.cc @@ -17,7 +17,7 @@ SiteEngagementService* SiteEngagementServiceFactory::GetForProfile( // static SiteEngagementServiceFactory* SiteEngagementServiceFactory::GetInstance() { - return Singleton<SiteEngagementServiceFactory>::get(); + return base::Singleton<SiteEngagementServiceFactory>::get(); } SiteEngagementServiceFactory::SiteEngagementServiceFactory() diff --git a/chrome/browser/engagement/site_engagement_service_factory.h b/chrome/browser/engagement/site_engagement_service_factory.h index ccec13a..40514ec 100644 --- a/chrome/browser/engagement/site_engagement_service_factory.h +++ b/chrome/browser/engagement/site_engagement_service_factory.h @@ -26,7 +26,7 @@ class SiteEngagementServiceFactory : public BrowserContextKeyedServiceFactory { static SiteEngagementServiceFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<SiteEngagementServiceFactory>; + friend struct base::DefaultSingletonTraits<SiteEngagementServiceFactory>; SiteEngagementServiceFactory(); ~SiteEngagementServiceFactory() override; diff --git a/chrome/browser/enhanced_bookmarks/bookmark_server_cluster_service_factory.cc b/chrome/browser/enhanced_bookmarks/bookmark_server_cluster_service_factory.cc index e6c5ff2..c8dab5d 100644 --- a/chrome/browser/enhanced_bookmarks/bookmark_server_cluster_service_factory.cc +++ b/chrome/browser/enhanced_bookmarks/bookmark_server_cluster_service_factory.cc @@ -36,7 +36,7 @@ BookmarkServerClusterServiceFactory::~BookmarkServerClusterServiceFactory() { // static BookmarkServerClusterServiceFactory* BookmarkServerClusterServiceFactory::GetInstance() { - return Singleton<BookmarkServerClusterServiceFactory>::get(); + return base::Singleton<BookmarkServerClusterServiceFactory>::get(); } // static diff --git a/chrome/browser/enhanced_bookmarks/bookmark_server_cluster_service_factory.h b/chrome/browser/enhanced_bookmarks/bookmark_server_cluster_service_factory.h index b0f85f0..e4abc4c 100644 --- a/chrome/browser/enhanced_bookmarks/bookmark_server_cluster_service_factory.h +++ b/chrome/browser/enhanced_bookmarks/bookmark_server_cluster_service_factory.h @@ -8,8 +8,10 @@ #include "base/macros.h" #include "components/keyed_service/content/browser_context_keyed_service_factory.h" +namespace base { template <typename T> struct DefaultSingletonTraits; +} // namespace base namespace enhanced_bookmarks { @@ -24,7 +26,8 @@ class BookmarkServerClusterServiceFactory content::BrowserContext* context); private: - friend struct DefaultSingletonTraits<BookmarkServerClusterServiceFactory>; + friend struct base::DefaultSingletonTraits< + BookmarkServerClusterServiceFactory>; BookmarkServerClusterServiceFactory(); ~BookmarkServerClusterServiceFactory() override; diff --git a/chrome/browser/enhanced_bookmarks/enhanced_bookmark_model_factory.cc b/chrome/browser/enhanced_bookmarks/enhanced_bookmark_model_factory.cc index df0814a..e546d82 100644 --- a/chrome/browser/enhanced_bookmarks/enhanced_bookmark_model_factory.cc +++ b/chrome/browser/enhanced_bookmarks/enhanced_bookmark_model_factory.cc @@ -27,7 +27,7 @@ EnhancedBookmarkModelFactory::EnhancedBookmarkModelFactory() // static EnhancedBookmarkModelFactory* EnhancedBookmarkModelFactory::GetInstance() { - return Singleton<EnhancedBookmarkModelFactory>::get(); + return base::Singleton<EnhancedBookmarkModelFactory>::get(); } // static diff --git a/chrome/browser/enhanced_bookmarks/enhanced_bookmark_model_factory.h b/chrome/browser/enhanced_bookmarks/enhanced_bookmark_model_factory.h index ed6f9dd..c128287 100644 --- a/chrome/browser/enhanced_bookmarks/enhanced_bookmark_model_factory.h +++ b/chrome/browser/enhanced_bookmarks/enhanced_bookmark_model_factory.h @@ -8,8 +8,10 @@ #include "base/macros.h" #include "components/keyed_service/content/browser_context_keyed_service_factory.h" +namespace base { template <typename T> struct DefaultSingletonTraits; +} // namespace base namespace enhanced_bookmarks { @@ -23,7 +25,7 @@ class EnhancedBookmarkModelFactory : public BrowserContextKeyedServiceFactory { content::BrowserContext* context); private: - friend struct DefaultSingletonTraits<EnhancedBookmarkModelFactory>; + friend struct base::DefaultSingletonTraits<EnhancedBookmarkModelFactory>; EnhancedBookmarkModelFactory(); ~EnhancedBookmarkModelFactory() override {} diff --git a/chrome/browser/enumerate_modules_model_win.cc b/chrome/browser/enumerate_modules_model_win.cc index 8eff4f3..1742f0f 100644 --- a/chrome/browser/enumerate_modules_model_win.cc +++ b/chrome/browser/enumerate_modules_model_win.cc @@ -838,7 +838,7 @@ base::string16 ModuleEnumerator::GetSubjectNameFromDigitalSignature( // static EnumerateModulesModel* EnumerateModulesModel::GetInstance() { - return Singleton<EnumerateModulesModel>::get(); + return base::Singleton<EnumerateModulesModel>::get(); } bool EnumerateModulesModel::ShouldShowConflictWarning() const { diff --git a/chrome/browser/enumerate_modules_model_win.h b/chrome/browser/enumerate_modules_model_win.h index ab2ae7d..b8920e6 100644 --- a/chrome/browser/enumerate_modules_model_win.h +++ b/chrome/browser/enumerate_modules_model_win.h @@ -310,7 +310,7 @@ class EnumerateModulesModel { GURL GetFirstNotableConflict(); private: - friend struct DefaultSingletonTraits<EnumerateModulesModel>; + friend struct base::DefaultSingletonTraits<EnumerateModulesModel>; friend class ModuleEnumerator; EnumerateModulesModel(); 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_; diff --git a/chrome/browser/favicon/chrome_fallback_icon_client_factory.cc b/chrome/browser/favicon/chrome_fallback_icon_client_factory.cc index f7e41cd..e2ace70 100644 --- a/chrome/browser/favicon/chrome_fallback_icon_client_factory.cc +++ b/chrome/browser/favicon/chrome_fallback_icon_client_factory.cc @@ -30,7 +30,7 @@ ChromeFallbackIconClientFactory::GetForBrowserContext( // static ChromeFallbackIconClientFactory* ChromeFallbackIconClientFactory::GetInstance() { - return Singleton<ChromeFallbackIconClientFactory>::get(); + return base::Singleton<ChromeFallbackIconClientFactory>::get(); } KeyedService* ChromeFallbackIconClientFactory::BuildServiceInstanceFor( diff --git a/chrome/browser/favicon/chrome_fallback_icon_client_factory.h b/chrome/browser/favicon/chrome_fallback_icon_client_factory.h index 84c0ebf..0f349a6 100644 --- a/chrome/browser/favicon/chrome_fallback_icon_client_factory.h +++ b/chrome/browser/favicon/chrome_fallback_icon_client_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 content { class BrowserContext; @@ -31,7 +33,7 @@ class ChromeFallbackIconClientFactory static ChromeFallbackIconClientFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<ChromeFallbackIconClientFactory>; + friend struct base::DefaultSingletonTraits<ChromeFallbackIconClientFactory>; ChromeFallbackIconClientFactory(); ~ChromeFallbackIconClientFactory() override; diff --git a/chrome/browser/favicon/fallback_icon_service_factory.cc b/chrome/browser/favicon/fallback_icon_service_factory.cc index e32f6a1..b868028 100644 --- a/chrome/browser/favicon/fallback_icon_service_factory.cc +++ b/chrome/browser/favicon/fallback_icon_service_factory.cc @@ -19,7 +19,7 @@ favicon::FallbackIconService* FallbackIconServiceFactory::GetForBrowserContext( // static FallbackIconServiceFactory* FallbackIconServiceFactory::GetInstance() { - return Singleton<FallbackIconServiceFactory>::get(); + return base::Singleton<FallbackIconServiceFactory>::get(); } FallbackIconServiceFactory::FallbackIconServiceFactory() diff --git a/chrome/browser/favicon/fallback_icon_service_factory.h b/chrome/browser/favicon/fallback_icon_service_factory.h index e5a2154..2a3fc3a 100644 --- a/chrome/browser/favicon/fallback_icon_service_factory.h +++ b/chrome/browser/favicon/fallback_icon_service_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 content { class BrowserContext; @@ -27,7 +29,7 @@ class FallbackIconServiceFactory : public BrowserContextKeyedServiceFactory { static FallbackIconServiceFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<FallbackIconServiceFactory>; + friend struct base::DefaultSingletonTraits<FallbackIconServiceFactory>; FallbackIconServiceFactory(); ~FallbackIconServiceFactory() override; diff --git a/chrome/browser/favicon/favicon_service_factory.cc b/chrome/browser/favicon/favicon_service_factory.cc index 35da589..726b562 100644 --- a/chrome/browser/favicon/favicon_service_factory.cc +++ b/chrome/browser/favicon/favicon_service_factory.cc @@ -46,7 +46,7 @@ favicon::FaviconService* FaviconServiceFactory::GetForProfile( // static FaviconServiceFactory* FaviconServiceFactory::GetInstance() { - return Singleton<FaviconServiceFactory>::get(); + return base::Singleton<FaviconServiceFactory>::get(); } // static diff --git a/chrome/browser/favicon/favicon_service_factory.h b/chrome/browser/favicon/favicon_service_factory.h index 6da30f4..ef629fe 100644 --- a/chrome/browser/favicon/favicon_service_factory.h +++ b/chrome/browser/favicon/favicon_service_factory.h @@ -8,7 +8,9 @@ #include "components/keyed_service/content/browser_context_keyed_service_factory.h" #include "components/keyed_service/core/service_access_type.h" +namespace base { template <typename T> struct DefaultSingletonTraits; +} class Profile; @@ -33,7 +35,7 @@ class FaviconServiceFactory : public BrowserContextKeyedServiceFactory { static TestingFactoryFunction GetDefaultFactory(); private: - friend struct DefaultSingletonTraits<FaviconServiceFactory>; + friend struct base::DefaultSingletonTraits<FaviconServiceFactory>; FaviconServiceFactory(); ~FaviconServiceFactory() override; diff --git a/chrome/browser/favicon/large_icon_service_factory.cc b/chrome/browser/favicon/large_icon_service_factory.cc index 0cb61d3..2562064 100644 --- a/chrome/browser/favicon/large_icon_service_factory.cc +++ b/chrome/browser/favicon/large_icon_service_factory.cc @@ -22,7 +22,7 @@ favicon::LargeIconService* LargeIconServiceFactory::GetForBrowserContext( // static LargeIconServiceFactory* LargeIconServiceFactory::GetInstance() { - return Singleton<LargeIconServiceFactory>::get(); + return base::Singleton<LargeIconServiceFactory>::get(); } LargeIconServiceFactory::LargeIconServiceFactory() diff --git a/chrome/browser/favicon/large_icon_service_factory.h b/chrome/browser/favicon/large_icon_service_factory.h index 46a9e5b..db5a167 100644 --- a/chrome/browser/favicon/large_icon_service_factory.h +++ b/chrome/browser/favicon/large_icon_service_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 content { class BrowserContext; @@ -27,7 +29,7 @@ class LargeIconServiceFactory : public BrowserContextKeyedServiceFactory { static LargeIconServiceFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<LargeIconServiceFactory>; + friend struct base::DefaultSingletonTraits<LargeIconServiceFactory>; LargeIconServiceFactory(); ~LargeIconServiceFactory() override; diff --git a/chrome/browser/geolocation/geolocation_permission_context_factory.cc b/chrome/browser/geolocation/geolocation_permission_context_factory.cc index 59168c5..2fff431 100644 --- a/chrome/browser/geolocation/geolocation_permission_context_factory.cc +++ b/chrome/browser/geolocation/geolocation_permission_context_factory.cc @@ -26,7 +26,7 @@ GeolocationPermissionContextFactory::GetForProfile(Profile* profile) { // static GeolocationPermissionContextFactory* GeolocationPermissionContextFactory::GetInstance() { - return Singleton<GeolocationPermissionContextFactory>::get(); + return base::Singleton<GeolocationPermissionContextFactory>::get(); } #if !defined(OS_ANDROID) diff --git a/chrome/browser/geolocation/geolocation_permission_context_factory.h b/chrome/browser/geolocation/geolocation_permission_context_factory.h index 3bb2efaa..4dd8171 100644 --- a/chrome/browser/geolocation/geolocation_permission_context_factory.h +++ b/chrome/browser/geolocation/geolocation_permission_context_factory.h @@ -22,8 +22,8 @@ class GeolocationPermissionContextFactory static GeolocationPermissionContextFactory* GetInstance(); private: - friend struct - DefaultSingletonTraits<GeolocationPermissionContextFactory>; + friend struct base::DefaultSingletonTraits< + GeolocationPermissionContextFactory>; GeolocationPermissionContextFactory(); ~GeolocationPermissionContextFactory() override; diff --git a/chrome/browser/google/google_search_counter.cc b/chrome/browser/google/google_search_counter.cc index 9f4cced..46392fd 100644 --- a/chrome/browser/google/google_search_counter.cc +++ b/chrome/browser/google/google_search_counter.cc @@ -19,7 +19,7 @@ void GoogleSearchCounter::RegisterForNotifications() { // static GoogleSearchCounter* GoogleSearchCounter::GetInstance() { - return Singleton<GoogleSearchCounter>::get(); + return base::Singleton<GoogleSearchCounter>::get(); } GoogleSearchMetrics::AccessPoint diff --git a/chrome/browser/google/google_search_counter.h b/chrome/browser/google/google_search_counter.h index e1f558d..ed6f244 100644 --- a/chrome/browser/google/google_search_counter.h +++ b/chrome/browser/google/google_search_counter.h @@ -41,7 +41,7 @@ class GoogleSearchCounter : content::NotificationObserver { } private: - friend struct DefaultSingletonTraits<GoogleSearchCounter>; + friend struct base::DefaultSingletonTraits<GoogleSearchCounter>; friend class GoogleSearchCounterTest; friend class GoogleSearchCounterAndroidTest; diff --git a/chrome/browser/google/google_url_tracker_factory.cc b/chrome/browser/google/google_url_tracker_factory.cc index 7830d54..ba05633 100644 --- a/chrome/browser/google/google_url_tracker_factory.cc +++ b/chrome/browser/google/google_url_tracker_factory.cc @@ -20,7 +20,7 @@ GoogleURLTracker* GoogleURLTrackerFactory::GetForProfile(Profile* profile) { // static GoogleURLTrackerFactory* GoogleURLTrackerFactory::GetInstance() { - return Singleton<GoogleURLTrackerFactory>::get(); + return base::Singleton<GoogleURLTrackerFactory>::get(); } GoogleURLTrackerFactory::GoogleURLTrackerFactory() diff --git a/chrome/browser/google/google_url_tracker_factory.h b/chrome/browser/google/google_url_tracker_factory.h index cf0036f..9d999c6 100644 --- a/chrome/browser/google/google_url_tracker_factory.h +++ b/chrome/browser/google/google_url_tracker_factory.h @@ -22,7 +22,7 @@ class GoogleURLTrackerFactory : public BrowserContextKeyedServiceFactory { static GoogleURLTrackerFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<GoogleURLTrackerFactory>; + friend struct base::DefaultSingletonTraits<GoogleURLTrackerFactory>; GoogleURLTrackerFactory(); ~GoogleURLTrackerFactory() override; diff --git a/chrome/browser/history/history_service_factory.cc b/chrome/browser/history/history_service_factory.cc index b9847c1..68f4c13 100644 --- a/chrome/browser/history/history_service_factory.cc +++ b/chrome/browser/history/history_service_factory.cc @@ -55,7 +55,7 @@ history::HistoryService* HistoryServiceFactory::GetForProfileWithoutCreating( // static HistoryServiceFactory* HistoryServiceFactory::GetInstance() { - return Singleton<HistoryServiceFactory>::get(); + return base::Singleton<HistoryServiceFactory>::get(); } // static diff --git a/chrome/browser/history/history_service_factory.h b/chrome/browser/history/history_service_factory.h index 0c673aaf..e11fb29 100644 --- a/chrome/browser/history/history_service_factory.h +++ b/chrome/browser/history/history_service_factory.h @@ -37,7 +37,7 @@ class HistoryServiceFactory : public BrowserContextKeyedServiceFactory { static void ShutdownForProfile(Profile* profile); private: - friend struct DefaultSingletonTraits<HistoryServiceFactory>; + friend struct base::DefaultSingletonTraits<HistoryServiceFactory>; HistoryServiceFactory(); ~HistoryServiceFactory() override; diff --git a/chrome/browser/history/top_sites_factory.cc b/chrome/browser/history/top_sites_factory.cc index 697cc90..6214d40 100644 --- a/chrome/browser/history/top_sites_factory.cc +++ b/chrome/browser/history/top_sites_factory.cc @@ -79,7 +79,7 @@ scoped_refptr<history::TopSites> TopSitesFactory::GetForProfile( // static TopSitesFactory* TopSitesFactory::GetInstance() { - return Singleton<TopSitesFactory>::get(); + return base::Singleton<TopSitesFactory>::get(); } // static diff --git a/chrome/browser/history/top_sites_factory.h b/chrome/browser/history/top_sites_factory.h index 8794a11..e561834 100644 --- a/chrome/browser/history/top_sites_factory.h +++ b/chrome/browser/history/top_sites_factory.h @@ -12,8 +12,10 @@ class Profile; +namespace base { template <typename T> struct DefaultSingletonTraits; +} namespace history { struct PrepopulatedPage; @@ -39,7 +41,7 @@ class TopSitesFactory : public RefcountedBrowserContextKeyedServiceFactory { const std::vector<history::PrepopulatedPage>& prepopulated_page_list); private: - friend struct DefaultSingletonTraits<TopSitesFactory>; + friend struct base::DefaultSingletonTraits<TopSitesFactory>; TopSitesFactory(); ~TopSitesFactory() override; diff --git a/chrome/browser/history/web_history_service_factory.cc b/chrome/browser/history/web_history_service_factory.cc index 1e3c3fc..00d908d 100644 --- a/chrome/browser/history/web_history_service_factory.cc +++ b/chrome/browser/history/web_history_service_factory.cc @@ -29,7 +29,7 @@ bool IsHistorySyncEnabled(Profile* profile) { // static WebHistoryServiceFactory* WebHistoryServiceFactory::GetInstance() { - return Singleton<WebHistoryServiceFactory>::get(); + return base::Singleton<WebHistoryServiceFactory>::get(); } // static diff --git a/chrome/browser/history/web_history_service_factory.h b/chrome/browser/history/web_history_service_factory.h index d7819fd..3b6515f 100644 --- a/chrome/browser/history/web_history_service_factory.h +++ b/chrome/browser/history/web_history_service_factory.h @@ -29,7 +29,7 @@ class WebHistoryServiceFactory : public BrowserContextKeyedServiceFactory { content::BrowserContext* context) const override; private: - friend struct DefaultSingletonTraits<WebHistoryServiceFactory>; + friend struct base::DefaultSingletonTraits<WebHistoryServiceFactory>; WebHistoryServiceFactory(); ~WebHistoryServiceFactory() override; diff --git a/chrome/browser/invalidation/profile_invalidation_provider_factory.cc b/chrome/browser/invalidation/profile_invalidation_provider_factory.cc index bef76d9..4cf515c 100644 --- a/chrome/browser/invalidation/profile_invalidation_provider_factory.cc +++ b/chrome/browser/invalidation/profile_invalidation_provider_factory.cc @@ -68,7 +68,7 @@ ProfileInvalidationProvider* ProfileInvalidationProviderFactory::GetForProfile( // static ProfileInvalidationProviderFactory* ProfileInvalidationProviderFactory::GetInstance() { - return Singleton<ProfileInvalidationProviderFactory>::get(); + return base::Singleton<ProfileInvalidationProviderFactory>::get(); } ProfileInvalidationProviderFactory::ProfileInvalidationProviderFactory() diff --git a/chrome/browser/invalidation/profile_invalidation_provider_factory.h b/chrome/browser/invalidation/profile_invalidation_provider_factory.h index 5d475cd..f40532d 100644 --- a/chrome/browser/invalidation/profile_invalidation_provider_factory.h +++ b/chrome/browser/invalidation/profile_invalidation_provider_factory.h @@ -49,7 +49,8 @@ class ProfileInvalidationProviderFactory private: friend class ProfileInvalidationProviderFactoryTestBase; friend class policy::AffiliatedInvalidationServiceProviderImplTest; - friend struct DefaultSingletonTraits<ProfileInvalidationProviderFactory>; + friend struct base::DefaultSingletonTraits< + ProfileInvalidationProviderFactory>; ProfileInvalidationProviderFactory(); ~ProfileInvalidationProviderFactory() override; diff --git a/chrome/browser/local_discovery/privet_notifications_factory.cc b/chrome/browser/local_discovery/privet_notifications_factory.cc index e782e54..cb8432e 100644 --- a/chrome/browser/local_discovery/privet_notifications_factory.cc +++ b/chrome/browser/local_discovery/privet_notifications_factory.cc @@ -12,7 +12,7 @@ namespace local_discovery { PrivetNotificationServiceFactory* PrivetNotificationServiceFactory::GetInstance() { - return Singleton<PrivetNotificationServiceFactory>::get(); + return base::Singleton<PrivetNotificationServiceFactory>::get(); } PrivetNotificationServiceFactory::PrivetNotificationServiceFactory() diff --git a/chrome/browser/local_discovery/privet_notifications_factory.h b/chrome/browser/local_discovery/privet_notifications_factory.h index 5946a37..3248db9 100644 --- a/chrome/browser/local_discovery/privet_notifications_factory.h +++ b/chrome/browser/local_discovery/privet_notifications_factory.h @@ -17,7 +17,7 @@ class PrivetNotificationServiceFactory static PrivetNotificationServiceFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<PrivetNotificationServiceFactory>; + friend struct base::DefaultSingletonTraits<PrivetNotificationServiceFactory>; PrivetNotificationServiceFactory(); ~PrivetNotificationServiceFactory() override; diff --git a/chrome/browser/local_discovery/privet_url_fetcher.cc b/chrome/browser/local_discovery/privet_url_fetcher.cc index 390fb83..55e9506 100644 --- a/chrome/browser/local_discovery/privet_url_fetcher.cc +++ b/chrome/browser/local_discovery/privet_url_fetcher.cc @@ -30,7 +30,7 @@ typedef std::map<std::string, std::string> TokenMap; struct TokenMapHolder { public: static TokenMapHolder* GetInstance() { - return Singleton<TokenMapHolder>::get(); + return base::Singleton<TokenMapHolder>::get(); } TokenMap map; diff --git a/chrome/browser/mac/mac_startup_profiler.cc b/chrome/browser/mac/mac_startup_profiler.cc index 15580fb..37d247b 100644 --- a/chrome/browser/mac/mac_startup_profiler.cc +++ b/chrome/browser/mac/mac_startup_profiler.cc @@ -10,7 +10,7 @@ // static MacStartupProfiler* MacStartupProfiler::GetInstance() { - return Singleton<MacStartupProfiler>::get(); + return base::Singleton<MacStartupProfiler>::get(); } MacStartupProfiler::MacStartupProfiler() : recorded_metrics_(false) { diff --git a/chrome/browser/mac/mac_startup_profiler.h b/chrome/browser/mac/mac_startup_profiler.h index f4e560c..05dcf6c 100644 --- a/chrome/browser/mac/mac_startup_profiler.h +++ b/chrome/browser/mac/mac_startup_profiler.h @@ -42,7 +42,7 @@ class MacStartupProfiler { void RecordMetrics(); private: - friend struct DefaultSingletonTraits<MacStartupProfiler>; + friend struct base::DefaultSingletonTraits<MacStartupProfiler>; // Returns the name of the histogram for the given location. const std::string HistogramName(Location location); diff --git a/chrome/browser/media/media_capture_devices_dispatcher.cc b/chrome/browser/media/media_capture_devices_dispatcher.cc index f4e6c0f..0d876f3 100644 --- a/chrome/browser/media/media_capture_devices_dispatcher.cc +++ b/chrome/browser/media/media_capture_devices_dispatcher.cc @@ -74,7 +74,7 @@ inline DesktopCaptureAccessHandler* ToDesktopCaptureAccessHandler( } // namespace MediaCaptureDevicesDispatcher* MediaCaptureDevicesDispatcher::GetInstance() { - return Singleton<MediaCaptureDevicesDispatcher>::get(); + return base::Singleton<MediaCaptureDevicesDispatcher>::get(); } MediaCaptureDevicesDispatcher::MediaCaptureDevicesDispatcher() diff --git a/chrome/browser/media/media_capture_devices_dispatcher.h b/chrome/browser/media/media_capture_devices_dispatcher.h index e036f60..184510c7 100644 --- a/chrome/browser/media/media_capture_devices_dispatcher.h +++ b/chrome/browser/media/media_capture_devices_dispatcher.h @@ -148,7 +148,7 @@ class MediaCaptureDevicesDispatcher : public content::MediaObserver { void SetTestVideoCaptureDevices(const content::MediaStreamDevices& devices); private: - friend struct DefaultSingletonTraits<MediaCaptureDevicesDispatcher>; + friend struct base::DefaultSingletonTraits<MediaCaptureDevicesDispatcher>; MediaCaptureDevicesDispatcher(); ~MediaCaptureDevicesDispatcher() override; diff --git a/chrome/browser/media/media_stream_camera_permission_context_factory.cc b/chrome/browser/media/media_stream_camera_permission_context_factory.cc index af93919..a5afebe 100644 --- a/chrome/browser/media/media_stream_camera_permission_context_factory.cc +++ b/chrome/browser/media/media_stream_camera_permission_context_factory.cc @@ -34,7 +34,7 @@ MediaStreamCameraPermissionContextFactory::GetBrowserContextToUse( // static MediaStreamCameraPermissionContextFactory* MediaStreamCameraPermissionContextFactory::GetInstance() { - return Singleton<MediaStreamCameraPermissionContextFactory>::get(); + return base::Singleton<MediaStreamCameraPermissionContextFactory>::get(); } // static diff --git a/chrome/browser/media/media_stream_camera_permission_context_factory.h b/chrome/browser/media/media_stream_camera_permission_context_factory.h index d881ec4..1c3a1d1 100644 --- a/chrome/browser/media/media_stream_camera_permission_context_factory.h +++ b/chrome/browser/media/media_stream_camera_permission_context_factory.h @@ -19,7 +19,7 @@ class MediaStreamCameraPermissionContextFactory static MediaStreamCameraPermissionContextFactory* GetInstance(); private: - friend struct DefaultSingletonTraits< + friend struct base::DefaultSingletonTraits< MediaStreamCameraPermissionContextFactory>; MediaStreamCameraPermissionContextFactory(); diff --git a/chrome/browser/media/media_stream_mic_permission_context_factory.cc b/chrome/browser/media/media_stream_mic_permission_context_factory.cc index c59d6f0..c078e92 100644 --- a/chrome/browser/media/media_stream_mic_permission_context_factory.cc +++ b/chrome/browser/media/media_stream_mic_permission_context_factory.cc @@ -32,7 +32,7 @@ MediaStreamMicPermissionContextFactory::GetBrowserContextToUse( // static MediaStreamMicPermissionContextFactory* MediaStreamMicPermissionContextFactory::GetInstance() { - return Singleton<MediaStreamMicPermissionContextFactory>::get(); + return base::Singleton<MediaStreamMicPermissionContextFactory>::get(); } // static diff --git a/chrome/browser/media/media_stream_mic_permission_context_factory.h b/chrome/browser/media/media_stream_mic_permission_context_factory.h index a524b30..d00b58e 100644 --- a/chrome/browser/media/media_stream_mic_permission_context_factory.h +++ b/chrome/browser/media/media_stream_mic_permission_context_factory.h @@ -19,7 +19,8 @@ class MediaStreamMicPermissionContextFactory static MediaStreamMicPermissionContextFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<MediaStreamMicPermissionContextFactory>; + friend struct base::DefaultSingletonTraits< + MediaStreamMicPermissionContextFactory>; MediaStreamMicPermissionContextFactory(); ~MediaStreamMicPermissionContextFactory() override; diff --git a/chrome/browser/media/midi_permission_context_factory.cc b/chrome/browser/media/midi_permission_context_factory.cc index 5a3b617..a7bf35c 100644 --- a/chrome/browser/media/midi_permission_context_factory.cc +++ b/chrome/browser/media/midi_permission_context_factory.cc @@ -19,7 +19,7 @@ MidiPermissionContextFactory::GetForProfile(Profile* profile) { // static MidiPermissionContextFactory* MidiPermissionContextFactory::GetInstance() { - return Singleton<MidiPermissionContextFactory>::get(); + return base::Singleton<MidiPermissionContextFactory>::get(); } MidiPermissionContextFactory::MidiPermissionContextFactory() diff --git a/chrome/browser/media/midi_permission_context_factory.h b/chrome/browser/media/midi_permission_context_factory.h index 53edae6..ac5c792 100644 --- a/chrome/browser/media/midi_permission_context_factory.h +++ b/chrome/browser/media/midi_permission_context_factory.h @@ -18,7 +18,7 @@ class MidiPermissionContextFactory static MidiPermissionContextFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<MidiPermissionContextFactory>; + friend struct base::DefaultSingletonTraits<MidiPermissionContextFactory>; MidiPermissionContextFactory(); ~MidiPermissionContextFactory() override; diff --git a/chrome/browser/media/protected_media_identifier_permission_context_factory.cc b/chrome/browser/media/protected_media_identifier_permission_context_factory.cc index e6ace58..3e0ceff 100644 --- a/chrome/browser/media/protected_media_identifier_permission_context_factory.cc +++ b/chrome/browser/media/protected_media_identifier_permission_context_factory.cc @@ -22,7 +22,7 @@ ProtectedMediaIdentifierPermissionContextFactory::GetForProfile( // static ProtectedMediaIdentifierPermissionContextFactory* ProtectedMediaIdentifierPermissionContextFactory::GetInstance() { - return Singleton< + return base::Singleton< ProtectedMediaIdentifierPermissionContextFactory>::get(); } diff --git a/chrome/browser/media/protected_media_identifier_permission_context_factory.h b/chrome/browser/media/protected_media_identifier_permission_context_factory.h index 3a6a48c..5648187 100644 --- a/chrome/browser/media/protected_media_identifier_permission_context_factory.h +++ b/chrome/browser/media/protected_media_identifier_permission_context_factory.h @@ -20,7 +20,7 @@ class ProtectedMediaIdentifierPermissionContextFactory static ProtectedMediaIdentifierPermissionContextFactory* GetInstance(); private: - friend struct DefaultSingletonTraits< + friend struct base::DefaultSingletonTraits< ProtectedMediaIdentifierPermissionContextFactory>; ProtectedMediaIdentifierPermissionContextFactory(); diff --git a/chrome/browser/media_galleries/gallery_watch_manager.cc b/chrome/browser/media_galleries/gallery_watch_manager.cc index 8ca263f..0034024 100644 --- a/chrome/browser/media_galleries/gallery_watch_manager.cc +++ b/chrome/browser/media_galleries/gallery_watch_manager.cc @@ -30,11 +30,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/media_galleries/media_file_system_registry.cc b/chrome/browser/media_galleries/media_file_system_registry.cc index dbec912..7b2ac40 100644 --- a/chrome/browser/media_galleries/media_file_system_registry.cc +++ b/chrome/browser/media_galleries/media_file_system_registry.cc @@ -56,11 +56,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/media_galleries/media_galleries_preferences_factory.cc b/chrome/browser/media_galleries/media_galleries_preferences_factory.cc index 78bf5bf..a368dd4 100644 --- a/chrome/browser/media_galleries/media_galleries_preferences_factory.cc +++ b/chrome/browser/media_galleries/media_galleries_preferences_factory.cc @@ -20,7 +20,7 @@ MediaGalleriesPreferencesFactory::GetForProfile(Profile* profile) { // static MediaGalleriesPreferencesFactory* MediaGalleriesPreferencesFactory::GetInstance() { - return Singleton<MediaGalleriesPreferencesFactory>::get(); + return base::Singleton<MediaGalleriesPreferencesFactory>::get(); } MediaGalleriesPreferencesFactory::MediaGalleriesPreferencesFactory() diff --git a/chrome/browser/media_galleries/media_galleries_preferences_factory.h b/chrome/browser/media_galleries/media_galleries_preferences_factory.h index 6abf1fa..bd94e8a 100644 --- a/chrome/browser/media_galleries/media_galleries_preferences_factory.h +++ b/chrome/browser/media_galleries/media_galleries_preferences_factory.h @@ -24,7 +24,7 @@ class MediaGalleriesPreferencesFactory static MediaGalleriesPreferencesFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<MediaGalleriesPreferencesFactory>; + friend struct base::DefaultSingletonTraits<MediaGalleriesPreferencesFactory>; MediaGalleriesPreferencesFactory(); ~MediaGalleriesPreferencesFactory() override; diff --git a/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_factory.cc b/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_factory.cc index 33fcb42..bffcfb1 100644 --- a/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_factory.cc +++ b/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_factory.cc @@ -28,7 +28,7 @@ DataReductionProxyChromeSettingsFactory::HasDataReductionProxyChromeSettings( // static DataReductionProxyChromeSettingsFactory* DataReductionProxyChromeSettingsFactory::GetInstance() { - return Singleton<DataReductionProxyChromeSettingsFactory>::get(); + return base::Singleton<DataReductionProxyChromeSettingsFactory>::get(); } diff --git a/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_factory.h b/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_factory.h index a4a22bf..ba8afb4 100644 --- a/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_factory.h +++ b/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_factory.h @@ -29,7 +29,8 @@ class DataReductionProxyChromeSettingsFactory static DataReductionProxyChromeSettingsFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<DataReductionProxyChromeSettingsFactory>; + friend struct base::DefaultSingletonTraits< + DataReductionProxyChromeSettingsFactory>; DataReductionProxyChromeSettingsFactory(); diff --git a/chrome/browser/net/utility_process_mojo_proxy_resolver_factory.cc b/chrome/browser/net/utility_process_mojo_proxy_resolver_factory.cc index 4c4e888..fda8201 100644 --- a/chrome/browser/net/utility_process_mojo_proxy_resolver_factory.cc +++ b/chrome/browser/net/utility_process_mojo_proxy_resolver_factory.cc @@ -23,9 +23,9 @@ const int kUtilityProcessIdleTimeoutSeconds = 5; UtilityProcessMojoProxyResolverFactory* UtilityProcessMojoProxyResolverFactory::GetInstance() { DCHECK_CURRENTLY_ON(content::BrowserThread::IO); - return Singleton< - UtilityProcessMojoProxyResolverFactory, - LeakySingletonTraits<UtilityProcessMojoProxyResolverFactory>>::get(); + return base::Singleton<UtilityProcessMojoProxyResolverFactory, + base::LeakySingletonTraits< + UtilityProcessMojoProxyResolverFactory>>::get(); } UtilityProcessMojoProxyResolverFactory:: diff --git a/chrome/browser/net/utility_process_mojo_proxy_resolver_factory.h b/chrome/browser/net/utility_process_mojo_proxy_resolver_factory.h index d4223aa..6bbc1ca 100644 --- a/chrome/browser/net/utility_process_mojo_proxy_resolver_factory.h +++ b/chrome/browser/net/utility_process_mojo_proxy_resolver_factory.h @@ -14,9 +14,10 @@ namespace content { class UtilityProcessHost; } - +namespace base { template <typename Type> struct DefaultSingletonTraits; +} // namespace base // A factory used to create connections to Mojo proxy resolver services run in a // utility process. All Mojo proxy resolver services will be run in the same @@ -34,7 +35,8 @@ class UtilityProcessMojoProxyResolverFactory net::interfaces::ProxyResolverFactoryRequestClientPtr client) override; private: - friend struct DefaultSingletonTraits<UtilityProcessMojoProxyResolverFactory>; + friend struct base::DefaultSingletonTraits< + UtilityProcessMojoProxyResolverFactory>; UtilityProcessMojoProxyResolverFactory(); ~UtilityProcessMojoProxyResolverFactory() override; 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; diff --git a/chrome/browser/password_manager/password_store_factory.cc b/chrome/browser/password_manager/password_store_factory.cc index 81f2a0f..1879e41 100644 --- a/chrome/browser/password_manager/password_store_factory.cc +++ b/chrome/browser/password_manager/password_store_factory.cc @@ -155,7 +155,7 @@ scoped_refptr<PasswordStore> PasswordStoreFactory::GetForProfile( // static PasswordStoreFactory* PasswordStoreFactory::GetInstance() { - return Singleton<PasswordStoreFactory>::get(); + return base::Singleton<PasswordStoreFactory>::get(); } // static diff --git a/chrome/browser/password_manager/password_store_factory.h b/chrome/browser/password_manager/password_store_factory.h index 5fab46e..db1bb3d 100644 --- a/chrome/browser/password_manager/password_store_factory.h +++ b/chrome/browser/password_manager/password_store_factory.h @@ -67,7 +67,7 @@ class PasswordStoreFactory : public BrowserContextKeyedServiceFactory { static void TrimOrDeleteAffiliationCache(Profile* profile); private: - friend struct DefaultSingletonTraits<PasswordStoreFactory>; + friend struct base::DefaultSingletonTraits<PasswordStoreFactory>; PasswordStoreFactory(); ~PasswordStoreFactory() override; diff --git a/chrome/browser/performance_monitor/performance_monitor.cc b/chrome/browser/performance_monitor/performance_monitor.cc index b386ea6..dda007d 100644 --- a/chrome/browser/performance_monitor/performance_monitor.cc +++ b/chrome/browser/performance_monitor/performance_monitor.cc @@ -41,7 +41,7 @@ PerformanceMonitor::~PerformanceMonitor() { // static PerformanceMonitor* PerformanceMonitor::GetInstance() { - return Singleton<PerformanceMonitor>::get(); + return base::Singleton<PerformanceMonitor>::get(); } void PerformanceMonitor::StartGatherCycle() { diff --git a/chrome/browser/performance_monitor/performance_monitor.h b/chrome/browser/performance_monitor/performance_monitor.h index 22bdb58..7e1b20f 100644 --- a/chrome/browser/performance_monitor/performance_monitor.h +++ b/chrome/browser/performance_monitor/performance_monitor.h @@ -12,8 +12,10 @@ #include "base/timer/timer.h" #include "chrome/browser/performance_monitor/process_metrics_history.h" +namespace base { template <typename Type> struct DefaultSingletonTraits; +} // namespace base namespace content { struct ChildProcessData; @@ -36,7 +38,7 @@ class PerformanceMonitor { private: typedef std::map<base::ProcessHandle, ProcessMetricsHistory> MetricsMap; - friend struct DefaultSingletonTraits<PerformanceMonitor>; + friend struct base::DefaultSingletonTraits<PerformanceMonitor>; PerformanceMonitor(); virtual ~PerformanceMonitor(); diff --git a/chrome/browser/permissions/permission_manager_factory.cc b/chrome/browser/permissions/permission_manager_factory.cc index 19dda4e..66a87e3 100644 --- a/chrome/browser/permissions/permission_manager_factory.cc +++ b/chrome/browser/permissions/permission_manager_factory.cc @@ -19,7 +19,7 @@ PermissionManagerFactory::GetForProfile(Profile* profile) { // static PermissionManagerFactory* PermissionManagerFactory::GetInstance() { - return Singleton<PermissionManagerFactory>::get(); + return base::Singleton<PermissionManagerFactory>::get(); } PermissionManagerFactory::PermissionManagerFactory() diff --git a/chrome/browser/permissions/permission_manager_factory.h b/chrome/browser/permissions/permission_manager_factory.h index 2774a9a..a6d2c28 100644 --- a/chrome/browser/permissions/permission_manager_factory.h +++ b/chrome/browser/permissions/permission_manager_factory.h @@ -21,7 +21,7 @@ class PermissionManagerFactory : public BrowserContextKeyedServiceFactory { static PermissionManagerFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<PermissionManagerFactory>; + friend struct base::DefaultSingletonTraits<PermissionManagerFactory>; PermissionManagerFactory(); ~PermissionManagerFactory() override; 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( diff --git a/chrome/browser/policy/cloud/policy_header_service_factory.cc b/chrome/browser/policy/cloud/policy_header_service_factory.cc index c2164a7..86cbb37 100644 --- a/chrome/browser/policy/cloud/policy_header_service_factory.cc +++ b/chrome/browser/policy/cloud/policy_header_service_factory.cc @@ -113,7 +113,7 @@ KeyedService* PolicyHeaderServiceFactory::BuildServiceInstanceFor( // static PolicyHeaderServiceFactory* PolicyHeaderServiceFactory::GetInstance() { - return Singleton<PolicyHeaderServiceFactory>::get(); + return base::Singleton<PolicyHeaderServiceFactory>::get(); } } // namespace policy diff --git a/chrome/browser/policy/cloud/policy_header_service_factory.h b/chrome/browser/policy/cloud/policy_header_service_factory.h index 6fe95ef..f81ec93 100644 --- a/chrome/browser/policy/cloud/policy_header_service_factory.h +++ b/chrome/browser/policy/cloud/policy_header_service_factory.h @@ -31,7 +31,7 @@ class PolicyHeaderServiceFactory : public BrowserContextKeyedServiceFactory { content::BrowserContext* profile) const override; private: - friend struct DefaultSingletonTraits<PolicyHeaderServiceFactory>; + friend struct base::DefaultSingletonTraits<PolicyHeaderServiceFactory>; PolicyHeaderServiceFactory(); ~PolicyHeaderServiceFactory() override; diff --git a/chrome/browser/policy/cloud/user_cloud_policy_invalidator_factory.cc b/chrome/browser/policy/cloud/user_cloud_policy_invalidator_factory.cc index e4c7fef..9ef12e4 100644 --- a/chrome/browser/policy/cloud/user_cloud_policy_invalidator_factory.cc +++ b/chrome/browser/policy/cloud/user_cloud_policy_invalidator_factory.cc @@ -21,7 +21,7 @@ namespace policy { // static UserCloudPolicyInvalidatorFactory* UserCloudPolicyInvalidatorFactory::GetInstance() { - return Singleton<UserCloudPolicyInvalidatorFactory>::get(); + return base::Singleton<UserCloudPolicyInvalidatorFactory>::get(); } UserCloudPolicyInvalidatorFactory::UserCloudPolicyInvalidatorFactory() diff --git a/chrome/browser/policy/cloud/user_cloud_policy_invalidator_factory.h b/chrome/browser/policy/cloud/user_cloud_policy_invalidator_factory.h index 8ae5671..bbb9004 100644 --- a/chrome/browser/policy/cloud/user_cloud_policy_invalidator_factory.h +++ b/chrome/browser/policy/cloud/user_cloud_policy_invalidator_factory.h @@ -17,7 +17,7 @@ class UserCloudPolicyInvalidatorFactory static UserCloudPolicyInvalidatorFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<UserCloudPolicyInvalidatorFactory>; + friend struct base::DefaultSingletonTraits<UserCloudPolicyInvalidatorFactory>; UserCloudPolicyInvalidatorFactory(); ~UserCloudPolicyInvalidatorFactory() override; diff --git a/chrome/browser/policy/cloud/user_cloud_policy_manager_factory.cc b/chrome/browser/policy/cloud/user_cloud_policy_manager_factory.cc index 52fd37c..e2bec6f 100644 --- a/chrome/browser/policy/cloud/user_cloud_policy_manager_factory.cc +++ b/chrome/browser/policy/cloud/user_cloud_policy_manager_factory.cc @@ -54,7 +54,7 @@ class UserCloudPolicyManagerFactory::ManagerWrapper : public KeyedService { // static UserCloudPolicyManagerFactory* UserCloudPolicyManagerFactory::GetInstance() { - return Singleton<UserCloudPolicyManagerFactory>::get(); + return base::Singleton<UserCloudPolicyManagerFactory>::get(); } // static diff --git a/chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h b/chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h index d44034b..3ae0414 100644 --- a/chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h +++ b/chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h @@ -85,7 +85,7 @@ class UserCloudPolicyManagerFactory : public BrowserContextKeyedBaseFactory { private: class ManagerWrapper; - friend struct DefaultSingletonTraits<UserCloudPolicyManagerFactory>; + friend struct base::DefaultSingletonTraits<UserCloudPolicyManagerFactory>; UserCloudPolicyManagerFactory(); ~UserCloudPolicyManagerFactory() override; diff --git a/chrome/browser/policy/cloud/user_policy_signin_service_factory.cc b/chrome/browser/policy/cloud/user_policy_signin_service_factory.cc index 60c2b5c..40e831e 100644 --- a/chrome/browser/policy/cloud/user_policy_signin_service_factory.cc +++ b/chrome/browser/policy/cloud/user_policy_signin_service_factory.cc @@ -52,7 +52,7 @@ UserPolicySigninService* UserPolicySigninServiceFactory::GetForProfile( // static UserPolicySigninServiceFactory* UserPolicySigninServiceFactory::GetInstance() { - return Singleton<UserPolicySigninServiceFactory>::get(); + return base::Singleton<UserPolicySigninServiceFactory>::get(); } // static diff --git a/chrome/browser/policy/cloud/user_policy_signin_service_factory.h b/chrome/browser/policy/cloud/user_policy_signin_service_factory.h index 12ecd39..4801b49 100644 --- a/chrome/browser/policy/cloud/user_policy_signin_service_factory.h +++ b/chrome/browser/policy/cloud/user_policy_signin_service_factory.h @@ -50,7 +50,7 @@ class UserPolicySigninServiceFactory user_prefs::PrefRegistrySyncable* registry) override; private: - friend struct DefaultSingletonTraits<UserPolicySigninServiceFactory>; + friend struct base::DefaultSingletonTraits<UserPolicySigninServiceFactory>; UserPolicySigninServiceFactory(); ~UserPolicySigninServiceFactory() override; diff --git a/chrome/browser/policy/profile_policy_connector_factory.cc b/chrome/browser/policy/profile_policy_connector_factory.cc index b3c23e6..cbb9865 100644 --- a/chrome/browser/policy/profile_policy_connector_factory.cc +++ b/chrome/browser/policy/profile_policy_connector_factory.cc @@ -31,7 +31,7 @@ namespace policy { // static ProfilePolicyConnectorFactory* ProfilePolicyConnectorFactory::GetInstance() { - return Singleton<ProfilePolicyConnectorFactory>::get(); + return base::Singleton<ProfilePolicyConnectorFactory>::get(); } // static diff --git a/chrome/browser/policy/profile_policy_connector_factory.h b/chrome/browser/policy/profile_policy_connector_factory.h index 1080a4c..42ad65a 100644 --- a/chrome/browser/policy/profile_policy_connector_factory.h +++ b/chrome/browser/policy/profile_policy_connector_factory.h @@ -12,12 +12,12 @@ #include "base/memory/scoped_ptr.h" #include "components/keyed_service/content/browser_context_keyed_base_factory.h" +namespace base { template <typename T> struct DefaultSingletonTraits; -namespace base { class SequencedTaskRunner; -} +} // namespace base namespace content { class BrowserContext; @@ -63,7 +63,7 @@ class ProfilePolicyConnectorFactory : public BrowserContextKeyedBaseFactory { void PushProviderForTesting(ConfigurationPolicyProvider* provider); private: - friend struct DefaultSingletonTraits<ProfilePolicyConnectorFactory>; + friend struct base::DefaultSingletonTraits<ProfilePolicyConnectorFactory>; ProfilePolicyConnectorFactory(); ~ProfilePolicyConnectorFactory() override; diff --git a/chrome/browser/policy/schema_registry_service_factory.cc b/chrome/browser/policy/schema_registry_service_factory.cc index 5893022..01b3b4a 100644 --- a/chrome/browser/policy/schema_registry_service_factory.cc +++ b/chrome/browser/policy/schema_registry_service_factory.cc @@ -58,7 +58,7 @@ DeviceLocalAccountPolicyBroker* GetBroker(content::BrowserContext* context) { // static SchemaRegistryServiceFactory* SchemaRegistryServiceFactory::GetInstance() { - return Singleton<SchemaRegistryServiceFactory>::get(); + return base::Singleton<SchemaRegistryServiceFactory>::get(); } // static diff --git a/chrome/browser/policy/schema_registry_service_factory.h b/chrome/browser/policy/schema_registry_service_factory.h index 4b33df9..5602c7d 100644 --- a/chrome/browser/policy/schema_registry_service_factory.h +++ b/chrome/browser/policy/schema_registry_service_factory.h @@ -45,7 +45,7 @@ class SchemaRegistryServiceFactory : public BrowserContextKeyedBaseFactory { CombinedSchemaRegistry* global_registry); private: - friend struct DefaultSingletonTraits<SchemaRegistryServiceFactory>; + friend struct base::DefaultSingletonTraits<SchemaRegistryServiceFactory>; SchemaRegistryServiceFactory(); ~SchemaRegistryServiceFactory() override; diff --git a/chrome/browser/precache/precache_manager_factory.cc b/chrome/browser/precache/precache_manager_factory.cc index 392d0ad..a5f2b8c 100644 --- a/chrome/browser/precache/precache_manager_factory.cc +++ b/chrome/browser/precache/precache_manager_factory.cc @@ -23,7 +23,7 @@ PrecacheManager* PrecacheManagerFactory::GetForBrowserContext( // static PrecacheManagerFactory* PrecacheManagerFactory::GetInstance() { - return Singleton<PrecacheManagerFactory>::get(); + return base::Singleton<PrecacheManagerFactory>::get(); } PrecacheManagerFactory::PrecacheManagerFactory() diff --git a/chrome/browser/precache/precache_manager_factory.h b/chrome/browser/precache/precache_manager_factory.h index a154888..c9388d0 100644 --- a/chrome/browser/precache/precache_manager_factory.h +++ b/chrome/browser/precache/precache_manager_factory.h @@ -24,7 +24,7 @@ class PrecacheManagerFactory : public BrowserContextKeyedServiceFactory { static PrecacheManagerFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<PrecacheManagerFactory>; + friend struct base::DefaultSingletonTraits<PrecacheManagerFactory>; PrecacheManagerFactory(); ~PrecacheManagerFactory() override; diff --git a/chrome/browser/predictors/autocomplete_action_predictor_factory.cc b/chrome/browser/predictors/autocomplete_action_predictor_factory.cc index ad3abdc..eb3f494 100644 --- a/chrome/browser/predictors/autocomplete_action_predictor_factory.cc +++ b/chrome/browser/predictors/autocomplete_action_predictor_factory.cc @@ -23,7 +23,7 @@ AutocompleteActionPredictor* AutocompleteActionPredictorFactory::GetForProfile( // static AutocompleteActionPredictorFactory* AutocompleteActionPredictorFactory::GetInstance() { - return Singleton<AutocompleteActionPredictorFactory>::get(); + return base::Singleton<AutocompleteActionPredictorFactory>::get(); } AutocompleteActionPredictorFactory::AutocompleteActionPredictorFactory() diff --git a/chrome/browser/predictors/autocomplete_action_predictor_factory.h b/chrome/browser/predictors/autocomplete_action_predictor_factory.h index 69597ab..d2b7f11 100644 --- a/chrome/browser/predictors/autocomplete_action_predictor_factory.h +++ b/chrome/browser/predictors/autocomplete_action_predictor_factory.h @@ -26,7 +26,8 @@ class AutocompleteActionPredictorFactory static AutocompleteActionPredictorFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<AutocompleteActionPredictorFactory>; + friend struct base::DefaultSingletonTraits< + AutocompleteActionPredictorFactory>; AutocompleteActionPredictorFactory(); ~AutocompleteActionPredictorFactory() override; diff --git a/chrome/browser/predictors/predictor_database_factory.cc b/chrome/browser/predictors/predictor_database_factory.cc index 9b69f26..588847f 100644 --- a/chrome/browser/predictors/predictor_database_factory.cc +++ b/chrome/browser/predictors/predictor_database_factory.cc @@ -19,7 +19,7 @@ PredictorDatabase* PredictorDatabaseFactory::GetForProfile(Profile* profile) { // static PredictorDatabaseFactory* PredictorDatabaseFactory::GetInstance() { - return Singleton<PredictorDatabaseFactory>::get(); + return base::Singleton<PredictorDatabaseFactory>::get(); } PredictorDatabaseFactory::PredictorDatabaseFactory() diff --git a/chrome/browser/predictors/predictor_database_factory.h b/chrome/browser/predictors/predictor_database_factory.h index f03dba0..ead04ec 100644 --- a/chrome/browser/predictors/predictor_database_factory.h +++ b/chrome/browser/predictors/predictor_database_factory.h @@ -24,7 +24,7 @@ class PredictorDatabaseFactory : public BrowserContextKeyedServiceFactory { static PredictorDatabaseFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<PredictorDatabaseFactory>; + friend struct base::DefaultSingletonTraits<PredictorDatabaseFactory>; PredictorDatabaseFactory(); ~PredictorDatabaseFactory() override; diff --git a/chrome/browser/predictors/resource_prefetch_predictor_factory.cc b/chrome/browser/predictors/resource_prefetch_predictor_factory.cc index 6bb4287..47186bc 100644 --- a/chrome/browser/predictors/resource_prefetch_predictor_factory.cc +++ b/chrome/browser/predictors/resource_prefetch_predictor_factory.cc @@ -24,7 +24,7 @@ ResourcePrefetchPredictor* ResourcePrefetchPredictorFactory::GetForProfile( // static ResourcePrefetchPredictorFactory* ResourcePrefetchPredictorFactory::GetInstance() { - return Singleton<ResourcePrefetchPredictorFactory>::get(); + return base::Singleton<ResourcePrefetchPredictorFactory>::get(); } ResourcePrefetchPredictorFactory::ResourcePrefetchPredictorFactory() diff --git a/chrome/browser/predictors/resource_prefetch_predictor_factory.h b/chrome/browser/predictors/resource_prefetch_predictor_factory.h index 6624fca..bb275c3 100644 --- a/chrome/browser/predictors/resource_prefetch_predictor_factory.h +++ b/chrome/browser/predictors/resource_prefetch_predictor_factory.h @@ -21,7 +21,7 @@ class ResourcePrefetchPredictorFactory static ResourcePrefetchPredictorFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<ResourcePrefetchPredictorFactory>; + friend struct base::DefaultSingletonTraits<ResourcePrefetchPredictorFactory>; ResourcePrefetchPredictorFactory(); ~ResourcePrefetchPredictorFactory() override; diff --git a/chrome/browser/prefs/incognito_mode_prefs.cc b/chrome/browser/prefs/incognito_mode_prefs.cc index f9d0fcd..e3d7499 100644 --- a/chrome/browser/prefs/incognito_mode_prefs.cc +++ b/chrome/browser/prefs/incognito_mode_prefs.cc @@ -42,7 +42,7 @@ namespace { class PlatformParentalControlsValue { public: static PlatformParentalControlsValue* GetInstance() { - return Singleton<PlatformParentalControlsValue>::get(); + return base::Singleton<PlatformParentalControlsValue>::get(); } bool is_enabled() const { @@ -50,7 +50,7 @@ class PlatformParentalControlsValue { } private: - friend struct DefaultSingletonTraits<PlatformParentalControlsValue>; + friend struct base::DefaultSingletonTraits<PlatformParentalControlsValue>; // Histogram enum for tracking the thread that checked parental controls. enum class ThreadType { diff --git a/chrome/browser/prefs/pref_metrics_service.cc b/chrome/browser/prefs/pref_metrics_service.cc index 8f312ff..a3d2117 100644 --- a/chrome/browser/prefs/pref_metrics_service.cc +++ b/chrome/browser/prefs/pref_metrics_service.cc @@ -212,7 +212,7 @@ void PrefMetricsService::LogIntegerPrefChange(int boundary_value, // static PrefMetricsService::Factory* PrefMetricsService::Factory::GetInstance() { - return Singleton<PrefMetricsService::Factory>::get(); + return base::Singleton<PrefMetricsService::Factory>::get(); } // static diff --git a/chrome/browser/prefs/pref_metrics_service.h b/chrome/browser/prefs/pref_metrics_service.h index f7f7ff4..cab53e1 100644 --- a/chrome/browser/prefs/pref_metrics_service.h +++ b/chrome/browser/prefs/pref_metrics_service.h @@ -29,7 +29,7 @@ class PrefMetricsService : public KeyedService { static Factory* GetInstance(); static PrefMetricsService* GetForProfile(Profile* profile); private: - friend struct DefaultSingletonTraits<Factory>; + friend struct base::DefaultSingletonTraits<Factory>; Factory(); ~Factory() override; diff --git a/chrome/browser/prerender/prerender_link_manager_factory.cc b/chrome/browser/prerender/prerender_link_manager_factory.cc index 599c103..694987b 100644 --- a/chrome/browser/prerender/prerender_link_manager_factory.cc +++ b/chrome/browser/prerender/prerender_link_manager_factory.cc @@ -22,7 +22,7 @@ PrerenderLinkManager* PrerenderLinkManagerFactory::GetForProfile( // static PrerenderLinkManagerFactory* PrerenderLinkManagerFactory::GetInstance() { - return Singleton<PrerenderLinkManagerFactory>::get(); + return base::Singleton<PrerenderLinkManagerFactory>::get(); } PrerenderLinkManagerFactory::PrerenderLinkManagerFactory() diff --git a/chrome/browser/prerender/prerender_link_manager_factory.h b/chrome/browser/prerender/prerender_link_manager_factory.h index ba4949a..875facd 100644 --- a/chrome/browser/prerender/prerender_link_manager_factory.h +++ b/chrome/browser/prerender/prerender_link_manager_factory.h @@ -21,7 +21,7 @@ class PrerenderLinkManagerFactory : public BrowserContextKeyedServiceFactory { static PrerenderLinkManagerFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<PrerenderLinkManagerFactory>; + friend struct base::DefaultSingletonTraits<PrerenderLinkManagerFactory>; PrerenderLinkManagerFactory(); ~PrerenderLinkManagerFactory() override {} diff --git a/chrome/browser/prerender/prerender_manager_factory.cc b/chrome/browser/prerender/prerender_manager_factory.cc index 38ff250..31052cf 100644 --- a/chrome/browser/prerender/prerender_manager_factory.cc +++ b/chrome/browser/prerender/prerender_manager_factory.cc @@ -34,7 +34,7 @@ PrerenderManager* PrerenderManagerFactory::GetForProfile( // static PrerenderManagerFactory* PrerenderManagerFactory::GetInstance() { - return Singleton<PrerenderManagerFactory>::get(); + return base::Singleton<PrerenderManagerFactory>::get(); } PrerenderManagerFactory::PrerenderManagerFactory() diff --git a/chrome/browser/prerender/prerender_manager_factory.h b/chrome/browser/prerender/prerender_manager_factory.h index f3e9433..dbc5fb3 100644 --- a/chrome/browser/prerender/prerender_manager_factory.h +++ b/chrome/browser/prerender/prerender_manager_factory.h @@ -26,7 +26,7 @@ class PrerenderManagerFactory : public BrowserContextKeyedServiceFactory { static PrerenderManagerFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<PrerenderManagerFactory>; + friend struct base::DefaultSingletonTraits<PrerenderManagerFactory>; PrerenderManagerFactory(); ~PrerenderManagerFactory() override; diff --git a/chrome/browser/prerender/prerender_message_filter.cc b/chrome/browser/prerender/prerender_message_filter.cc index 11aeffd..351332c 100644 --- a/chrome/browser/prerender/prerender_message_filter.cc +++ b/chrome/browser/prerender/prerender_message_filter.cc @@ -23,11 +23,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/printing/cloud_print/cloud_print_proxy_service_factory.cc b/chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.cc index cd85a4e..dd97c59 100644 --- a/chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.cc +++ b/chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.cc @@ -16,7 +16,7 @@ CloudPrintProxyService* CloudPrintProxyServiceFactory::GetForProfile( } CloudPrintProxyServiceFactory* CloudPrintProxyServiceFactory::GetInstance() { - return Singleton<CloudPrintProxyServiceFactory>::get(); + return base::Singleton<CloudPrintProxyServiceFactory>::get(); } CloudPrintProxyServiceFactory::CloudPrintProxyServiceFactory() diff --git a/chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.h b/chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.h index c14e04d..57400d6 100644 --- a/chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.h +++ b/chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.h @@ -24,7 +24,7 @@ class CloudPrintProxyServiceFactory : public BrowserContextKeyedServiceFactory { static CloudPrintProxyServiceFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<CloudPrintProxyServiceFactory>; + friend struct base::DefaultSingletonTraits<CloudPrintProxyServiceFactory>; CloudPrintProxyServiceFactory(); ~CloudPrintProxyServiceFactory() override; diff --git a/chrome/browser/printing/print_preview_data_service.cc b/chrome/browser/printing/print_preview_data_service.cc index 600b08b..ecf9191 100644 --- a/chrome/browser/printing/print_preview_data_service.cc +++ b/chrome/browser/printing/print_preview_data_service.cc @@ -80,7 +80,7 @@ class PrintPreviewDataStore : public base::RefCounted<PrintPreviewDataStore> { // static PrintPreviewDataService* PrintPreviewDataService::GetInstance() { - return Singleton<PrintPreviewDataService>::get(); + return base::Singleton<PrintPreviewDataService>::get(); } PrintPreviewDataService::PrintPreviewDataService() { diff --git a/chrome/browser/printing/print_preview_data_service.h b/chrome/browser/printing/print_preview_data_service.h index 9ed94fd..af7aa84 100644 --- a/chrome/browser/printing/print_preview_data_service.h +++ b/chrome/browser/printing/print_preview_data_service.h @@ -10,11 +10,11 @@ #include "base/memory/ref_counted.h" -template<typename T> struct DefaultSingletonTraits; - class PrintPreviewDataStore; namespace base { +template <typename T> +struct DefaultSingletonTraits; class RefCountedBytes; } @@ -46,7 +46,7 @@ class PrintPreviewDataService { int GetAvailableDraftPageCount(int32_t preview_ui_id); private: - friend struct DefaultSingletonTraits<PrintPreviewDataService>; + friend struct base::DefaultSingletonTraits<PrintPreviewDataService>; // 1:1 relationship between PrintPreviewUI and data store object. // Key: PrintPreviewUI ID. diff --git a/chrome/browser/profile_resetter/automatic_profile_resetter_factory.cc b/chrome/browser/profile_resetter/automatic_profile_resetter_factory.cc index 9c53bd2..f025ce4 100644 --- a/chrome/browser/profile_resetter/automatic_profile_resetter_factory.cc +++ b/chrome/browser/profile_resetter/automatic_profile_resetter_factory.cc @@ -25,7 +25,7 @@ AutomaticProfileResetter* AutomaticProfileResetterFactory::GetForBrowserContext( // static AutomaticProfileResetterFactory* AutomaticProfileResetterFactory::GetInstance() { - return Singleton<AutomaticProfileResetterFactory>::get(); + return base::Singleton<AutomaticProfileResetterFactory>::get(); } // static diff --git a/chrome/browser/profile_resetter/automatic_profile_resetter_factory.h b/chrome/browser/profile_resetter/automatic_profile_resetter_factory.h index fbbb03f..bbf8012 100644 --- a/chrome/browser/profile_resetter/automatic_profile_resetter_factory.h +++ b/chrome/browser/profile_resetter/automatic_profile_resetter_factory.h @@ -8,8 +8,10 @@ #include "base/basictypes.h" #include "components/keyed_service/content/browser_context_keyed_service_factory.h" +namespace base { template <typename T> struct DefaultSingletonTraits; +} // namespace base class PrefRegistrySimple; @@ -34,7 +36,7 @@ class AutomaticProfileResetterFactory static void RegisterPrefs(PrefRegistrySimple* registry); private: - friend struct DefaultSingletonTraits<AutomaticProfileResetterFactory>; + friend struct base::DefaultSingletonTraits<AutomaticProfileResetterFactory>; AutomaticProfileResetterFactory(); ~AutomaticProfileResetterFactory() override; diff --git a/chrome/browser/profiles/gaia_info_update_service_factory.cc b/chrome/browser/profiles/gaia_info_update_service_factory.cc index 8c8978c..9edd14c 100644 --- a/chrome/browser/profiles/gaia_info_update_service_factory.cc +++ b/chrome/browser/profiles/gaia_info_update_service_factory.cc @@ -29,7 +29,7 @@ GAIAInfoUpdateService* GAIAInfoUpdateServiceFactory::GetForProfile( // static GAIAInfoUpdateServiceFactory* GAIAInfoUpdateServiceFactory::GetInstance() { - return Singleton<GAIAInfoUpdateServiceFactory>::get(); + return base::Singleton<GAIAInfoUpdateServiceFactory>::get(); } KeyedService* GAIAInfoUpdateServiceFactory::BuildServiceInstanceFor( diff --git a/chrome/browser/profiles/gaia_info_update_service_factory.h b/chrome/browser/profiles/gaia_info_update_service_factory.h index 9bd9c89..01dcadb 100644 --- a/chrome/browser/profiles/gaia_info_update_service_factory.h +++ b/chrome/browser/profiles/gaia_info_update_service_factory.h @@ -29,7 +29,7 @@ class GAIAInfoUpdateServiceFactory : public BrowserContextKeyedServiceFactory { static GAIAInfoUpdateServiceFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<GAIAInfoUpdateServiceFactory>; + friend struct base::DefaultSingletonTraits<GAIAInfoUpdateServiceFactory>; GAIAInfoUpdateServiceFactory(); ~GAIAInfoUpdateServiceFactory() override; diff --git a/chrome/browser/push_messaging/push_messaging_permission_context_factory.cc b/chrome/browser/push_messaging/push_messaging_permission_context_factory.cc index ad2855a..3bb8ad9 100644 --- a/chrome/browser/push_messaging/push_messaging_permission_context_factory.cc +++ b/chrome/browser/push_messaging/push_messaging_permission_context_factory.cc @@ -20,7 +20,7 @@ PushMessagingPermissionContextFactory::GetForProfile( // static PushMessagingPermissionContextFactory* PushMessagingPermissionContextFactory::GetInstance() { - return Singleton<PushMessagingPermissionContextFactory>::get(); + return base::Singleton<PushMessagingPermissionContextFactory>::get(); } PushMessagingPermissionContextFactory::PushMessagingPermissionContextFactory() diff --git a/chrome/browser/push_messaging/push_messaging_permission_context_factory.h b/chrome/browser/push_messaging/push_messaging_permission_context_factory.h index 84e4bc1..966b981 100644 --- a/chrome/browser/push_messaging/push_messaging_permission_context_factory.h +++ b/chrome/browser/push_messaging/push_messaging_permission_context_factory.h @@ -19,7 +19,8 @@ class PushMessagingPermissionContextFactory static PushMessagingPermissionContextFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<PushMessagingPermissionContextFactory>; + friend struct base::DefaultSingletonTraits< + PushMessagingPermissionContextFactory>; PushMessagingPermissionContextFactory(); ~PushMessagingPermissionContextFactory() override; diff --git a/chrome/browser/push_messaging/push_messaging_service_factory.cc b/chrome/browser/push_messaging/push_messaging_service_factory.cc index d8b36caa..2287fb0 100644 --- a/chrome/browser/push_messaging/push_messaging_service_factory.cc +++ b/chrome/browser/push_messaging/push_messaging_service_factory.cc @@ -26,7 +26,7 @@ PushMessagingServiceImpl* PushMessagingServiceFactory::GetForProfile( // static PushMessagingServiceFactory* PushMessagingServiceFactory::GetInstance() { - return Singleton<PushMessagingServiceFactory>::get(); + return base::Singleton<PushMessagingServiceFactory>::get(); } PushMessagingServiceFactory::PushMessagingServiceFactory() diff --git a/chrome/browser/push_messaging/push_messaging_service_factory.h b/chrome/browser/push_messaging/push_messaging_service_factory.h index b15b11d..e5c8622 100644 --- a/chrome/browser/push_messaging/push_messaging_service_factory.h +++ b/chrome/browser/push_messaging/push_messaging_service_factory.h @@ -18,7 +18,7 @@ class PushMessagingServiceFactory : public BrowserContextKeyedServiceFactory { static PushMessagingServiceFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<PushMessagingServiceFactory>; + friend struct base::DefaultSingletonTraits<PushMessagingServiceFactory>; PushMessagingServiceFactory(); ~PushMessagingServiceFactory() override; diff --git a/chrome/browser/recovery/recovery_install_global_error_factory.cc b/chrome/browser/recovery/recovery_install_global_error_factory.cc index a44477c..659e0c9 100644 --- a/chrome/browser/recovery/recovery_install_global_error_factory.cc +++ b/chrome/browser/recovery/recovery_install_global_error_factory.cc @@ -29,7 +29,7 @@ RecoveryInstallGlobalErrorFactory::GetForProfile(Profile* profile) { // static RecoveryInstallGlobalErrorFactory* RecoveryInstallGlobalErrorFactory::GetInstance() { - return Singleton<RecoveryInstallGlobalErrorFactory>::get(); + return base::Singleton<RecoveryInstallGlobalErrorFactory>::get(); } KeyedService* RecoveryInstallGlobalErrorFactory::BuildServiceInstanceFor( diff --git a/chrome/browser/recovery/recovery_install_global_error_factory.h b/chrome/browser/recovery/recovery_install_global_error_factory.h index 2eb4126..a4b7102 100644 --- a/chrome/browser/recovery/recovery_install_global_error_factory.h +++ b/chrome/browser/recovery/recovery_install_global_error_factory.h @@ -25,7 +25,7 @@ class RecoveryInstallGlobalErrorFactory static RecoveryInstallGlobalErrorFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<RecoveryInstallGlobalErrorFactory>; + friend struct base::DefaultSingletonTraits<RecoveryInstallGlobalErrorFactory>; RecoveryInstallGlobalErrorFactory(); ~RecoveryInstallGlobalErrorFactory() override; diff --git a/chrome/browser/search/hotword_service_factory.cc b/chrome/browser/search/hotword_service_factory.cc index 7324dcc..ddd91b1 100644 --- a/chrome/browser/search/hotword_service_factory.cc +++ b/chrome/browser/search/hotword_service_factory.cc @@ -26,7 +26,7 @@ HotwordService* HotwordServiceFactory::GetForProfile(BrowserContext* context) { // static HotwordServiceFactory* HotwordServiceFactory::GetInstance() { - return Singleton<HotwordServiceFactory>::get(); + return base::Singleton<HotwordServiceFactory>::get(); } // static diff --git a/chrome/browser/search/hotword_service_factory.h b/chrome/browser/search/hotword_service_factory.h index 3489296..31139bd 100644 --- a/chrome/browser/search/hotword_service_factory.h +++ b/chrome/browser/search/hotword_service_factory.h @@ -41,7 +41,7 @@ class HotwordServiceFactory : public BrowserContextKeyedServiceFactory { void UpdateMicrophoneState(); private: - friend struct DefaultSingletonTraits<HotwordServiceFactory>; + friend struct base::DefaultSingletonTraits<HotwordServiceFactory>; HotwordServiceFactory(); ~HotwordServiceFactory() override; diff --git a/chrome/browser/search/instant_service_factory.cc b/chrome/browser/search/instant_service_factory.cc index fc2160b..efd98a9 100644 --- a/chrome/browser/search/instant_service_factory.cc +++ b/chrome/browser/search/instant_service_factory.cc @@ -24,7 +24,7 @@ InstantService* InstantServiceFactory::GetForProfile(Profile* profile) { // static InstantServiceFactory* InstantServiceFactory::GetInstance() { - return Singleton<InstantServiceFactory>::get(); + return base::Singleton<InstantServiceFactory>::get(); } InstantServiceFactory::InstantServiceFactory() diff --git a/chrome/browser/search/instant_service_factory.h b/chrome/browser/search/instant_service_factory.h index 223515f..747b879 100644 --- a/chrome/browser/search/instant_service_factory.h +++ b/chrome/browser/search/instant_service_factory.h @@ -22,7 +22,7 @@ class InstantServiceFactory : public BrowserContextKeyedServiceFactory { static InstantServiceFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<InstantServiceFactory>; + friend struct base::DefaultSingletonTraits<InstantServiceFactory>; InstantServiceFactory(); ~InstantServiceFactory() override; diff --git a/chrome/browser/search/suggestions/suggestions_service_factory.cc b/chrome/browser/search/suggestions/suggestions_service_factory.cc index 77002ad..cabf342 100644 --- a/chrome/browser/search/suggestions/suggestions_service_factory.cc +++ b/chrome/browser/search/suggestions/suggestions_service_factory.cc @@ -34,7 +34,7 @@ SuggestionsService* SuggestionsServiceFactory::GetForProfile(Profile* profile) { // static SuggestionsServiceFactory* SuggestionsServiceFactory::GetInstance() { - return Singleton<SuggestionsServiceFactory>::get(); + return base::Singleton<SuggestionsServiceFactory>::get(); } SuggestionsServiceFactory::SuggestionsServiceFactory() diff --git a/chrome/browser/search/suggestions/suggestions_service_factory.h b/chrome/browser/search/suggestions/suggestions_service_factory.h index 63a6dc3..7066d5f 100644 --- a/chrome/browser/search/suggestions/suggestions_service_factory.h +++ b/chrome/browser/search/suggestions/suggestions_service_factory.h @@ -24,7 +24,7 @@ class SuggestionsServiceFactory : public BrowserContextKeyedServiceFactory { static SuggestionsServiceFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<SuggestionsServiceFactory>; + friend struct base::DefaultSingletonTraits<SuggestionsServiceFactory>; SuggestionsServiceFactory(); ~SuggestionsServiceFactory() override; diff --git a/chrome/browser/search_engines/template_url_fetcher_factory.cc b/chrome/browser/search_engines/template_url_fetcher_factory.cc index 71d0fb5..0d93385 100644 --- a/chrome/browser/search_engines/template_url_fetcher_factory.cc +++ b/chrome/browser/search_engines/template_url_fetcher_factory.cc @@ -19,7 +19,7 @@ TemplateURLFetcher* TemplateURLFetcherFactory::GetForProfile( // static TemplateURLFetcherFactory* TemplateURLFetcherFactory::GetInstance() { - return Singleton<TemplateURLFetcherFactory>::get(); + return base::Singleton<TemplateURLFetcherFactory>::get(); } // static diff --git a/chrome/browser/search_engines/template_url_fetcher_factory.h b/chrome/browser/search_engines/template_url_fetcher_factory.h index 65f82c0..7bf7209 100644 --- a/chrome/browser/search_engines/template_url_fetcher_factory.h +++ b/chrome/browser/search_engines/template_url_fetcher_factory.h @@ -25,7 +25,7 @@ class TemplateURLFetcherFactory : public BrowserContextKeyedServiceFactory { static void ShutdownForProfile(Profile* profile); private: - friend struct DefaultSingletonTraits<TemplateURLFetcherFactory>; + friend struct base::DefaultSingletonTraits<TemplateURLFetcherFactory>; TemplateURLFetcherFactory(); ~TemplateURLFetcherFactory() override; diff --git a/chrome/browser/search_engines/template_url_service_factory.cc b/chrome/browser/search_engines/template_url_service_factory.cc index 6d52447..f67a212 100644 --- a/chrome/browser/search_engines/template_url_service_factory.cc +++ b/chrome/browser/search_engines/template_url_service_factory.cc @@ -34,7 +34,7 @@ TemplateURLService* TemplateURLServiceFactory::GetForProfile(Profile* profile) { // static TemplateURLServiceFactory* TemplateURLServiceFactory::GetInstance() { - return Singleton<TemplateURLServiceFactory>::get(); + return base::Singleton<TemplateURLServiceFactory>::get(); } // static diff --git a/chrome/browser/search_engines/template_url_service_factory.h b/chrome/browser/search_engines/template_url_service_factory.h index db900b0..5b2c55a 100644 --- a/chrome/browser/search_engines/template_url_service_factory.h +++ b/chrome/browser/search_engines/template_url_service_factory.h @@ -24,7 +24,7 @@ class TemplateURLServiceFactory : public BrowserContextKeyedServiceFactory { content::BrowserContext* profile); private: - friend struct DefaultSingletonTraits<TemplateURLServiceFactory>; + friend struct base::DefaultSingletonTraits<TemplateURLServiceFactory>; TemplateURLServiceFactory(); ~TemplateURLServiceFactory() override; diff --git a/chrome/browser/service_process/service_process_control.cc b/chrome/browser/service_process/service_process_control.cc index be0455e..5181ed6 100644 --- a/chrome/browser/service_process/service_process_control.cc +++ b/chrome/browser/service_process/service_process_control.cc @@ -317,7 +317,7 @@ bool ServiceProcessControl::Shutdown() { // static ServiceProcessControl* ServiceProcessControl::GetInstance() { - return Singleton<ServiceProcessControl>::get(); + return base::Singleton<ServiceProcessControl>::get(); } ServiceProcessControl::Launcher::Launcher( diff --git a/chrome/browser/service_process/service_process_control.h b/chrome/browser/service_process/service_process_control.h index 2bc6d69..d2935c4 100644 --- a/chrome/browser/service_process/service_process_control.h +++ b/chrome/browser/service_process/service_process_control.h @@ -176,7 +176,7 @@ class ServiceProcessControl : public IPC::Sender, ServiceProcessControl(); ~ServiceProcessControl() override; - friend struct DefaultSingletonTraits<ServiceProcessControl>; + friend struct base::DefaultSingletonTraits<ServiceProcessControl>; typedef std::vector<base::Closure> TaskList; diff --git a/chrome/browser/services/gcm/gcm_profile_service_factory.cc b/chrome/browser/services/gcm/gcm_profile_service_factory.cc index d3772b3..561a2fd 100644 --- a/chrome/browser/services/gcm/gcm_profile_service_factory.cc +++ b/chrome/browser/services/gcm/gcm_profile_service_factory.cc @@ -32,7 +32,7 @@ GCMProfileService* GCMProfileServiceFactory::GetForProfile( // static GCMProfileServiceFactory* GCMProfileServiceFactory::GetInstance() { - return Singleton<GCMProfileServiceFactory>::get(); + return base::Singleton<GCMProfileServiceFactory>::get(); } GCMProfileServiceFactory::GCMProfileServiceFactory() diff --git a/chrome/browser/services/gcm/gcm_profile_service_factory.h b/chrome/browser/services/gcm/gcm_profile_service_factory.h index af4f23c..102b68c 100644 --- a/chrome/browser/services/gcm/gcm_profile_service_factory.h +++ b/chrome/browser/services/gcm/gcm_profile_service_factory.h @@ -22,7 +22,7 @@ class GCMProfileServiceFactory : public BrowserContextKeyedServiceFactory { static GCMProfileServiceFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<GCMProfileServiceFactory>; + friend struct base::DefaultSingletonTraits<GCMProfileServiceFactory>; GCMProfileServiceFactory(); ~GCMProfileServiceFactory() override; diff --git a/chrome/browser/services/gcm/instance_id/instance_id_profile_service_factory.cc b/chrome/browser/services/gcm/instance_id/instance_id_profile_service_factory.cc index 6fd67fd..1bc848f 100644 --- a/chrome/browser/services/gcm/instance_id/instance_id_profile_service_factory.cc +++ b/chrome/browser/services/gcm/instance_id/instance_id_profile_service_factory.cc @@ -27,7 +27,7 @@ InstanceIDProfileService* InstanceIDProfileServiceFactory::GetForProfile( // static InstanceIDProfileServiceFactory* InstanceIDProfileServiceFactory::GetInstance() { - return Singleton<InstanceIDProfileServiceFactory>::get(); + return base::Singleton<InstanceIDProfileServiceFactory>::get(); } InstanceIDProfileServiceFactory::InstanceIDProfileServiceFactory() diff --git a/chrome/browser/services/gcm/instance_id/instance_id_profile_service_factory.h b/chrome/browser/services/gcm/instance_id/instance_id_profile_service_factory.h index 688aea7..09cad9d9 100644 --- a/chrome/browser/services/gcm/instance_id/instance_id_profile_service_factory.h +++ b/chrome/browser/services/gcm/instance_id/instance_id_profile_service_factory.h @@ -22,7 +22,7 @@ class InstanceIDProfileServiceFactory : static InstanceIDProfileServiceFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<InstanceIDProfileServiceFactory>; + friend struct base::DefaultSingletonTraits<InstanceIDProfileServiceFactory>; InstanceIDProfileServiceFactory(); ~InstanceIDProfileServiceFactory() override; diff --git a/chrome/browser/sessions/session_service_factory.cc b/chrome/browser/sessions/session_service_factory.cc index 99a7e8b..8ce4165 100644 --- a/chrome/browser/sessions/session_service_factory.cc +++ b/chrome/browser/sessions/session_service_factory.cc @@ -63,7 +63,7 @@ void SessionServiceFactory::ShutdownForProfile(Profile* profile) { } SessionServiceFactory* SessionServiceFactory::GetInstance() { - return Singleton<SessionServiceFactory>::get(); + return base::Singleton<SessionServiceFactory>::get(); } SessionServiceFactory::SessionServiceFactory() diff --git a/chrome/browser/sessions/session_service_factory.h b/chrome/browser/sessions/session_service_factory.h index c0db39c..a7735ca 100644 --- a/chrome/browser/sessions/session_service_factory.h +++ b/chrome/browser/sessions/session_service_factory.h @@ -55,7 +55,7 @@ class SessionServiceFactory : public BrowserContextKeyedServiceFactory { static SessionServiceFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<SessionServiceFactory>; + friend struct base::DefaultSingletonTraits<SessionServiceFactory>; FRIEND_TEST_ALL_PREFIXES(SessionCrashedInfoBarDelegateUnitTest, DetachingTabWithCrashedInfoBar); diff --git a/chrome/browser/sessions/tab_restore_service_factory.cc b/chrome/browser/sessions/tab_restore_service_factory.cc index a0d5db4..6d0b85e 100644 --- a/chrome/browser/sessions/tab_restore_service_factory.cc +++ b/chrome/browser/sessions/tab_restore_service_factory.cc @@ -35,7 +35,7 @@ void TabRestoreServiceFactory::ResetForProfile(Profile* profile) { } TabRestoreServiceFactory* TabRestoreServiceFactory::GetInstance() { - return Singleton<TabRestoreServiceFactory>::get(); + return base::Singleton<TabRestoreServiceFactory>::get(); } TabRestoreServiceFactory::TabRestoreServiceFactory() diff --git a/chrome/browser/sessions/tab_restore_service_factory.h b/chrome/browser/sessions/tab_restore_service_factory.h index 874f54d..a069d71 100644 --- a/chrome/browser/sessions/tab_restore_service_factory.h +++ b/chrome/browser/sessions/tab_restore_service_factory.h @@ -27,7 +27,7 @@ class TabRestoreServiceFactory : public BrowserContextKeyedServiceFactory { static TabRestoreServiceFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<TabRestoreServiceFactory>; + friend struct base::DefaultSingletonTraits<TabRestoreServiceFactory>; TabRestoreServiceFactory(); ~TabRestoreServiceFactory() override; diff --git a/chrome/browser/signin/about_signin_internals_factory.cc b/chrome/browser/signin/about_signin_internals_factory.cc index 909f86c..0a89f5d 100644 --- a/chrome/browser/signin/about_signin_internals_factory.cc +++ b/chrome/browser/signin/about_signin_internals_factory.cc @@ -38,7 +38,7 @@ AboutSigninInternals* AboutSigninInternalsFactory::GetForProfile( // static AboutSigninInternalsFactory* AboutSigninInternalsFactory::GetInstance() { - return Singleton<AboutSigninInternalsFactory>::get(); + return base::Singleton<AboutSigninInternalsFactory>::get(); } void AboutSigninInternalsFactory::RegisterProfilePrefs( diff --git a/chrome/browser/signin/about_signin_internals_factory.h b/chrome/browser/signin/about_signin_internals_factory.h index bc60fba..c1b7cb5 100644 --- a/chrome/browser/signin/about_signin_internals_factory.h +++ b/chrome/browser/signin/about_signin_internals_factory.h @@ -27,7 +27,7 @@ class AboutSigninInternalsFactory : public BrowserContextKeyedServiceFactory { user_prefs::PrefRegistrySyncable* registry) override; private: - friend struct DefaultSingletonTraits<AboutSigninInternalsFactory>; + friend struct base::DefaultSingletonTraits<AboutSigninInternalsFactory>; AboutSigninInternalsFactory(); ~AboutSigninInternalsFactory() override; diff --git a/chrome/browser/signin/account_fetcher_service_factory.cc b/chrome/browser/signin/account_fetcher_service_factory.cc index 6d49b30..c6911ae 100644 --- a/chrome/browser/signin/account_fetcher_service_factory.cc +++ b/chrome/browser/signin/account_fetcher_service_factory.cc @@ -36,7 +36,7 @@ AccountFetcherService* AccountFetcherServiceFactory::GetForProfile( // static AccountFetcherServiceFactory* AccountFetcherServiceFactory::GetInstance() { - return Singleton<AccountFetcherServiceFactory>::get(); + return base::Singleton<AccountFetcherServiceFactory>::get(); } void AccountFetcherServiceFactory::RegisterProfilePrefs( diff --git a/chrome/browser/signin/account_fetcher_service_factory.h b/chrome/browser/signin/account_fetcher_service_factory.h index 0f0e8a6..ac4bc83 100644 --- a/chrome/browser/signin/account_fetcher_service_factory.h +++ b/chrome/browser/signin/account_fetcher_service_factory.h @@ -17,7 +17,7 @@ class AccountFetcherServiceFactory : public BrowserContextKeyedServiceFactory { static AccountFetcherServiceFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<AccountFetcherServiceFactory>; + friend struct base::DefaultSingletonTraits<AccountFetcherServiceFactory>; AccountFetcherServiceFactory(); ~AccountFetcherServiceFactory() override; diff --git a/chrome/browser/signin/account_reconcilor_factory.cc b/chrome/browser/signin/account_reconcilor_factory.cc index 69b0155..52ddcfa 100644 --- a/chrome/browser/signin/account_reconcilor_factory.cc +++ b/chrome/browser/signin/account_reconcilor_factory.cc @@ -32,7 +32,7 @@ AccountReconcilor* AccountReconcilorFactory::GetForProfile( // static AccountReconcilorFactory* AccountReconcilorFactory::GetInstance() { - return Singleton<AccountReconcilorFactory>::get(); + return base::Singleton<AccountReconcilorFactory>::get(); } KeyedService* AccountReconcilorFactory::BuildServiceInstanceFor( diff --git a/chrome/browser/signin/account_reconcilor_factory.h b/chrome/browser/signin/account_reconcilor_factory.h index 72d579e..4a5139e 100644 --- a/chrome/browser/signin/account_reconcilor_factory.h +++ b/chrome/browser/signin/account_reconcilor_factory.h @@ -24,7 +24,7 @@ class AccountReconcilorFactory : public BrowserContextKeyedServiceFactory { static AccountReconcilorFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<AccountReconcilorFactory>; + friend struct base::DefaultSingletonTraits<AccountReconcilorFactory>; AccountReconcilorFactory(); ~AccountReconcilorFactory() override; diff --git a/chrome/browser/signin/account_tracker_service_factory.cc b/chrome/browser/signin/account_tracker_service_factory.cc index 8c531f8..2b2a359 100644 --- a/chrome/browser/signin/account_tracker_service_factory.cc +++ b/chrome/browser/signin/account_tracker_service_factory.cc @@ -29,7 +29,7 @@ AccountTrackerServiceFactory::GetForProfile(Profile* profile) { // static AccountTrackerServiceFactory* AccountTrackerServiceFactory::GetInstance() { - return Singleton<AccountTrackerServiceFactory>::get(); + return base::Singleton<AccountTrackerServiceFactory>::get(); } void AccountTrackerServiceFactory::RegisterProfilePrefs( diff --git a/chrome/browser/signin/account_tracker_service_factory.h b/chrome/browser/signin/account_tracker_service_factory.h index f4ce4e2..dad1a60 100644 --- a/chrome/browser/signin/account_tracker_service_factory.h +++ b/chrome/browser/signin/account_tracker_service_factory.h @@ -27,7 +27,7 @@ class AccountTrackerServiceFactory static AccountTrackerServiceFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<AccountTrackerServiceFactory>; + friend struct base::DefaultSingletonTraits<AccountTrackerServiceFactory>; AccountTrackerServiceFactory(); ~AccountTrackerServiceFactory() override; diff --git a/chrome/browser/signin/chrome_signin_client_factory.cc b/chrome/browser/signin/chrome_signin_client_factory.cc index 38de748..f86834ce 100644 --- a/chrome/browser/signin/chrome_signin_client_factory.cc +++ b/chrome/browser/signin/chrome_signin_client_factory.cc @@ -25,7 +25,7 @@ SigninClient* ChromeSigninClientFactory::GetForProfile(Profile* profile) { // static ChromeSigninClientFactory* ChromeSigninClientFactory::GetInstance() { - return Singleton<ChromeSigninClientFactory>::get(); + return base::Singleton<ChromeSigninClientFactory>::get(); } KeyedService* ChromeSigninClientFactory::BuildServiceInstanceFor( diff --git a/chrome/browser/signin/chrome_signin_client_factory.h b/chrome/browser/signin/chrome_signin_client_factory.h index 05509a6..e88d3f2 100644 --- a/chrome/browser/signin/chrome_signin_client_factory.h +++ b/chrome/browser/signin/chrome_signin_client_factory.h @@ -24,7 +24,7 @@ class ChromeSigninClientFactory : public BrowserContextKeyedServiceFactory { static ChromeSigninClientFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<ChromeSigninClientFactory>; + friend struct base::DefaultSingletonTraits<ChromeSigninClientFactory>; ChromeSigninClientFactory(); ~ChromeSigninClientFactory() override; diff --git a/chrome/browser/signin/cross_device_promo_factory.cc b/chrome/browser/signin/cross_device_promo_factory.cc index e24b225..6b8d34a 100644 --- a/chrome/browser/signin/cross_device_promo_factory.cc +++ b/chrome/browser/signin/cross_device_promo_factory.cc @@ -37,7 +37,7 @@ CrossDevicePromo* CrossDevicePromoFactory::GetForProfile(Profile* profile) { // static CrossDevicePromoFactory* CrossDevicePromoFactory::GetInstance() { - return Singleton<CrossDevicePromoFactory>::get(); + return base::Singleton<CrossDevicePromoFactory>::get(); } void CrossDevicePromoFactory::RegisterProfilePrefs( diff --git a/chrome/browser/signin/cross_device_promo_factory.h b/chrome/browser/signin/cross_device_promo_factory.h index b46bc3a..866db32 100644 --- a/chrome/browser/signin/cross_device_promo_factory.h +++ b/chrome/browser/signin/cross_device_promo_factory.h @@ -27,7 +27,7 @@ class CrossDevicePromoFactory : public BrowserContextKeyedServiceFactory { user_prefs::PrefRegistrySyncable* registry) override; private: - friend struct DefaultSingletonTraits<CrossDevicePromoFactory>; + friend struct base::DefaultSingletonTraits<CrossDevicePromoFactory>; CrossDevicePromoFactory(); ~CrossDevicePromoFactory() override; diff --git a/chrome/browser/signin/easy_unlock_service_factory.cc b/chrome/browser/signin/easy_unlock_service_factory.cc index 1224ed0..f48e3b0 100644 --- a/chrome/browser/signin/easy_unlock_service_factory.cc +++ b/chrome/browser/signin/easy_unlock_service_factory.cc @@ -52,7 +52,7 @@ base::FilePath GetEasyUnlockAppPath() { // static EasyUnlockServiceFactory* EasyUnlockServiceFactory::GetInstance() { - return Singleton<EasyUnlockServiceFactory>::get(); + return base::Singleton<EasyUnlockServiceFactory>::get(); } // static diff --git a/chrome/browser/signin/easy_unlock_service_factory.h b/chrome/browser/signin/easy_unlock_service_factory.h index ab5bf18..bc0709f 100644 --- a/chrome/browser/signin/easy_unlock_service_factory.h +++ b/chrome/browser/signin/easy_unlock_service_factory.h @@ -13,7 +13,10 @@ namespace content { class BrowserContext; } +namespace base { template <typename T> struct DefaultSingletonTraits; +} + class EasyUnlockService; class Profile; @@ -30,7 +33,7 @@ class EasyUnlockServiceFactory : public BrowserContextKeyedServiceFactory { } private: - friend struct DefaultSingletonTraits<EasyUnlockServiceFactory>; + friend struct base::DefaultSingletonTraits<EasyUnlockServiceFactory>; EasyUnlockServiceFactory(); ~EasyUnlockServiceFactory() override; diff --git a/chrome/browser/signin/gaia_cookie_manager_service_factory.cc b/chrome/browser/signin/gaia_cookie_manager_service_factory.cc index 922646a..4fba6b8 100644 --- a/chrome/browser/signin/gaia_cookie_manager_service_factory.cc +++ b/chrome/browser/signin/gaia_cookie_manager_service_factory.cc @@ -32,7 +32,7 @@ GaiaCookieManagerService* GaiaCookieManagerServiceFactory::GetForProfile( // static GaiaCookieManagerServiceFactory* GaiaCookieManagerServiceFactory::GetInstance() { - return Singleton<GaiaCookieManagerServiceFactory>::get(); + return base::Singleton<GaiaCookieManagerServiceFactory>::get(); } KeyedService* GaiaCookieManagerServiceFactory::BuildServiceInstanceFor( diff --git a/chrome/browser/signin/gaia_cookie_manager_service_factory.h b/chrome/browser/signin/gaia_cookie_manager_service_factory.h index 9934332..e8b83db 100644 --- a/chrome/browser/signin/gaia_cookie_manager_service_factory.h +++ b/chrome/browser/signin/gaia_cookie_manager_service_factory.h @@ -25,7 +25,7 @@ class GaiaCookieManagerServiceFactory : static GaiaCookieManagerServiceFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<GaiaCookieManagerServiceFactory>; + friend struct base::DefaultSingletonTraits<GaiaCookieManagerServiceFactory>; GaiaCookieManagerServiceFactory(); ~GaiaCookieManagerServiceFactory() override; diff --git a/chrome/browser/signin/profile_oauth2_token_service_factory.cc b/chrome/browser/signin/profile_oauth2_token_service_factory.cc index 55bca66..8b21353 100644 --- a/chrome/browser/signin/profile_oauth2_token_service_factory.cc +++ b/chrome/browser/signin/profile_oauth2_token_service_factory.cc @@ -42,7 +42,7 @@ ProfileOAuth2TokenServiceFactory::GetForProfile(Profile* profile) { // static ProfileOAuth2TokenServiceFactory* ProfileOAuth2TokenServiceFactory::GetInstance() { - return Singleton<ProfileOAuth2TokenServiceFactory>::get(); + return base::Singleton<ProfileOAuth2TokenServiceFactory>::get(); } KeyedService* ProfileOAuth2TokenServiceFactory::BuildServiceInstanceFor( diff --git a/chrome/browser/signin/profile_oauth2_token_service_factory.h b/chrome/browser/signin/profile_oauth2_token_service_factory.h index 7643fff..b43a1cf 100644 --- a/chrome/browser/signin/profile_oauth2_token_service_factory.h +++ b/chrome/browser/signin/profile_oauth2_token_service_factory.h @@ -27,7 +27,7 @@ class ProfileOAuth2TokenServiceFactory static ProfileOAuth2TokenServiceFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<ProfileOAuth2TokenServiceFactory>; + friend struct base::DefaultSingletonTraits<ProfileOAuth2TokenServiceFactory>; ProfileOAuth2TokenServiceFactory(); ~ProfileOAuth2TokenServiceFactory() override; diff --git a/chrome/browser/signin/signin_error_controller_factory.cc b/chrome/browser/signin/signin_error_controller_factory.cc index 796836d..81a9524 100644 --- a/chrome/browser/signin/signin_error_controller_factory.cc +++ b/chrome/browser/signin/signin_error_controller_factory.cc @@ -23,7 +23,7 @@ SigninErrorController* SigninErrorControllerFactory::GetForProfile( // static SigninErrorControllerFactory* SigninErrorControllerFactory::GetInstance() { - return Singleton<SigninErrorControllerFactory>::get(); + return base::Singleton<SigninErrorControllerFactory>::get(); } KeyedService* SigninErrorControllerFactory::BuildServiceInstanceFor( diff --git a/chrome/browser/signin/signin_error_controller_factory.h b/chrome/browser/signin/signin_error_controller_factory.h index 990243e..0d87f49 100644 --- a/chrome/browser/signin/signin_error_controller_factory.h +++ b/chrome/browser/signin/signin_error_controller_factory.h @@ -24,7 +24,7 @@ class SigninErrorControllerFactory : public BrowserContextKeyedServiceFactory { static SigninErrorControllerFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<SigninErrorControllerFactory>; + friend struct base::DefaultSingletonTraits<SigninErrorControllerFactory>; SigninErrorControllerFactory(); ~SigninErrorControllerFactory() override; diff --git a/chrome/browser/signin/signin_error_notifier_factory_ash.cc b/chrome/browser/signin/signin_error_notifier_factory_ash.cc index 75c975f..bc777ec 100644 --- a/chrome/browser/signin/signin_error_notifier_factory_ash.cc +++ b/chrome/browser/signin/signin_error_notifier_factory_ash.cc @@ -30,7 +30,7 @@ SigninErrorNotifier* SigninErrorNotifierFactory::GetForProfile( // static SigninErrorNotifierFactory* SigninErrorNotifierFactory::GetInstance() { - return Singleton<SigninErrorNotifierFactory>::get(); + return base::Singleton<SigninErrorNotifierFactory>::get(); } KeyedService* SigninErrorNotifierFactory::BuildServiceInstanceFor( diff --git a/chrome/browser/signin/signin_error_notifier_factory_ash.h b/chrome/browser/signin/signin_error_notifier_factory_ash.h index 7071b65..5c50159 100644 --- a/chrome/browser/signin/signin_error_notifier_factory_ash.h +++ b/chrome/browser/signin/signin_error_notifier_factory_ash.h @@ -24,7 +24,7 @@ class SigninErrorNotifierFactory : public BrowserContextKeyedServiceFactory { static SigninErrorNotifierFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<SigninErrorNotifierFactory>; + friend struct base::DefaultSingletonTraits<SigninErrorNotifierFactory>; SigninErrorNotifierFactory(); ~SigninErrorNotifierFactory() override; diff --git a/chrome/browser/signin/signin_global_error_factory.cc b/chrome/browser/signin/signin_global_error_factory.cc index a1900a7..b24e366 100644 --- a/chrome/browser/signin/signin_global_error_factory.cc +++ b/chrome/browser/signin/signin_global_error_factory.cc @@ -35,7 +35,7 @@ SigninGlobalError* SigninGlobalErrorFactory::GetForProfile( // static SigninGlobalErrorFactory* SigninGlobalErrorFactory::GetInstance() { - return Singleton<SigninGlobalErrorFactory>::get(); + return base::Singleton<SigninGlobalErrorFactory>::get(); } KeyedService* SigninGlobalErrorFactory::BuildServiceInstanceFor( diff --git a/chrome/browser/signin/signin_global_error_factory.h b/chrome/browser/signin/signin_global_error_factory.h index 36bb94c..9ea3d55 100644 --- a/chrome/browser/signin/signin_global_error_factory.h +++ b/chrome/browser/signin/signin_global_error_factory.h @@ -24,7 +24,7 @@ class SigninGlobalErrorFactory : public BrowserContextKeyedServiceFactory { static SigninGlobalErrorFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<SigninGlobalErrorFactory>; + friend struct base::DefaultSingletonTraits<SigninGlobalErrorFactory>; SigninGlobalErrorFactory(); ~SigninGlobalErrorFactory() override; diff --git a/chrome/browser/signin/signin_manager_factory.cc b/chrome/browser/signin/signin_manager_factory.cc index 00e9a9b..4364678 100644 --- a/chrome/browser/signin/signin_manager_factory.cc +++ b/chrome/browser/signin/signin_manager_factory.cc @@ -74,7 +74,7 @@ const SigninManager* SigninManagerFactory::GetForProfileIfExists( // static SigninManagerFactory* SigninManagerFactory::GetInstance() { - return Singleton<SigninManagerFactory>::get(); + return base::Singleton<SigninManagerFactory>::get(); } void SigninManagerFactory::RegisterProfilePrefs( diff --git a/chrome/browser/signin/signin_manager_factory.h b/chrome/browser/signin/signin_manager_factory.h index ee56185..cff398b 100644 --- a/chrome/browser/signin/signin_manager_factory.h +++ b/chrome/browser/signin/signin_manager_factory.h @@ -73,7 +73,7 @@ class SigninManagerFactory : public BrowserContextKeyedServiceFactory { SigninManagerBase* manager); private: - friend struct DefaultSingletonTraits<SigninManagerFactory>; + friend struct base::DefaultSingletonTraits<SigninManagerFactory>; SigninManagerFactory(); ~SigninManagerFactory() override; diff --git a/chrome/browser/speech/extension_api/tts_engine_extension_api.cc b/chrome/browser/speech/extension_api/tts_engine_extension_api.cc index eff4dee..e7e952d 100644 --- a/chrome/browser/speech/extension_api/tts_engine_extension_api.cc +++ b/chrome/browser/speech/extension_api/tts_engine_extension_api.cc @@ -65,7 +65,7 @@ void WarnIfMissingPauseOrResumeListener( } // namespace TtsExtensionEngine* TtsExtensionEngine::GetInstance() { - return Singleton<TtsExtensionEngine>::get(); + return base::Singleton<TtsExtensionEngine>::get(); } void TtsExtensionEngine::GetVoices(content::BrowserContext* browser_context, diff --git a/chrome/browser/speech/extension_api/tts_engine_extension_observer.cc b/chrome/browser/speech/extension_api/tts_engine_extension_observer.cc index 61c2fb4..852621e 100644 --- a/chrome/browser/speech/extension_api/tts_engine_extension_observer.cc +++ b/chrome/browser/speech/extension_api/tts_engine_extension_observer.cc @@ -27,11 +27,11 @@ class TtsEngineExtensionObserverFactory } static TtsEngineExtensionObserverFactory* GetInstance() { - return Singleton<TtsEngineExtensionObserverFactory>::get(); + return base::Singleton<TtsEngineExtensionObserverFactory>::get(); } private: - friend struct DefaultSingletonTraits<TtsEngineExtensionObserverFactory>; + friend struct base::DefaultSingletonTraits<TtsEngineExtensionObserverFactory>; TtsEngineExtensionObserverFactory() : BrowserContextKeyedServiceFactory( diff --git a/chrome/browser/speech/tts_android.cc b/chrome/browser/speech/tts_android.cc index 7fe5b02..bcc501c 100644 --- a/chrome/browser/speech/tts_android.cc +++ b/chrome/browser/speech/tts_android.cc @@ -135,8 +135,9 @@ void TtsPlatformImplAndroid::SendFinalTtsEvent( // static TtsPlatformImplAndroid* TtsPlatformImplAndroid::GetInstance() { - return Singleton<TtsPlatformImplAndroid, - LeakySingletonTraits<TtsPlatformImplAndroid> >::get(); + return base::Singleton< + TtsPlatformImplAndroid, + base::LeakySingletonTraits<TtsPlatformImplAndroid>>::get(); } // static diff --git a/chrome/browser/speech/tts_android.h b/chrome/browser/speech/tts_android.h index 6dcf02b..f6ce3b2 100644 --- a/chrome/browser/speech/tts_android.h +++ b/chrome/browser/speech/tts_android.h @@ -35,7 +35,7 @@ class TtsPlatformImplAndroid : public TtsPlatformImpl { static bool Register(JNIEnv* env); private: - friend struct DefaultSingletonTraits<TtsPlatformImplAndroid>; + friend struct base::DefaultSingletonTraits<TtsPlatformImplAndroid>; TtsPlatformImplAndroid(); ~TtsPlatformImplAndroid() override; diff --git a/chrome/browser/speech/tts_chromeos.cc b/chrome/browser/speech/tts_chromeos.cc index 4f35e9e..a45bb3a 100644 --- a/chrome/browser/speech/tts_chromeos.cc +++ b/chrome/browser/speech/tts_chromeos.cc @@ -48,7 +48,7 @@ class TtsPlatformImplChromeOs : public TtsPlatformImpl { TtsPlatformImplChromeOs() {} ~TtsPlatformImplChromeOs() override {} - friend struct DefaultSingletonTraits<TtsPlatformImplChromeOs>; + friend struct base::DefaultSingletonTraits<TtsPlatformImplChromeOs>; DISALLOW_COPY_AND_ASSIGN(TtsPlatformImplChromeOs); }; @@ -61,5 +61,5 @@ TtsPlatformImpl* TtsPlatformImpl::GetInstance() { // static TtsPlatformImplChromeOs* TtsPlatformImplChromeOs::GetInstance() { - return Singleton<TtsPlatformImplChromeOs>::get(); + return base::Singleton<TtsPlatformImplChromeOs>::get(); } diff --git a/chrome/browser/speech/tts_controller_impl.cc b/chrome/browser/speech/tts_controller_impl.cc index 07748fe..ad41da5 100644 --- a/chrome/browser/speech/tts_controller_impl.cc +++ b/chrome/browser/speech/tts_controller_impl.cc @@ -111,7 +111,7 @@ TtsController* TtsController::GetInstance() { // static TtsControllerImpl* TtsControllerImpl::GetInstance() { - return Singleton<TtsControllerImpl>::get(); + return base::Singleton<TtsControllerImpl>::get(); } TtsControllerImpl::TtsControllerImpl() diff --git a/chrome/browser/speech/tts_controller_impl.h b/chrome/browser/speech/tts_controller_impl.h index 695f4bb..dc53d5e 100644 --- a/chrome/browser/speech/tts_controller_impl.h +++ b/chrome/browser/speech/tts_controller_impl.h @@ -75,7 +75,7 @@ class TtsControllerImpl : public TtsController { int GetMatchingVoice(const Utterance* utterance, std::vector<VoiceData>& voices); - friend struct DefaultSingletonTraits<TtsControllerImpl>; + friend struct base::DefaultSingletonTraits<TtsControllerImpl>; // The current utterance being spoken. Utterance* current_utterance_; diff --git a/chrome/browser/speech/tts_linux.cc b/chrome/browser/speech/tts_linux.cc index 05360b1..ba15516 100644 --- a/chrome/browser/speech/tts_linux.cc +++ b/chrome/browser/speech/tts_linux.cc @@ -83,7 +83,7 @@ class TtsPlatformImplLinux : public TtsPlatformImpl { // uniquely identify a voice across all available modules. scoped_ptr<std::map<std::string, SPDChromeVoice> > all_native_voices_; - friend struct DefaultSingletonTraits<TtsPlatformImplLinux>; + friend struct base::DefaultSingletonTraits<TtsPlatformImplLinux>; DISALLOW_COPY_AND_ASSIGN(TtsPlatformImplLinux); }; @@ -346,8 +346,9 @@ void TtsPlatformImplLinux::IndexMarkCallback(size_t msg_id, // static TtsPlatformImplLinux* TtsPlatformImplLinux::GetInstance() { - return Singleton<TtsPlatformImplLinux, - LeakySingletonTraits<TtsPlatformImplLinux> >::get(); + return base::Singleton< + TtsPlatformImplLinux, + base::LeakySingletonTraits<TtsPlatformImplLinux>>::get(); } // static diff --git a/chrome/browser/speech/tts_mac.mm b/chrome/browser/speech/tts_mac.mm index 21aa9a2..a492dd5 100644 --- a/chrome/browser/speech/tts_mac.mm +++ b/chrome/browser/speech/tts_mac.mm @@ -89,7 +89,7 @@ class TtsPlatformImplMac : public TtsPlatformImpl { int last_char_index_; bool paused_; - friend struct DefaultSingletonTraits<TtsPlatformImplMac>; + friend struct base::DefaultSingletonTraits<TtsPlatformImplMac>; DISALLOW_COPY_AND_ASSIGN(TtsPlatformImplMac); }; @@ -289,7 +289,7 @@ TtsPlatformImplMac::~TtsPlatformImplMac() { // static TtsPlatformImplMac* TtsPlatformImplMac::GetInstance() { - return Singleton<TtsPlatformImplMac>::get(); + return base::Singleton<TtsPlatformImplMac>::get(); } @implementation ChromeTtsDelegate diff --git a/chrome/browser/speech/tts_win.cc b/chrome/browser/speech/tts_win.cc index 1886bd0..ac25820 100644 --- a/chrome/browser/speech/tts_win.cc +++ b/chrome/browser/speech/tts_win.cc @@ -57,7 +57,7 @@ class TtsPlatformImplWin : public TtsPlatformImpl { int char_position_; bool paused_; - friend struct DefaultSingletonTraits<TtsPlatformImplWin>; + friend struct base::DefaultSingletonTraits<TtsPlatformImplWin>; DISALLOW_COPY_AND_ASSIGN(TtsPlatformImplWin); }; @@ -248,8 +248,8 @@ TtsPlatformImplWin::TtsPlatformImplWin() // static TtsPlatformImplWin* TtsPlatformImplWin::GetInstance() { - return Singleton<TtsPlatformImplWin, - LeakySingletonTraits<TtsPlatformImplWin> >::get(); + return base::Singleton<TtsPlatformImplWin, + base::LeakySingletonTraits<TtsPlatformImplWin>>::get(); } // static diff --git a/chrome/browser/spellchecker/spellcheck_factory.cc b/chrome/browser/spellchecker/spellcheck_factory.cc index 4c61d34..fcf2ce8 100644 --- a/chrome/browser/spellchecker/spellcheck_factory.cc +++ b/chrome/browser/spellchecker/spellcheck_factory.cc @@ -38,7 +38,7 @@ SpellcheckService* SpellcheckServiceFactory::GetForRenderProcessId( // static SpellcheckServiceFactory* SpellcheckServiceFactory::GetInstance() { - return Singleton<SpellcheckServiceFactory>::get(); + return base::Singleton<SpellcheckServiceFactory>::get(); } SpellcheckServiceFactory::SpellcheckServiceFactory() diff --git a/chrome/browser/spellchecker/spellcheck_factory.h b/chrome/browser/spellchecker/spellcheck_factory.h index 3e4ad0e..7cdf471 100644 --- a/chrome/browser/spellchecker/spellcheck_factory.h +++ b/chrome/browser/spellchecker/spellcheck_factory.h @@ -26,7 +26,7 @@ class SpellcheckServiceFactory : public BrowserContextKeyedServiceFactory { static SpellcheckServiceFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<SpellcheckServiceFactory>; + friend struct base::DefaultSingletonTraits<SpellcheckServiceFactory>; SpellcheckServiceFactory(); ~SpellcheckServiceFactory() override; diff --git a/chrome/browser/ssl/chrome_ssl_host_state_delegate_factory.cc b/chrome/browser/ssl/chrome_ssl_host_state_delegate_factory.cc index 74adcd6..6258657 100644 --- a/chrome/browser/ssl/chrome_ssl_host_state_delegate_factory.cc +++ b/chrome/browser/ssl/chrome_ssl_host_state_delegate_factory.cc @@ -41,7 +41,7 @@ ChromeSSLHostStateDelegate* ChromeSSLHostStateDelegateFactory::GetForProfile( // static ChromeSSLHostStateDelegateFactory* ChromeSSLHostStateDelegateFactory::GetInstance() { - return Singleton<ChromeSSLHostStateDelegateFactory>::get(); + return base::Singleton<ChromeSSLHostStateDelegateFactory>::get(); } ChromeSSLHostStateDelegateFactory::ChromeSSLHostStateDelegateFactory() diff --git a/chrome/browser/ssl/chrome_ssl_host_state_delegate_factory.h b/chrome/browser/ssl/chrome_ssl_host_state_delegate_factory.h index 6cfb203..b056592 100644 --- a/chrome/browser/ssl/chrome_ssl_host_state_delegate_factory.h +++ b/chrome/browser/ssl/chrome_ssl_host_state_delegate_factory.h @@ -23,7 +23,7 @@ class ChromeSSLHostStateDelegateFactory static ChromeSSLHostStateDelegateFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<ChromeSSLHostStateDelegateFactory>; + friend struct base::DefaultSingletonTraits<ChromeSSLHostStateDelegateFactory>; ChromeSSLHostStateDelegateFactory(); ~ChromeSSLHostStateDelegateFactory() override; diff --git a/chrome/browser/storage/durable_storage_permission_context_factory.cc b/chrome/browser/storage/durable_storage_permission_context_factory.cc index 3599a10..bfc6a6b 100644 --- a/chrome/browser/storage/durable_storage_permission_context_factory.cc +++ b/chrome/browser/storage/durable_storage_permission_context_factory.cc @@ -19,7 +19,7 @@ DurableStoragePermissionContextFactory::GetForProfile(Profile* profile) { // static DurableStoragePermissionContextFactory* DurableStoragePermissionContextFactory::GetInstance() { - return Singleton<DurableStoragePermissionContextFactory>::get(); + return base::Singleton<DurableStoragePermissionContextFactory>::get(); } DurableStoragePermissionContextFactory::DurableStoragePermissionContextFactory() diff --git a/chrome/browser/storage/durable_storage_permission_context_factory.h b/chrome/browser/storage/durable_storage_permission_context_factory.h index 598fd87..6b176e9 100644 --- a/chrome/browser/storage/durable_storage_permission_context_factory.h +++ b/chrome/browser/storage/durable_storage_permission_context_factory.h @@ -18,7 +18,8 @@ class DurableStoragePermissionContextFactory static DurableStoragePermissionContextFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<DurableStoragePermissionContextFactory>; + friend struct base::DefaultSingletonTraits< + DurableStoragePermissionContextFactory>; DurableStoragePermissionContextFactory(); ~DurableStoragePermissionContextFactory() override = default; diff --git a/chrome/browser/supervised_user/child_accounts/child_account_service_factory.cc b/chrome/browser/supervised_user/child_accounts/child_account_service_factory.cc index 4a48946..4d20448 100644 --- a/chrome/browser/supervised_user/child_accounts/child_account_service_factory.cc +++ b/chrome/browser/supervised_user/child_accounts/child_account_service_factory.cc @@ -20,7 +20,7 @@ ChildAccountService* ChildAccountServiceFactory::GetForProfile( // static ChildAccountServiceFactory* ChildAccountServiceFactory::GetInstance() { - return Singleton<ChildAccountServiceFactory>::get(); + return base::Singleton<ChildAccountServiceFactory>::get(); } ChildAccountServiceFactory::ChildAccountServiceFactory() diff --git a/chrome/browser/supervised_user/child_accounts/child_account_service_factory.h b/chrome/browser/supervised_user/child_accounts/child_account_service_factory.h index 878a20f..00dfddb 100644 --- a/chrome/browser/supervised_user/child_accounts/child_account_service_factory.h +++ b/chrome/browser/supervised_user/child_accounts/child_account_service_factory.h @@ -19,7 +19,7 @@ class ChildAccountServiceFactory : public BrowserContextKeyedServiceFactory { static ChildAccountServiceFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<ChildAccountServiceFactory>; + friend struct base::DefaultSingletonTraits<ChildAccountServiceFactory>; ChildAccountServiceFactory(); ~ChildAccountServiceFactory() override; diff --git a/chrome/browser/supervised_user/chromeos/manager_password_service_factory.cc b/chrome/browser/supervised_user/chromeos/manager_password_service_factory.cc index e7fb7e8..8961688 100644 --- a/chrome/browser/supervised_user/chromeos/manager_password_service_factory.cc +++ b/chrome/browser/supervised_user/chromeos/manager_password_service_factory.cc @@ -27,7 +27,7 @@ ManagerPasswordServiceFactory::GetForProfile(Profile* profile) { // static ManagerPasswordServiceFactory* ManagerPasswordServiceFactory::GetInstance() { - return Singleton<ManagerPasswordServiceFactory>::get(); + return base::Singleton<ManagerPasswordServiceFactory>::get(); } ManagerPasswordServiceFactory::ManagerPasswordServiceFactory() diff --git a/chrome/browser/supervised_user/chromeos/manager_password_service_factory.h b/chrome/browser/supervised_user/chromeos/manager_password_service_factory.h index 799dd81..ab1c4b0 100644 --- a/chrome/browser/supervised_user/chromeos/manager_password_service_factory.h +++ b/chrome/browser/supervised_user/chromeos/manager_password_service_factory.h @@ -23,7 +23,7 @@ class ManagerPasswordServiceFactory static ManagerPasswordServiceFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<ManagerPasswordServiceFactory>; + friend struct base::DefaultSingletonTraits<ManagerPasswordServiceFactory>; ManagerPasswordServiceFactory(); ~ManagerPasswordServiceFactory() override; diff --git a/chrome/browser/supervised_user/chromeos/supervised_user_password_service_factory.cc b/chrome/browser/supervised_user/chromeos/supervised_user_password_service_factory.cc index 08f181f..2d185cd 100644 --- a/chrome/browser/supervised_user/chromeos/supervised_user_password_service_factory.cc +++ b/chrome/browser/supervised_user/chromeos/supervised_user_password_service_factory.cc @@ -26,7 +26,7 @@ SupervisedUserPasswordServiceFactory::GetForProfile(Profile* profile) { // static SupervisedUserPasswordServiceFactory* SupervisedUserPasswordServiceFactory::GetInstance() { - return Singleton<SupervisedUserPasswordServiceFactory>::get(); + return base::Singleton<SupervisedUserPasswordServiceFactory>::get(); } SupervisedUserPasswordServiceFactory::SupervisedUserPasswordServiceFactory() diff --git a/chrome/browser/supervised_user/chromeos/supervised_user_password_service_factory.h b/chrome/browser/supervised_user/chromeos/supervised_user_password_service_factory.h index 5aa755b..3ddbe0d 100644 --- a/chrome/browser/supervised_user/chromeos/supervised_user_password_service_factory.h +++ b/chrome/browser/supervised_user/chromeos/supervised_user_password_service_factory.h @@ -23,7 +23,8 @@ class SupervisedUserPasswordServiceFactory static SupervisedUserPasswordServiceFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<SupervisedUserPasswordServiceFactory>; + friend struct base::DefaultSingletonTraits< + SupervisedUserPasswordServiceFactory>; SupervisedUserPasswordServiceFactory(); ~SupervisedUserPasswordServiceFactory() override; diff --git a/chrome/browser/supervised_user/legacy/custodian_profile_downloader_service_factory.cc b/chrome/browser/supervised_user/legacy/custodian_profile_downloader_service_factory.cc index b191eaf..32e565d 100644 --- a/chrome/browser/supervised_user/legacy/custodian_profile_downloader_service_factory.cc +++ b/chrome/browser/supervised_user/legacy/custodian_profile_downloader_service_factory.cc @@ -21,7 +21,7 @@ CustodianProfileDownloaderServiceFactory::GetForProfile( // static CustodianProfileDownloaderServiceFactory* CustodianProfileDownloaderServiceFactory::GetInstance() { - return Singleton<CustodianProfileDownloaderServiceFactory>::get(); + return base::Singleton<CustodianProfileDownloaderServiceFactory>::get(); } CustodianProfileDownloaderServiceFactory:: diff --git a/chrome/browser/supervised_user/legacy/custodian_profile_downloader_service_factory.h b/chrome/browser/supervised_user/legacy/custodian_profile_downloader_service_factory.h index 5e28f24..9018143 100644 --- a/chrome/browser/supervised_user/legacy/custodian_profile_downloader_service_factory.h +++ b/chrome/browser/supervised_user/legacy/custodian_profile_downloader_service_factory.h @@ -19,8 +19,8 @@ class CustodianProfileDownloaderServiceFactory static CustodianProfileDownloaderServiceFactory* GetInstance(); private: - friend struct - DefaultSingletonTraits<CustodianProfileDownloaderServiceFactory>; + friend struct base::DefaultSingletonTraits< + CustodianProfileDownloaderServiceFactory>; CustodianProfileDownloaderServiceFactory(); ~CustodianProfileDownloaderServiceFactory() override; diff --git a/chrome/browser/supervised_user/legacy/supervised_user_pref_mapping_service_factory.cc b/chrome/browser/supervised_user/legacy/supervised_user_pref_mapping_service_factory.cc index 5e3d7ba..31b38a6 100644 --- a/chrome/browser/supervised_user/legacy/supervised_user_pref_mapping_service_factory.cc +++ b/chrome/browser/supervised_user/legacy/supervised_user_pref_mapping_service_factory.cc @@ -21,7 +21,7 @@ SupervisedUserPrefMappingServiceFactory::GetForBrowserContext( // static SupervisedUserPrefMappingServiceFactory* SupervisedUserPrefMappingServiceFactory::GetInstance() { - return Singleton<SupervisedUserPrefMappingServiceFactory>::get(); + return base::Singleton<SupervisedUserPrefMappingServiceFactory>::get(); } SupervisedUserPrefMappingServiceFactory:: diff --git a/chrome/browser/supervised_user/legacy/supervised_user_pref_mapping_service_factory.h b/chrome/browser/supervised_user/legacy/supervised_user_pref_mapping_service_factory.h index 4933e50..1aed53d 100644 --- a/chrome/browser/supervised_user/legacy/supervised_user_pref_mapping_service_factory.h +++ b/chrome/browser/supervised_user/legacy/supervised_user_pref_mapping_service_factory.h @@ -20,7 +20,8 @@ class SupervisedUserPrefMappingServiceFactory static SupervisedUserPrefMappingServiceFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<SupervisedUserPrefMappingServiceFactory>; + friend struct base::DefaultSingletonTraits< + SupervisedUserPrefMappingServiceFactory>; SupervisedUserPrefMappingServiceFactory(); ~SupervisedUserPrefMappingServiceFactory() override; diff --git a/chrome/browser/supervised_user/legacy/supervised_user_shared_settings_service_factory.cc b/chrome/browser/supervised_user/legacy/supervised_user_shared_settings_service_factory.cc index c4551dd..4650304 100644 --- a/chrome/browser/supervised_user/legacy/supervised_user_shared_settings_service_factory.cc +++ b/chrome/browser/supervised_user/legacy/supervised_user_shared_settings_service_factory.cc @@ -20,7 +20,7 @@ SupervisedUserSharedSettingsServiceFactory::GetForBrowserContext( // static SupervisedUserSharedSettingsServiceFactory* SupervisedUserSharedSettingsServiceFactory::GetInstance() { - return Singleton<SupervisedUserSharedSettingsServiceFactory>::get(); + return base::Singleton<SupervisedUserSharedSettingsServiceFactory>::get(); } SupervisedUserSharedSettingsServiceFactory:: diff --git a/chrome/browser/supervised_user/legacy/supervised_user_shared_settings_service_factory.h b/chrome/browser/supervised_user/legacy/supervised_user_shared_settings_service_factory.h index a114591..0571b42 100644 --- a/chrome/browser/supervised_user/legacy/supervised_user_shared_settings_service_factory.h +++ b/chrome/browser/supervised_user/legacy/supervised_user_shared_settings_service_factory.h @@ -20,7 +20,7 @@ class SupervisedUserSharedSettingsServiceFactory static SupervisedUserSharedSettingsServiceFactory* GetInstance(); private: - friend struct DefaultSingletonTraits< + friend struct base::DefaultSingletonTraits< SupervisedUserSharedSettingsServiceFactory>; SupervisedUserSharedSettingsServiceFactory(); diff --git a/chrome/browser/supervised_user/legacy/supervised_user_sync_service_factory.cc b/chrome/browser/supervised_user/legacy/supervised_user_sync_service_factory.cc index 22d025c..50d891f 100644 --- a/chrome/browser/supervised_user/legacy/supervised_user_sync_service_factory.cc +++ b/chrome/browser/supervised_user/legacy/supervised_user_sync_service_factory.cc @@ -19,7 +19,7 @@ SupervisedUserSyncService* SupervisedUserSyncServiceFactory::GetForProfile( // static SupervisedUserSyncServiceFactory* SupervisedUserSyncServiceFactory::GetInstance() { - return Singleton<SupervisedUserSyncServiceFactory>::get(); + return base::Singleton<SupervisedUserSyncServiceFactory>::get(); } SupervisedUserSyncServiceFactory::SupervisedUserSyncServiceFactory() diff --git a/chrome/browser/supervised_user/legacy/supervised_user_sync_service_factory.h b/chrome/browser/supervised_user/legacy/supervised_user_sync_service_factory.h index effe1835..0af5ef9 100644 --- a/chrome/browser/supervised_user/legacy/supervised_user_sync_service_factory.h +++ b/chrome/browser/supervised_user/legacy/supervised_user_sync_service_factory.h @@ -19,7 +19,7 @@ class SupervisedUserSyncServiceFactory static SupervisedUserSyncServiceFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<SupervisedUserSyncServiceFactory>; + friend struct base::DefaultSingletonTraits<SupervisedUserSyncServiceFactory>; SupervisedUserSyncServiceFactory(); ~SupervisedUserSyncServiceFactory() override; diff --git a/chrome/browser/supervised_user/supervised_user_service_factory.cc b/chrome/browser/supervised_user/supervised_user_service_factory.cc index 681a40e..0564b92 100644 --- a/chrome/browser/supervised_user/supervised_user_service_factory.cc +++ b/chrome/browser/supervised_user/supervised_user_service_factory.cc @@ -25,7 +25,7 @@ SupervisedUserService* SupervisedUserServiceFactory::GetForProfile( // static SupervisedUserServiceFactory* SupervisedUserServiceFactory::GetInstance() { - return Singleton<SupervisedUserServiceFactory>::get(); + return base::Singleton<SupervisedUserServiceFactory>::get(); } // static diff --git a/chrome/browser/supervised_user/supervised_user_service_factory.h b/chrome/browser/supervised_user/supervised_user_service_factory.h index 46b4661..5106700 100644 --- a/chrome/browser/supervised_user/supervised_user_service_factory.h +++ b/chrome/browser/supervised_user/supervised_user_service_factory.h @@ -22,7 +22,7 @@ class SupervisedUserServiceFactory : public BrowserContextKeyedServiceFactory { static KeyedService* BuildInstanceFor(Profile* profile); private: - friend struct DefaultSingletonTraits<SupervisedUserServiceFactory>; + friend struct base::DefaultSingletonTraits<SupervisedUserServiceFactory>; SupervisedUserServiceFactory(); ~SupervisedUserServiceFactory() override; diff --git a/chrome/browser/supervised_user/supervised_user_settings_service_factory.cc b/chrome/browser/supervised_user/supervised_user_settings_service_factory.cc index 58aba06..173ac31 100644 --- a/chrome/browser/supervised_user/supervised_user_settings_service_factory.cc +++ b/chrome/browser/supervised_user/supervised_user_settings_service_factory.cc @@ -19,7 +19,7 @@ SupervisedUserSettingsServiceFactory::GetForProfile(Profile* profile) { // static SupervisedUserSettingsServiceFactory* SupervisedUserSettingsServiceFactory::GetInstance() { - return Singleton<SupervisedUserSettingsServiceFactory>::get(); + return base::Singleton<SupervisedUserSettingsServiceFactory>::get(); } SupervisedUserSettingsServiceFactory::SupervisedUserSettingsServiceFactory() diff --git a/chrome/browser/supervised_user/supervised_user_settings_service_factory.h b/chrome/browser/supervised_user/supervised_user_settings_service_factory.h index 8b96a22..2907619 100644 --- a/chrome/browser/supervised_user/supervised_user_settings_service_factory.h +++ b/chrome/browser/supervised_user/supervised_user_settings_service_factory.h @@ -20,7 +20,8 @@ class SupervisedUserSettingsServiceFactory static SupervisedUserSettingsServiceFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<SupervisedUserSettingsServiceFactory>; + friend struct base::DefaultSingletonTraits< + SupervisedUserSettingsServiceFactory>; SupervisedUserSettingsServiceFactory(); ~SupervisedUserSettingsServiceFactory() override; diff --git a/chrome/browser/sync/profile_sync_service_factory.cc b/chrome/browser/sync/profile_sync_service_factory.cc index 84be65f..91ae80f 100644 --- a/chrome/browser/sync/profile_sync_service_factory.cc +++ b/chrome/browser/sync/profile_sync_service_factory.cc @@ -45,7 +45,7 @@ // static ProfileSyncServiceFactory* ProfileSyncServiceFactory::GetInstance() { - return Singleton<ProfileSyncServiceFactory>::get(); + return base::Singleton<ProfileSyncServiceFactory>::get(); } // static diff --git a/chrome/browser/sync/profile_sync_service_factory.h b/chrome/browser/sync/profile_sync_service_factory.h index 5f35c2f..4fec18d 100644 --- a/chrome/browser/sync/profile_sync_service_factory.h +++ b/chrome/browser/sync/profile_sync_service_factory.h @@ -29,7 +29,7 @@ class ProfileSyncServiceFactory : public BrowserContextKeyedServiceFactory { static ProfileSyncServiceFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<ProfileSyncServiceFactory>; + friend struct base::DefaultSingletonTraits<ProfileSyncServiceFactory>; ProfileSyncServiceFactory(); ~ProfileSyncServiceFactory() override; diff --git a/chrome/browser/sync/sync_error_notifier_factory_ash.cc b/chrome/browser/sync/sync_error_notifier_factory_ash.cc index 4548aca..25c12fe 100644 --- a/chrome/browser/sync/sync_error_notifier_factory_ash.cc +++ b/chrome/browser/sync/sync_error_notifier_factory_ash.cc @@ -30,7 +30,7 @@ SyncErrorNotifier* SyncErrorNotifierFactory::GetForProfile( // static SyncErrorNotifierFactory* SyncErrorNotifierFactory::GetInstance() { - return Singleton<SyncErrorNotifierFactory>::get(); + return base::Singleton<SyncErrorNotifierFactory>::get(); } KeyedService* SyncErrorNotifierFactory::BuildServiceInstanceFor( diff --git a/chrome/browser/sync/sync_error_notifier_factory_ash.h b/chrome/browser/sync/sync_error_notifier_factory_ash.h index 16bd2a9..86ac672 100644 --- a/chrome/browser/sync/sync_error_notifier_factory_ash.h +++ b/chrome/browser/sync/sync_error_notifier_factory_ash.h @@ -24,7 +24,7 @@ class SyncErrorNotifierFactory : public BrowserContextKeyedServiceFactory { static SyncErrorNotifierFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<SyncErrorNotifierFactory>; + friend struct base::DefaultSingletonTraits<SyncErrorNotifierFactory>; SyncErrorNotifierFactory(); ~SyncErrorNotifierFactory() override; diff --git a/chrome/browser/sync/sync_global_error_factory.cc b/chrome/browser/sync/sync_global_error_factory.cc index 13ec8dd..40f8c7b 100644 --- a/chrome/browser/sync/sync_global_error_factory.cc +++ b/chrome/browser/sync/sync_global_error_factory.cc @@ -35,7 +35,7 @@ SyncGlobalError* SyncGlobalErrorFactory::GetForProfile( // static SyncGlobalErrorFactory* SyncGlobalErrorFactory::GetInstance() { - return Singleton<SyncGlobalErrorFactory>::get(); + return base::Singleton<SyncGlobalErrorFactory>::get(); } KeyedService* SyncGlobalErrorFactory::BuildServiceInstanceFor( diff --git a/chrome/browser/sync/sync_global_error_factory.h b/chrome/browser/sync/sync_global_error_factory.h index 93a185d..5f11ba0 100644 --- a/chrome/browser/sync/sync_global_error_factory.h +++ b/chrome/browser/sync/sync_global_error_factory.h @@ -24,7 +24,7 @@ class SyncGlobalErrorFactory : public BrowserContextKeyedServiceFactory { static SyncGlobalErrorFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<SyncGlobalErrorFactory>; + friend struct base::DefaultSingletonTraits<SyncGlobalErrorFactory>; SyncGlobalErrorFactory(); ~SyncGlobalErrorFactory() override; diff --git a/chrome/browser/sync/test/integration/sync_app_helper.cc b/chrome/browser/sync/test/integration/sync_app_helper.cc index 4636196..1f28b36 100644 --- a/chrome/browser/sync/test/integration/sync_app_helper.cc +++ b/chrome/browser/sync/test/integration/sync_app_helper.cc @@ -116,7 +116,7 @@ AppStateMap GetAppStates(Profile* profile) { } // namespace SyncAppHelper* SyncAppHelper::GetInstance() { - SyncAppHelper* instance = Singleton<SyncAppHelper>::get(); + SyncAppHelper* instance = base::Singleton<SyncAppHelper>::get(); instance->SetupIfNecessary(sync_datatype_helper::test()); return instance; } diff --git a/chrome/browser/sync/test/integration/sync_app_helper.h b/chrome/browser/sync/test/integration/sync_app_helper.h index 05398a5..c3bac14 100644 --- a/chrome/browser/sync/test/integration/sync_app_helper.h +++ b/chrome/browser/sync/test/integration/sync_app_helper.h @@ -53,7 +53,7 @@ class SyncAppHelper { void FixNTPOrdinalCollisions(Profile* profile); private: - friend struct DefaultSingletonTraits<SyncAppHelper>; + friend struct base::DefaultSingletonTraits<SyncAppHelper>; SyncAppHelper(); ~SyncAppHelper(); diff --git a/chrome/browser/sync/test/integration/sync_app_list_helper.cc b/chrome/browser/sync/test/integration/sync_app_list_helper.cc index cf2dab9..94e7b59 100644 --- a/chrome/browser/sync/test/integration/sync_app_list_helper.cc +++ b/chrome/browser/sync/test/integration/sync_app_list_helper.cc @@ -25,7 +25,7 @@ using app_list::AppListSyncableService; using app_list::AppListSyncableServiceFactory; SyncAppListHelper* SyncAppListHelper::GetInstance() { - SyncAppListHelper* instance = Singleton<SyncAppListHelper>::get(); + SyncAppListHelper* instance = base::Singleton<SyncAppListHelper>::get(); instance->SetupIfNecessary(sync_datatype_helper::test()); return instance; } diff --git a/chrome/browser/sync/test/integration/sync_app_list_helper.h b/chrome/browser/sync/test/integration/sync_app_list_helper.h index 10112d2..9e4186a 100644 --- a/chrome/browser/sync/test/integration/sync_app_list_helper.h +++ b/chrome/browser/sync/test/integration/sync_app_list_helper.h @@ -51,7 +51,7 @@ class SyncAppListHelper { void PrintAppList(Profile* profile); private: - friend struct DefaultSingletonTraits<SyncAppListHelper>; + friend struct base::DefaultSingletonTraits<SyncAppListHelper>; SyncAppListHelper(); ~SyncAppListHelper(); diff --git a/chrome/browser/sync/test/integration/sync_extension_helper.cc b/chrome/browser/sync/test/integration/sync_extension_helper.cc index 5fd70c8..2b10e2d 100644 --- a/chrome/browser/sync/test/integration/sync_extension_helper.cc +++ b/chrome/browser/sync/test/integration/sync_extension_helper.cc @@ -52,7 +52,7 @@ bool SyncExtensionHelper::ExtensionState::Equals( // static SyncExtensionHelper* SyncExtensionHelper::GetInstance() { - SyncExtensionHelper* instance = Singleton<SyncExtensionHelper>::get(); + SyncExtensionHelper* instance = base::Singleton<SyncExtensionHelper>::get(); instance->SetupIfNecessary(sync_datatype_helper::test()); return instance; } diff --git a/chrome/browser/sync/test/integration/sync_extension_helper.h b/chrome/browser/sync/test/integration/sync_extension_helper.h index 378d8bf..99dfa08 100644 --- a/chrome/browser/sync/test/integration/sync_extension_helper.h +++ b/chrome/browser/sync/test/integration/sync_extension_helper.h @@ -101,7 +101,7 @@ class SyncExtensionHelper { typedef std::map<std::string, std::string> StringMap; typedef std::map<std::string, extensions::Manifest::Type> TypeMap; - friend struct DefaultSingletonTraits<SyncExtensionHelper>; + friend struct base::DefaultSingletonTraits<SyncExtensionHelper>; SyncExtensionHelper(); ~SyncExtensionHelper(); diff --git a/chrome/browser/sync_file_system/sync_file_system_service_factory.cc b/chrome/browser/sync_file_system/sync_file_system_service_factory.cc index 69ccbc5..410f7d1 100644 --- a/chrome/browser/sync_file_system/sync_file_system_service_factory.cc +++ b/chrome/browser/sync_file_system/sync_file_system_service_factory.cc @@ -25,7 +25,7 @@ SyncFileSystemService* SyncFileSystemServiceFactory::GetForProfile( // static SyncFileSystemServiceFactory* SyncFileSystemServiceFactory::GetInstance() { - return Singleton<SyncFileSystemServiceFactory>::get(); + return base::Singleton<SyncFileSystemServiceFactory>::get(); } void SyncFileSystemServiceFactory::set_mock_local_file_service( diff --git a/chrome/browser/sync_file_system/sync_file_system_service_factory.h b/chrome/browser/sync_file_system/sync_file_system_service_factory.h index c157678..88de867 100644 --- a/chrome/browser/sync_file_system/sync_file_system_service_factory.h +++ b/chrome/browser/sync_file_system/sync_file_system_service_factory.h @@ -35,7 +35,7 @@ class SyncFileSystemServiceFactory : public BrowserContextKeyedServiceFactory { scoped_ptr<RemoteFileSyncService> mock_remote_service); private: - friend struct DefaultSingletonTraits<SyncFileSystemServiceFactory>; + friend struct base::DefaultSingletonTraits<SyncFileSystemServiceFactory>; SyncFileSystemServiceFactory(); ~SyncFileSystemServiceFactory() override; diff --git a/chrome/browser/task_management/providers/web_contents/web_contents_tags_manager.cc b/chrome/browser/task_management/providers/web_contents/web_contents_tags_manager.cc index 8c13df2..3bd7a34 100644 --- a/chrome/browser/task_management/providers/web_contents/web_contents_tags_manager.cc +++ b/chrome/browser/task_management/providers/web_contents/web_contents_tags_manager.cc @@ -11,7 +11,7 @@ namespace task_management { // static WebContentsTagsManager* WebContentsTagsManager::GetInstance() { - return Singleton<WebContentsTagsManager>::get(); + return base::Singleton<WebContentsTagsManager>::get(); } void WebContentsTagsManager::AddTag(WebContentsTag* tag) { diff --git a/chrome/browser/task_management/providers/web_contents/web_contents_tags_manager.h b/chrome/browser/task_management/providers/web_contents/web_contents_tags_manager.h index 81aaa91..ad06501 100644 --- a/chrome/browser/task_management/providers/web_contents/web_contents_tags_manager.h +++ b/chrome/browser/task_management/providers/web_contents/web_contents_tags_manager.h @@ -9,8 +9,10 @@ #include "chrome/browser/task_management/providers/web_contents/web_contents_tag.h" +namespace base { template<typename T> struct DefaultSingletonTraits; +} // namespace base namespace task_management { @@ -44,7 +46,7 @@ class WebContentsTagsManager { } private: - friend struct DefaultSingletonTraits<WebContentsTagsManager>; + friend struct base::DefaultSingletonTraits<WebContentsTagsManager>; WebContentsTagsManager(); ~WebContentsTagsManager(); diff --git a/chrome/browser/task_manager/task_manager.cc b/chrome/browser/task_manager/task_manager.cc index b46c6f5..f89ad83 100644 --- a/chrome/browser/task_manager/task_manager.cc +++ b/chrome/browser/task_manager/task_manager.cc @@ -1548,7 +1548,7 @@ void TaskManager::ModelChanged() { // static TaskManager* TaskManager::GetInstance() { - return Singleton<TaskManager>::get(); + return base::Singleton<TaskManager>::get(); } void TaskManager::OpenAboutMemory(chrome::HostDesktopType desktop_type) { diff --git a/chrome/browser/task_manager/task_manager.h b/chrome/browser/task_manager/task_manager.h index 13299b6..4ed4f0c 100644 --- a/chrome/browser/task_manager/task_manager.h +++ b/chrome/browser/task_manager/task_manager.h @@ -99,7 +99,7 @@ class TaskManager { // Obtain an instance via GetInstance(). TaskManager(); - friend struct DefaultSingletonTraits<TaskManager>; + friend struct base::DefaultSingletonTraits<TaskManager>; ~TaskManager(); diff --git a/chrome/browser/themes/theme_service_factory.cc b/chrome/browser/themes/theme_service_factory.cc index 1858854..0ec15cd 100644 --- a/chrome/browser/themes/theme_service_factory.cc +++ b/chrome/browser/themes/theme_service_factory.cc @@ -39,7 +39,7 @@ const extensions::Extension* ThemeServiceFactory::GetThemeForProfile( // static ThemeServiceFactory* ThemeServiceFactory::GetInstance() { - return Singleton<ThemeServiceFactory>::get(); + return base::Singleton<ThemeServiceFactory>::get(); } ThemeServiceFactory::ThemeServiceFactory() diff --git a/chrome/browser/themes/theme_service_factory.h b/chrome/browser/themes/theme_service_factory.h index 8d3320a..5644034 100644 --- a/chrome/browser/themes/theme_service_factory.h +++ b/chrome/browser/themes/theme_service_factory.h @@ -34,7 +34,7 @@ class ThemeServiceFactory : public BrowserContextKeyedServiceFactory { static ThemeServiceFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<ThemeServiceFactory>; + friend struct base::DefaultSingletonTraits<ThemeServiceFactory>; ThemeServiceFactory(); ~ThemeServiceFactory() override; diff --git a/chrome/browser/thumbnails/thumbnail_service_factory.cc b/chrome/browser/thumbnails/thumbnail_service_factory.cc index 1daa9bc..4496735 100644 --- a/chrome/browser/thumbnails/thumbnail_service_factory.cc +++ b/chrome/browser/thumbnails/thumbnail_service_factory.cc @@ -32,7 +32,7 @@ scoped_refptr<ThumbnailService> ThumbnailServiceFactory::GetForProfile( // static ThumbnailServiceFactory* ThumbnailServiceFactory::GetInstance() { - return Singleton<ThumbnailServiceFactory>::get(); + return base::Singleton<ThumbnailServiceFactory>::get(); } scoped_refptr<RefcountedKeyedService> diff --git a/chrome/browser/thumbnails/thumbnail_service_factory.h b/chrome/browser/thumbnails/thumbnail_service_factory.h index 921721d..bea81ba 100644 --- a/chrome/browser/thumbnails/thumbnail_service_factory.h +++ b/chrome/browser/thumbnails/thumbnail_service_factory.h @@ -31,7 +31,7 @@ class ThumbnailServiceFactory static ThumbnailServiceFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<ThumbnailServiceFactory>; + friend struct base::DefaultSingletonTraits<ThumbnailServiceFactory>; ThumbnailServiceFactory(); ~ThumbnailServiceFactory() override; diff --git a/chrome/browser/translate/translate_accept_languages_factory.cc b/chrome/browser/translate/translate_accept_languages_factory.cc index 22ec3b6..eba6735 100644 --- a/chrome/browser/translate/translate_accept_languages_factory.cc +++ b/chrome/browser/translate/translate_accept_languages_factory.cc @@ -42,7 +42,7 @@ TranslateAcceptLanguagesService::~TranslateAcceptLanguagesService() {} // static TranslateAcceptLanguagesFactory* TranslateAcceptLanguagesFactory::GetInstance() { - return Singleton<TranslateAcceptLanguagesFactory>::get(); + return base::Singleton<TranslateAcceptLanguagesFactory>::get(); } // static diff --git a/chrome/browser/translate/translate_accept_languages_factory.h b/chrome/browser/translate/translate_accept_languages_factory.h index 98b5ac0..7215da3 100644 --- a/chrome/browser/translate/translate_accept_languages_factory.h +++ b/chrome/browser/translate/translate_accept_languages_factory.h @@ -23,7 +23,7 @@ class TranslateAcceptLanguagesFactory static TranslateAcceptLanguagesFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<TranslateAcceptLanguagesFactory>; + friend struct base::DefaultSingletonTraits<TranslateAcceptLanguagesFactory>; TranslateAcceptLanguagesFactory(); ~TranslateAcceptLanguagesFactory() override; diff --git a/chrome/browser/ui/app_list/app_list_prefs_factory.cc b/chrome/browser/ui/app_list/app_list_prefs_factory.cc index fcca1f0..ddb0f9a 100644 --- a/chrome/browser/ui/app_list/app_list_prefs_factory.cc +++ b/chrome/browser/ui/app_list/app_list_prefs_factory.cc @@ -22,7 +22,7 @@ AppListPrefs* AppListPrefsFactory::GetForBrowserContext( // static AppListPrefsFactory* AppListPrefsFactory::GetInstance() { - return Singleton<AppListPrefsFactory>::get(); + return base::Singleton<AppListPrefsFactory>::get(); } void AppListPrefsFactory::SetInstanceForTesting( diff --git a/chrome/browser/ui/app_list/app_list_prefs_factory.h b/chrome/browser/ui/app_list/app_list_prefs_factory.h index febbff7..f137816 100644 --- a/chrome/browser/ui/app_list/app_list_prefs_factory.h +++ b/chrome/browser/ui/app_list/app_list_prefs_factory.h @@ -23,7 +23,7 @@ class AppListPrefsFactory : public BrowserContextKeyedServiceFactory { scoped_ptr<AppListPrefs> prefs); private: - friend struct DefaultSingletonTraits<AppListPrefsFactory>; + friend struct base::DefaultSingletonTraits<AppListPrefsFactory>; AppListPrefsFactory(); ~AppListPrefsFactory() override; diff --git a/chrome/browser/ui/app_list/app_list_service_cocoa_mac.h b/chrome/browser/ui/app_list/app_list_service_cocoa_mac.h index ba5f511..9bc8df5 100644 --- a/chrome/browser/ui/app_list/app_list_service_cocoa_mac.h +++ b/chrome/browser/ui/app_list/app_list_service_cocoa_mac.h @@ -14,8 +14,10 @@ class AppListServiceMacTestApi; class AppListControllerDelegateImpl; @class AppListWindowController; +namespace base { template <typename T> struct DefaultSingletonTraits; +} // namespace base // AppListServiceCocoaMac shows and hides the Cocoa app list on Mac. class AppListServiceCocoaMac : public AppListServiceMac { @@ -40,7 +42,7 @@ class AppListServiceCocoaMac : public AppListServiceMac { private: friend class test::AppListServiceMacTestApi; - friend struct DefaultSingletonTraits<AppListServiceCocoaMac>; + friend struct base::DefaultSingletonTraits<AppListServiceCocoaMac>; AppListServiceCocoaMac(); diff --git a/chrome/browser/ui/app_list/app_list_service_cocoa_mac.mm b/chrome/browser/ui/app_list/app_list_service_cocoa_mac.mm index 765f447..38b7c66 100644 --- a/chrome/browser/ui/app_list/app_list_service_cocoa_mac.mm +++ b/chrome/browser/ui/app_list/app_list_service_cocoa_mac.mm @@ -15,8 +15,9 @@ AppListServiceCocoaMac::~AppListServiceCocoaMac() { // static AppListServiceCocoaMac* AppListServiceCocoaMac::GetInstance() { - return Singleton<AppListServiceCocoaMac, - LeakySingletonTraits<AppListServiceCocoaMac>>::get(); + return base::Singleton< + AppListServiceCocoaMac, + base::LeakySingletonTraits<AppListServiceCocoaMac>>::get(); } void AppListServiceCocoaMac::ShowForProfile(Profile* requested_profile) { diff --git a/chrome/browser/ui/app_list/app_list_service_disabled.cc b/chrome/browser/ui/app_list/app_list_service_disabled.cc index 25293ae..cdb4f4e 100644 --- a/chrome/browser/ui/app_list/app_list_service_disabled.cc +++ b/chrome/browser/ui/app_list/app_list_service_disabled.cc @@ -11,12 +11,13 @@ namespace { class AppListServiceDisabled : public AppListService { public: static AppListServiceDisabled* GetInstance() { - return Singleton<AppListServiceDisabled, - LeakySingletonTraits<AppListServiceDisabled> >::get(); + return base::Singleton< + AppListServiceDisabled, + base::LeakySingletonTraits<AppListServiceDisabled>>::get(); } private: - friend struct DefaultSingletonTraits<AppListServiceDisabled>; + friend struct base::DefaultSingletonTraits<AppListServiceDisabled>; AppListServiceDisabled() {} diff --git a/chrome/browser/ui/app_list/app_list_syncable_service_factory.cc b/chrome/browser/ui/app_list/app_list_syncable_service_factory.cc index 06e73ce..2c96dc2 100644 --- a/chrome/browser/ui/app_list/app_list_syncable_service_factory.cc +++ b/chrome/browser/ui/app_list/app_list_syncable_service_factory.cc @@ -31,7 +31,7 @@ AppListSyncableService* AppListSyncableServiceFactory::GetForProfile( // static AppListSyncableServiceFactory* AppListSyncableServiceFactory::GetInstance() { - return Singleton<AppListSyncableServiceFactory>::get(); + return base::Singleton<AppListSyncableServiceFactory>::get(); } // static diff --git a/chrome/browser/ui/app_list/app_list_syncable_service_factory.h b/chrome/browser/ui/app_list/app_list_syncable_service_factory.h index feaa743..e8faff9 100644 --- a/chrome/browser/ui/app_list/app_list_syncable_service_factory.h +++ b/chrome/browser/ui/app_list/app_list_syncable_service_factory.h @@ -29,7 +29,7 @@ class AppListSyncableServiceFactory : public BrowserContextKeyedServiceFactory { content::BrowserContext* browser_context); private: - friend struct DefaultSingletonTraits<AppListSyncableServiceFactory>; + friend struct base::DefaultSingletonTraits<AppListSyncableServiceFactory>; AppListSyncableServiceFactory(); ~AppListSyncableServiceFactory() override; diff --git a/chrome/browser/ui/app_list/search/common/webservice_cache_factory.cc b/chrome/browser/ui/app_list/search/common/webservice_cache_factory.cc index 73e273f..d55c8a1 100644 --- a/chrome/browser/ui/app_list/search/common/webservice_cache_factory.cc +++ b/chrome/browser/ui/app_list/search/common/webservice_cache_factory.cc @@ -12,7 +12,7 @@ namespace app_list { // static WebserviceCacheFactory* WebserviceCacheFactory::GetInstance() { - return Singleton<WebserviceCacheFactory>::get(); + return base::Singleton<WebserviceCacheFactory>::get(); } // static diff --git a/chrome/browser/ui/app_list/search/common/webservice_cache_factory.h b/chrome/browser/ui/app_list/search/common/webservice_cache_factory.h index c3e9715..9873015 100644 --- a/chrome/browser/ui/app_list/search/common/webservice_cache_factory.h +++ b/chrome/browser/ui/app_list/search/common/webservice_cache_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 content { class BrowserContext; @@ -28,7 +30,7 @@ class WebserviceCacheFactory : public BrowserContextKeyedServiceFactory { content::BrowserContext* context); private: - friend struct DefaultSingletonTraits<WebserviceCacheFactory>; + friend struct base::DefaultSingletonTraits<WebserviceCacheFactory>; WebserviceCacheFactory(); ~WebserviceCacheFactory() override; diff --git a/chrome/browser/ui/app_list/search/history_factory.cc b/chrome/browser/ui/app_list/search/history_factory.cc index a3097b6..a8dacd3 100644 --- a/chrome/browser/ui/app_list/search/history_factory.cc +++ b/chrome/browser/ui/app_list/search/history_factory.cc @@ -17,7 +17,7 @@ namespace app_list { // static HistoryFactory* HistoryFactory::GetInstance() { - return Singleton<HistoryFactory>::get(); + return base::Singleton<HistoryFactory>::get(); } // static diff --git a/chrome/browser/ui/app_list/search/history_factory.h b/chrome/browser/ui/app_list/search/history_factory.h index 055d4af..4a0f6af 100644 --- a/chrome/browser/ui/app_list/search/history_factory.h +++ b/chrome/browser/ui/app_list/search/history_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 content { class BrowserContext; @@ -27,7 +29,7 @@ class HistoryFactory : public BrowserContextKeyedServiceFactory { static History* GetForBrowserContext(content::BrowserContext* context); private: - friend struct DefaultSingletonTraits<HistoryFactory>; + friend struct base::DefaultSingletonTraits<HistoryFactory>; HistoryFactory(); ~HistoryFactory() override; diff --git a/chrome/browser/ui/app_list/start_page_service_factory.cc b/chrome/browser/ui/app_list/start_page_service_factory.cc index 093711b..d5f8a72 100644 --- a/chrome/browser/ui/app_list/start_page_service_factory.cc +++ b/chrome/browser/ui/app_list/start_page_service_factory.cc @@ -31,7 +31,7 @@ StartPageService* StartPageServiceFactory::GetForProfile(Profile* profile) { // static StartPageServiceFactory* StartPageServiceFactory::GetInstance() { - return Singleton<StartPageServiceFactory>::get(); + return base::Singleton<StartPageServiceFactory>::get(); } StartPageServiceFactory::StartPageServiceFactory() diff --git a/chrome/browser/ui/app_list/start_page_service_factory.h b/chrome/browser/ui/app_list/start_page_service_factory.h index e023ca8..93afd18 100644 --- a/chrome/browser/ui/app_list/start_page_service_factory.h +++ b/chrome/browser/ui/app_list/start_page_service_factory.h @@ -24,7 +24,7 @@ class StartPageServiceFactory : public BrowserContextKeyedServiceFactory { static StartPageServiceFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<StartPageServiceFactory>; + friend struct base::DefaultSingletonTraits<StartPageServiceFactory>; StartPageServiceFactory(); ~StartPageServiceFactory() override; diff --git a/chrome/browser/ui/apps/chrome_app_window_client.cc b/chrome/browser/ui/apps/chrome_app_window_client.cc index 4cb3a1b..9cf6b04 100644 --- a/chrome/browser/ui/apps/chrome_app_window_client.cc +++ b/chrome/browser/ui/apps/chrome_app_window_client.cc @@ -27,8 +27,9 @@ ChromeAppWindowClient::~ChromeAppWindowClient() { // static ChromeAppWindowClient* ChromeAppWindowClient::GetInstance() { - return Singleton<ChromeAppWindowClient, - LeakySingletonTraits<ChromeAppWindowClient> >::get(); + return base::Singleton< + ChromeAppWindowClient, + base::LeakySingletonTraits<ChromeAppWindowClient>>::get(); } extensions::AppWindow* ChromeAppWindowClient::CreateAppWindow( diff --git a/chrome/browser/ui/apps/chrome_app_window_client.h b/chrome/browser/ui/apps/chrome_app_window_client.h index 8e60108..3f4378d 100644 --- a/chrome/browser/ui/apps/chrome_app_window_client.h +++ b/chrome/browser/ui/apps/chrome_app_window_client.h @@ -9,8 +9,10 @@ #include "base/compiler_specific.h" #include "extensions/browser/app_window/app_window_client.h" +namespace base { template <typename T> struct DefaultSingletonTraits; +} // The implementation of AppWindowClient for Chrome. class ChromeAppWindowClient : public extensions::AppWindowClient { @@ -22,7 +24,7 @@ class ChromeAppWindowClient : public extensions::AppWindowClient { static ChromeAppWindowClient* GetInstance(); private: - friend struct DefaultSingletonTraits<ChromeAppWindowClient>; + friend struct base::DefaultSingletonTraits<ChromeAppWindowClient>; // extensions::AppWindowClient extensions::AppWindow* CreateAppWindow( diff --git a/chrome/browser/ui/ash/app_list/app_list_service_ash.cc b/chrome/browser/ui/ash/app_list/app_list_service_ash.cc index d46fe3e..b5ce2a0 100644 --- a/chrome/browser/ui/ash/app_list/app_list_service_ash.cc +++ b/chrome/browser/ui/ash/app_list/app_list_service_ash.cc @@ -18,8 +18,8 @@ // static AppListServiceAsh* AppListServiceAsh::GetInstance() { - return Singleton<AppListServiceAsh, - LeakySingletonTraits<AppListServiceAsh> >::get(); + return base::Singleton<AppListServiceAsh, + base::LeakySingletonTraits<AppListServiceAsh>>::get(); } AppListServiceAsh::AppListServiceAsh() diff --git a/chrome/browser/ui/ash/app_list/app_list_service_ash.h b/chrome/browser/ui/ash/app_list/app_list_service_ash.h index 62e3ae6..f11f709 100644 --- a/chrome/browser/ui/ash/app_list/app_list_service_ash.h +++ b/chrome/browser/ui/ash/app_list/app_list_service_ash.h @@ -10,7 +10,10 @@ #include "ui/app_list/app_list_model.h" class AppListControllerDelegateAsh; + +namespace base { template <typename T> struct DefaultSingletonTraits; +} // AppListServiceAsh wraps functionality in ChromeLauncherController and the Ash // Shell for showing and hiding the app list on the Ash desktop. @@ -28,7 +31,7 @@ class AppListServiceAsh : public AppListServiceImpl { void OnProfileWillBeRemoved(const base::FilePath& profile_path) override; private: - friend struct DefaultSingletonTraits<AppListServiceAsh>; + friend struct base::DefaultSingletonTraits<AppListServiceAsh>; AppListServiceAsh(); ~AppListServiceAsh() override; diff --git a/chrome/browser/ui/ash/app_sync_ui_state_factory.cc b/chrome/browser/ui/ash/app_sync_ui_state_factory.cc index 89e56053..7688a76 100644 --- a/chrome/browser/ui/ash/app_sync_ui_state_factory.cc +++ b/chrome/browser/ui/ash/app_sync_ui_state_factory.cc @@ -21,7 +21,7 @@ AppSyncUIState* AppSyncUIStateFactory::GetForProfile(Profile* profile) { // static AppSyncUIStateFactory* AppSyncUIStateFactory::GetInstance() { - return Singleton<AppSyncUIStateFactory>::get(); + return base::Singleton<AppSyncUIStateFactory>::get(); } AppSyncUIStateFactory::AppSyncUIStateFactory() diff --git a/chrome/browser/ui/ash/app_sync_ui_state_factory.h b/chrome/browser/ui/ash/app_sync_ui_state_factory.h index 53c2fde..99c830b 100644 --- a/chrome/browser/ui/ash/app_sync_ui_state_factory.h +++ b/chrome/browser/ui/ash/app_sync_ui_state_factory.h @@ -21,7 +21,7 @@ class AppSyncUIStateFactory : public BrowserContextKeyedServiceFactory { static AppSyncUIStateFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<AppSyncUIStateFactory>; + friend struct base::DefaultSingletonTraits<AppSyncUIStateFactory>; AppSyncUIStateFactory(); ~AppSyncUIStateFactory() override; diff --git a/chrome/browser/ui/aura/accessibility/automation_manager_aura.cc b/chrome/browser/ui/aura/accessibility/automation_manager_aura.cc index 17b2382..b110a87 100644 --- a/chrome/browser/ui/aura/accessibility/automation_manager_aura.cc +++ b/chrome/browser/ui/aura/accessibility/automation_manager_aura.cc @@ -28,7 +28,7 @@ using extensions::AutomationEventRouter; // static AutomationManagerAura* AutomationManagerAura::GetInstance() { - return Singleton<AutomationManagerAura>::get(); + return base::Singleton<AutomationManagerAura>::get(); } void AutomationManagerAura::Enable(BrowserContext* context) { diff --git a/chrome/browser/ui/aura/accessibility/automation_manager_aura.h b/chrome/browser/ui/aura/accessibility/automation_manager_aura.h index 7d11622..98cfe7f 100644 --- a/chrome/browser/ui/aura/accessibility/automation_manager_aura.h +++ b/chrome/browser/ui/aura/accessibility/automation_manager_aura.h @@ -11,8 +11,10 @@ #include "chrome/browser/ui/aura/accessibility/ax_tree_source_aura.h" #include "ui/accessibility/ax_tree_serializer.h" +namespace base { template <typename T> struct DefaultSingletonTraits; +} // namespace base namespace content { class BrowserContext; @@ -53,7 +55,7 @@ class AutomationManagerAura : public extensions::AutomationActionAdapter { void ShowContextMenu(int32 id) override; private: - friend struct DefaultSingletonTraits<AutomationManagerAura>; + friend struct base::DefaultSingletonTraits<AutomationManagerAura>; AutomationManagerAura(); virtual ~AutomationManagerAura(); diff --git a/chrome/browser/ui/bookmarks/enhanced_bookmark_key_service_factory.cc b/chrome/browser/ui/bookmarks/enhanced_bookmark_key_service_factory.cc index ff2b876..36d71c4 100644 --- a/chrome/browser/ui/bookmarks/enhanced_bookmark_key_service_factory.cc +++ b/chrome/browser/ui/bookmarks/enhanced_bookmark_key_service_factory.cc @@ -12,7 +12,7 @@ // static EnhancedBookmarkKeyServiceFactory* EnhancedBookmarkKeyServiceFactory::GetInstance() { - return Singleton<EnhancedBookmarkKeyServiceFactory>::get(); + return base::Singleton<EnhancedBookmarkKeyServiceFactory>::get(); } EnhancedBookmarkKeyServiceFactory::EnhancedBookmarkKeyServiceFactory() diff --git a/chrome/browser/ui/bookmarks/enhanced_bookmark_key_service_factory.h b/chrome/browser/ui/bookmarks/enhanced_bookmark_key_service_factory.h index 5d6ce10..1c9dcaa 100644 --- a/chrome/browser/ui/bookmarks/enhanced_bookmark_key_service_factory.h +++ b/chrome/browser/ui/bookmarks/enhanced_bookmark_key_service_factory.h @@ -12,7 +12,9 @@ namespace content { class BrowserContext; } // namespace content +namespace base { template <typename T> struct DefaultSingletonTraits; +} class EnhancedBookmarkKeyService; @@ -24,7 +26,7 @@ class EnhancedBookmarkKeyServiceFactory static EnhancedBookmarkKeyServiceFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<EnhancedBookmarkKeyServiceFactory>; + friend struct base::DefaultSingletonTraits<EnhancedBookmarkKeyServiceFactory>; EnhancedBookmarkKeyServiceFactory(); ~EnhancedBookmarkKeyServiceFactory() override; diff --git a/chrome/browser/ui/cocoa/accelerators_cocoa.h b/chrome/browser/ui/cocoa/accelerators_cocoa.h index e29eefb..5c89619 100644 --- a/chrome/browser/ui/cocoa/accelerators_cocoa.h +++ b/chrome/browser/ui/cocoa/accelerators_cocoa.h @@ -13,7 +13,10 @@ #include "base/gtest_prod_util.h" #include "ui/base/accelerators/accelerator.h" -template <typename T> struct DefaultSingletonTraits; +namespace base { +template <typename T> +struct DefaultSingletonTraits; +} // namespace base // This class maintains a map of command_ids to Accelerator objects (see // chrome/app/chrome_command_ids.h). Currently, this only lists the commands @@ -47,7 +50,7 @@ class AcceleratorsCocoa { static AcceleratorsCocoa* GetInstance(); private: - friend struct DefaultSingletonTraits<AcceleratorsCocoa>; + friend struct base::DefaultSingletonTraits<AcceleratorsCocoa>; FRIEND_TEST_ALL_PREFIXES(AcceleratorsCocoaBrowserTest, MappingAcceleratorsInMainMenu); diff --git a/chrome/browser/ui/cocoa/accelerators_cocoa.mm b/chrome/browser/ui/cocoa/accelerators_cocoa.mm index 2ef18bd..ee41e6e 100644 --- a/chrome/browser/ui/cocoa/accelerators_cocoa.mm +++ b/chrome/browser/ui/cocoa/accelerators_cocoa.mm @@ -151,7 +151,7 @@ AcceleratorsCocoa::~AcceleratorsCocoa() {} // static AcceleratorsCocoa* AcceleratorsCocoa::GetInstance() { - return Singleton<AcceleratorsCocoa>::get(); + return base::Singleton<AcceleratorsCocoa>::get(); } const ui::Accelerator* AcceleratorsCocoa::GetAcceleratorForCommand( diff --git a/chrome/browser/ui/find_bar/find_bar_state_factory.cc b/chrome/browser/ui/find_bar/find_bar_state_factory.cc index ddffb9f..95e282d 100644 --- a/chrome/browser/ui/find_bar/find_bar_state_factory.cc +++ b/chrome/browser/ui/find_bar/find_bar_state_factory.cc @@ -31,7 +31,7 @@ base::string16 FindBarStateFactory::GetLastPrepopulateText(Profile* p) { // static FindBarStateFactory* FindBarStateFactory::GetInstance() { - return Singleton<FindBarStateFactory>::get(); + return base::Singleton<FindBarStateFactory>::get(); } FindBarStateFactory::FindBarStateFactory() diff --git a/chrome/browser/ui/find_bar/find_bar_state_factory.h b/chrome/browser/ui/find_bar/find_bar_state_factory.h index 42ed94a..f3fa538 100644 --- a/chrome/browser/ui/find_bar/find_bar_state_factory.h +++ b/chrome/browser/ui/find_bar/find_bar_state_factory.h @@ -25,7 +25,7 @@ class FindBarStateFactory : public BrowserContextKeyedServiceFactory { static FindBarStateFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<FindBarStateFactory>; + friend struct base::DefaultSingletonTraits<FindBarStateFactory>; FindBarStateFactory(); ~FindBarStateFactory() override; diff --git a/chrome/browser/ui/gesture_prefs_observer_factory_aura.cc b/chrome/browser/ui/gesture_prefs_observer_factory_aura.cc index 3f9927b..b971726 100644 --- a/chrome/browser/ui/gesture_prefs_observer_factory_aura.cc +++ b/chrome/browser/ui/gesture_prefs_observer_factory_aura.cc @@ -183,7 +183,7 @@ void GesturePrefsObserver::Notify() { // static GesturePrefsObserverFactoryAura* GesturePrefsObserverFactoryAura::GetInstance() { - return Singleton<GesturePrefsObserverFactoryAura>::get(); + return base::Singleton<GesturePrefsObserverFactoryAura>::get(); } GesturePrefsObserverFactoryAura::GesturePrefsObserverFactoryAura() diff --git a/chrome/browser/ui/gesture_prefs_observer_factory_aura.h b/chrome/browser/ui/gesture_prefs_observer_factory_aura.h index bd3514a..9783253 100644 --- a/chrome/browser/ui/gesture_prefs_observer_factory_aura.h +++ b/chrome/browser/ui/gesture_prefs_observer_factory_aura.h @@ -19,7 +19,7 @@ class GesturePrefsObserverFactoryAura static GesturePrefsObserverFactoryAura* GetInstance(); private: - friend struct DefaultSingletonTraits<GesturePrefsObserverFactoryAura>; + friend struct base::DefaultSingletonTraits<GesturePrefsObserverFactoryAura>; GesturePrefsObserverFactoryAura(); ~GesturePrefsObserverFactoryAura() override; diff --git a/chrome/browser/ui/global_error/global_error_service_factory.cc b/chrome/browser/ui/global_error/global_error_service_factory.cc index 38b77cc..819d50e 100644 --- a/chrome/browser/ui/global_error/global_error_service_factory.cc +++ b/chrome/browser/ui/global_error/global_error_service_factory.cc @@ -17,7 +17,7 @@ GlobalErrorService* GlobalErrorServiceFactory::GetForProfile(Profile* profile) { // static GlobalErrorServiceFactory* GlobalErrorServiceFactory::GetInstance() { - return Singleton<GlobalErrorServiceFactory>::get(); + return base::Singleton<GlobalErrorServiceFactory>::get(); } GlobalErrorServiceFactory::GlobalErrorServiceFactory() diff --git a/chrome/browser/ui/global_error/global_error_service_factory.h b/chrome/browser/ui/global_error/global_error_service_factory.h index a1a8834..f4f2f41 100644 --- a/chrome/browser/ui/global_error/global_error_service_factory.h +++ b/chrome/browser/ui/global_error/global_error_service_factory.h @@ -23,7 +23,7 @@ class GlobalErrorServiceFactory : public BrowserContextKeyedServiceFactory { static GlobalErrorServiceFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<GlobalErrorServiceFactory>; + friend struct base::DefaultSingletonTraits<GlobalErrorServiceFactory>; GlobalErrorServiceFactory(); ~GlobalErrorServiceFactory() override; diff --git a/chrome/browser/ui/libgtk2ui/g_object_destructor_filo.cc b/chrome/browser/ui/libgtk2ui/g_object_destructor_filo.cc index 2e7eb77..54ed7ee 100644 --- a/chrome/browser/ui/libgtk2ui/g_object_destructor_filo.cc +++ b/chrome/browser/ui/libgtk2ui/g_object_destructor_filo.cc @@ -21,7 +21,7 @@ GObjectDestructorFILO::~GObjectDestructorFILO() { // static GObjectDestructorFILO* GObjectDestructorFILO::GetInstance() { - return Singleton<GObjectDestructorFILO>::get(); + return base::Singleton<GObjectDestructorFILO>::get(); } void GObjectDestructorFILO::Connect( diff --git a/chrome/browser/ui/libgtk2ui/g_object_destructor_filo.h b/chrome/browser/ui/libgtk2ui/g_object_destructor_filo.h index d51de50..b32f3df 100644 --- a/chrome/browser/ui/libgtk2ui/g_object_destructor_filo.h +++ b/chrome/browser/ui/libgtk2ui/g_object_destructor_filo.h @@ -11,7 +11,9 @@ #include "base/basictypes.h" +namespace base { template <typename T> struct DefaultSingletonTraits; +} typedef struct _GObject GObject; @@ -72,7 +74,7 @@ class GObjectDestructorFILO { GObjectDestructorFILO(); ~GObjectDestructorFILO(); - friend struct DefaultSingletonTraits<GObjectDestructorFILO>; + friend struct base::DefaultSingletonTraits<GObjectDestructorFILO>; void WeakNotify(GObject* where_the_object_was); static void WeakNotifyThunk(gpointer data, GObject* where_the_object_was) { diff --git a/chrome/browser/ui/libgtk2ui/gtk2_event_loop.cc b/chrome/browser/ui/libgtk2ui/gtk2_event_loop.cc index e48c186..b77de95 100644 --- a/chrome/browser/ui/libgtk2ui/gtk2_event_loop.cc +++ b/chrome/browser/ui/libgtk2ui/gtk2_event_loop.cc @@ -16,7 +16,7 @@ namespace libgtk2ui { // static Gtk2EventLoop* Gtk2EventLoop::GetInstance() { - return Singleton<Gtk2EventLoop>::get(); + return base::Singleton<Gtk2EventLoop>::get(); } Gtk2EventLoop::Gtk2EventLoop() { diff --git a/chrome/browser/ui/libgtk2ui/gtk2_event_loop.h b/chrome/browser/ui/libgtk2ui/gtk2_event_loop.h index 0bd2a21..5ba99d5 100644 --- a/chrome/browser/ui/libgtk2ui/gtk2_event_loop.h +++ b/chrome/browser/ui/libgtk2ui/gtk2_event_loop.h @@ -11,7 +11,9 @@ typedef union _GdkEvent GdkEvent; typedef struct _GdkEventKey GdkEventKey; +namespace base { template<typename Type> struct DefaultSingletonTraits; +} namespace libgtk2ui { @@ -20,7 +22,7 @@ class Gtk2EventLoop { static Gtk2EventLoop* GetInstance(); private: - friend struct DefaultSingletonTraits<Gtk2EventLoop>; + friend struct base::DefaultSingletonTraits<Gtk2EventLoop>; Gtk2EventLoop(); ~Gtk2EventLoop(); diff --git a/chrome/browser/ui/prefs/prefs_tab_helper.cc b/chrome/browser/ui/prefs/prefs_tab_helper.cc index 5cfb237..1cf523f 100644 --- a/chrome/browser/ui/prefs/prefs_tab_helper.cc +++ b/chrome/browser/ui/prefs/prefs_tab_helper.cc @@ -414,11 +414,11 @@ class PrefWatcherFactory : public BrowserContextKeyedServiceFactory { } static PrefWatcherFactory* GetInstance() { - return Singleton<PrefWatcherFactory>::get(); + return base::Singleton<PrefWatcherFactory>::get(); } private: - friend struct DefaultSingletonTraits<PrefWatcherFactory>; + friend struct base::DefaultSingletonTraits<PrefWatcherFactory>; PrefWatcherFactory() : BrowserContextKeyedServiceFactory( "PrefWatcher", diff --git a/chrome/browser/ui/search/new_tab_page_interceptor_service_factory.cc b/chrome/browser/ui/search/new_tab_page_interceptor_service_factory.cc index f78caa8..0aa1181 100644 --- a/chrome/browser/ui/search/new_tab_page_interceptor_service_factory.cc +++ b/chrome/browser/ui/search/new_tab_page_interceptor_service_factory.cc @@ -15,7 +15,7 @@ NewTabPageInterceptorServiceFactory* NewTabPageInterceptorServiceFactory::GetInstance() { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); - return Singleton<NewTabPageInterceptorServiceFactory>::get(); + return base::Singleton<NewTabPageInterceptorServiceFactory>::get(); } // static diff --git a/chrome/browser/ui/search/new_tab_page_interceptor_service_factory.h b/chrome/browser/ui/search/new_tab_page_interceptor_service_factory.h index fe7a78f..66de3f29 100644 --- a/chrome/browser/ui/search/new_tab_page_interceptor_service_factory.h +++ b/chrome/browser/ui/search/new_tab_page_interceptor_service_factory.h @@ -28,7 +28,8 @@ class NewTabPageInterceptorServiceFactory static NewTabPageInterceptorServiceFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<NewTabPageInterceptorServiceFactory>; + friend struct base::DefaultSingletonTraits< + NewTabPageInterceptorServiceFactory>; NewTabPageInterceptorServiceFactory(); ~NewTabPageInterceptorServiceFactory() override; diff --git a/chrome/browser/ui/settings_window_manager.cc b/chrome/browser/ui/settings_window_manager.cc index 5e4954b..d050e61 100644 --- a/chrome/browser/ui/settings_window_manager.cc +++ b/chrome/browser/ui/settings_window_manager.cc @@ -20,7 +20,7 @@ namespace chrome { // static SettingsWindowManager* SettingsWindowManager::GetInstance() { - return Singleton<SettingsWindowManager>::get(); + return base::Singleton<SettingsWindowManager>::get(); } void SettingsWindowManager::AddObserver( diff --git a/chrome/browser/ui/settings_window_manager.h b/chrome/browser/ui/settings_window_manager.h index 5618dc2..16c1aff 100644 --- a/chrome/browser/ui/settings_window_manager.h +++ b/chrome/browser/ui/settings_window_manager.h @@ -42,7 +42,7 @@ class SettingsWindowManager { bool IsSettingsBrowser(Browser* browser) const; private: - friend struct DefaultSingletonTraits<SettingsWindowManager>; + friend struct base::DefaultSingletonTraits<SettingsWindowManager>; typedef std::map<Profile*, SessionID::id_type> ProfileSessionMap; SettingsWindowManager(); diff --git a/chrome/browser/ui/tabs/pinned_tab_service_factory.cc b/chrome/browser/ui/tabs/pinned_tab_service_factory.cc index 24ecf5f..9c12410 100644 --- a/chrome/browser/ui/tabs/pinned_tab_service_factory.cc +++ b/chrome/browser/ui/tabs/pinned_tab_service_factory.cc @@ -16,7 +16,7 @@ PinnedTabService* PinnedTabServiceFactory::GetForProfile( } PinnedTabServiceFactory* PinnedTabServiceFactory::GetInstance() { - return Singleton<PinnedTabServiceFactory>::get(); + return base::Singleton<PinnedTabServiceFactory>::get(); } PinnedTabServiceFactory::PinnedTabServiceFactory() diff --git a/chrome/browser/ui/tabs/pinned_tab_service_factory.h b/chrome/browser/ui/tabs/pinned_tab_service_factory.h index 893db977..088bc39 100644 --- a/chrome/browser/ui/tabs/pinned_tab_service_factory.h +++ b/chrome/browser/ui/tabs/pinned_tab_service_factory.h @@ -23,7 +23,7 @@ class PinnedTabServiceFactory : public BrowserContextKeyedServiceFactory { static PinnedTabServiceFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<PinnedTabServiceFactory>; + friend struct base::DefaultSingletonTraits<PinnedTabServiceFactory>; PinnedTabServiceFactory(); ~PinnedTabServiceFactory() override; diff --git a/chrome/browser/ui/toolbar/toolbar_actions_model_factory.cc b/chrome/browser/ui/toolbar/toolbar_actions_model_factory.cc index b6e80ee..87e8da4 100644 --- a/chrome/browser/ui/toolbar/toolbar_actions_model_factory.cc +++ b/chrome/browser/ui/toolbar/toolbar_actions_model_factory.cc @@ -21,7 +21,7 @@ ToolbarActionsModel* ToolbarActionsModelFactory::GetForProfile( // static ToolbarActionsModelFactory* ToolbarActionsModelFactory::GetInstance() { - return Singleton<ToolbarActionsModelFactory>::get(); + return base::Singleton<ToolbarActionsModelFactory>::get(); } ToolbarActionsModelFactory::ToolbarActionsModelFactory() diff --git a/chrome/browser/ui/toolbar/toolbar_actions_model_factory.h b/chrome/browser/ui/toolbar/toolbar_actions_model_factory.h index cc89475..7a69d69 100644 --- a/chrome/browser/ui/toolbar/toolbar_actions_model_factory.h +++ b/chrome/browser/ui/toolbar/toolbar_actions_model_factory.h @@ -20,7 +20,7 @@ class ToolbarActionsModelFactory : public BrowserContextKeyedServiceFactory { static ToolbarActionsModelFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<ToolbarActionsModelFactory>; + friend struct base::DefaultSingletonTraits<ToolbarActionsModelFactory>; ToolbarActionsModelFactory(); ~ToolbarActionsModelFactory() override; diff --git a/chrome/browser/ui/views/app_list/linux/app_list_service_linux.cc b/chrome/browser/ui/views/app_list/linux/app_list_service_linux.cc index 054af24..d986b95 100644 --- a/chrome/browser/ui/views/app_list/linux/app_list_service_linux.cc +++ b/chrome/browser/ui/views/app_list/linux/app_list_service_linux.cc @@ -41,8 +41,8 @@ AppListServiceLinux::~AppListServiceLinux() {} // static AppListServiceLinux* AppListServiceLinux::GetInstance() { - return Singleton<AppListServiceLinux, - LeakySingletonTraits<AppListServiceLinux> >::get(); + return base::Singleton<AppListServiceLinux, base::LeakySingletonTraits< + AppListServiceLinux>>::get(); } void AppListServiceLinux::CreateShortcut() { diff --git a/chrome/browser/ui/views/app_list/linux/app_list_service_linux.h b/chrome/browser/ui/views/app_list/linux/app_list_service_linux.h index ff639b7..c279ccb 100644 --- a/chrome/browser/ui/views/app_list/linux/app_list_service_linux.h +++ b/chrome/browser/ui/views/app_list/linux/app_list_service_linux.h @@ -8,7 +8,9 @@ #include "chrome/browser/ui/app_list/app_list_service_views.h" #include "ui/app_list/views/app_list_view_observer.h" +namespace base { template <typename T> struct DefaultSingletonTraits; +} // AppListServiceLinux manages global resources needed for the app list to // operate, and controls when the app list is opened and closed. @@ -26,7 +28,7 @@ class AppListServiceLinux : public AppListServiceViews, void OnActivationChanged(views::Widget* widget, bool active) override; private: - friend struct DefaultSingletonTraits<AppListServiceLinux>; + friend struct base::DefaultSingletonTraits<AppListServiceLinux>; // AppListShowerDelegate overrides: void OnViewCreated() override; diff --git a/chrome/browser/ui/views/app_list/win/app_list_service_win.cc b/chrome/browser/ui/views/app_list/win/app_list_service_win.cc index 6644698..af1dee1 100644 --- a/chrome/browser/ui/views/app_list/win/app_list_service_win.cc +++ b/chrome/browser/ui/views/app_list/win/app_list_service_win.cc @@ -249,8 +249,8 @@ void SetWindowAttributes(HWND hwnd) { // static AppListServiceWin* AppListServiceWin::GetInstance() { - return Singleton<AppListServiceWin, - LeakySingletonTraits<AppListServiceWin> >::get(); + return base::Singleton<AppListServiceWin, + base::LeakySingletonTraits<AppListServiceWin>>::get(); } AppListServiceWin::AppListServiceWin() diff --git a/chrome/browser/ui/views/app_list/win/app_list_service_win.h b/chrome/browser/ui/views/app_list/win/app_list_service_win.h index 16648f9..b9ce4ed 100644 --- a/chrome/browser/ui/views/app_list/win/app_list_service_win.h +++ b/chrome/browser/ui/views/app_list/win/app_list_service_win.h @@ -11,7 +11,9 @@ class ActivationTrackerWin; +namespace base { template <typename T> struct DefaultSingletonTraits; +} class AppListServiceWin : public AppListServiceViews { public: @@ -26,7 +28,7 @@ class AppListServiceWin : public AppListServiceViews { void CreateShortcut() override; private: - friend struct DefaultSingletonTraits<AppListServiceWin>; + friend struct base::DefaultSingletonTraits<AppListServiceWin>; // AppListServiceViews overrides: void OnViewBeingDestroyed() override; diff --git a/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.cc b/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.cc index ec75046..b112b0f 100644 --- a/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.cc +++ b/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.cc @@ -21,7 +21,7 @@ const char kAppMenuRegistrarPath[] = "/com/canonical/AppMenu/Registrar"; // static GlobalMenuBarRegistrarX11* GlobalMenuBarRegistrarX11::GetInstance() { - return Singleton<GlobalMenuBarRegistrarX11>::get(); + return base::Singleton<GlobalMenuBarRegistrarX11>::get(); } void GlobalMenuBarRegistrarX11::OnWindowMapped(unsigned long xid) { diff --git a/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.h b/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.h index e35e87c..694f776 100644 --- a/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.h +++ b/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.h @@ -28,7 +28,7 @@ class GlobalMenuBarRegistrarX11 { void OnWindowUnmapped(unsigned long xid); private: - friend struct DefaultSingletonTraits<GlobalMenuBarRegistrarX11>; + friend struct base::DefaultSingletonTraits<GlobalMenuBarRegistrarX11>; GlobalMenuBarRegistrarX11(); ~GlobalMenuBarRegistrarX11(); diff --git a/chrome/browser/ui/views/select_file_dialog_extension.cc b/chrome/browser/ui/views/select_file_dialog_extension.cc index 6a6a60e..c31699b 100644 --- a/chrome/browser/ui/views/select_file_dialog_extension.cc +++ b/chrome/browser/ui/views/select_file_dialog_extension.cc @@ -60,7 +60,7 @@ class PendingDialog { SelectFileDialogExtension::RoutingID id); private: - friend struct DefaultSingletonTraits<PendingDialog>; + friend struct base::DefaultSingletonTraits<PendingDialog>; typedef std::map<SelectFileDialogExtension::RoutingID, scoped_refptr<SelectFileDialogExtension> > Map; Map map_; @@ -68,7 +68,7 @@ class PendingDialog { // static PendingDialog* PendingDialog::GetInstance() { - return Singleton<PendingDialog>::get(); + return base::Singleton<PendingDialog>::get(); } void PendingDialog::Add(SelectFileDialogExtension::RoutingID id, diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc index f1092af..5fe11af 100644 --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc @@ -699,7 +699,7 @@ void ChromeWebUIControllerFactory::GetFaviconForURL( // static ChromeWebUIControllerFactory* ChromeWebUIControllerFactory::GetInstance() { - return Singleton<ChromeWebUIControllerFactory>::get(); + return base::Singleton<ChromeWebUIControllerFactory>::get(); } ChromeWebUIControllerFactory::ChromeWebUIControllerFactory() { diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.h b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.h index 5db4e6e..909a80c 100644 --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.h +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.h @@ -45,7 +45,7 @@ class ChromeWebUIControllerFactory : public content::WebUIControllerFactory { ~ChromeWebUIControllerFactory() override; private: - friend struct DefaultSingletonTraits<ChromeWebUIControllerFactory>; + friend struct base::DefaultSingletonTraits<ChromeWebUIControllerFactory>; // Gets the data for the favicon for a WebUI page. Returns NULL if the WebUI // does not have a favicon. diff --git a/chrome/browser/ui/webui/chromeos/login/l10n_util_unittest.cc b/chrome/browser/ui/webui/chromeos/login/l10n_util_unittest.cc index af11875..3cca922 100644 --- a/chrome/browser/ui/webui/chromeos/login/l10n_util_unittest.cc +++ b/chrome/browser/ui/webui/chromeos/login/l10n_util_unittest.cc @@ -42,7 +42,7 @@ MachineStatisticsInitializer::MachineStatisticsInitializer() { // static MachineStatisticsInitializer* MachineStatisticsInitializer::GetInstance() { - return Singleton<MachineStatisticsInitializer>::get(); + return base::Singleton<MachineStatisticsInitializer>::get(); } void VerifyOnlyUILanguages(const base::ListValue& list) { diff --git a/chrome/browser/ui/webui/chromeos/mobile_setup_dialog.cc b/chrome/browser/ui/webui/chromeos/mobile_setup_dialog.cc index 8aa86f3..b3eb49c19 100644 --- a/chrome/browser/ui/webui/chromeos/mobile_setup_dialog.cc +++ b/chrome/browser/ui/webui/chromeos/mobile_setup_dialog.cc @@ -35,7 +35,7 @@ class MobileSetupDialogDelegate : public WebDialogDelegate { void ShowDialog(const std::string& service_path); protected: - friend struct DefaultSingletonTraits<MobileSetupDialogDelegate>; + friend struct base::DefaultSingletonTraits<MobileSetupDialogDelegate>; MobileSetupDialogDelegate(); ~MobileSetupDialogDelegate() override; @@ -71,7 +71,7 @@ void MobileSetupDialog::Show(const std::string& service_path) { // static MobileSetupDialogDelegate* MobileSetupDialogDelegate::GetInstance() { DCHECK_CURRENTLY_ON(BrowserThread::UI); - return Singleton<MobileSetupDialogDelegate>::get(); + return base::Singleton<MobileSetupDialogDelegate>::get(); } MobileSetupDialogDelegate::MobileSetupDialogDelegate() : dialog_window_(NULL) { diff --git a/chrome/browser/ui/webui/ntp/app_resource_cache_factory.cc b/chrome/browser/ui/webui/ntp/app_resource_cache_factory.cc index ebc41d8..d9baa7c 100644 --- a/chrome/browser/ui/webui/ntp/app_resource_cache_factory.cc +++ b/chrome/browser/ui/webui/ntp/app_resource_cache_factory.cc @@ -18,7 +18,7 @@ NTPResourceCache* AppResourceCacheFactory::GetForProfile(Profile* profile) { // static AppResourceCacheFactory* AppResourceCacheFactory::GetInstance() { - return Singleton<AppResourceCacheFactory>::get(); + return base::Singleton<AppResourceCacheFactory>::get(); } AppResourceCacheFactory::AppResourceCacheFactory() diff --git a/chrome/browser/ui/webui/ntp/app_resource_cache_factory.h b/chrome/browser/ui/webui/ntp/app_resource_cache_factory.h index adcbbe1..fc4b5f9 100644 --- a/chrome/browser/ui/webui/ntp/app_resource_cache_factory.h +++ b/chrome/browser/ui/webui/ntp/app_resource_cache_factory.h @@ -21,7 +21,7 @@ class AppResourceCacheFactory : public BrowserContextKeyedServiceFactory { static AppResourceCacheFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<AppResourceCacheFactory>; + friend struct base::DefaultSingletonTraits<AppResourceCacheFactory>; AppResourceCacheFactory(); ~AppResourceCacheFactory() override; diff --git a/chrome/browser/ui/webui/ntp/ntp_resource_cache_factory.cc b/chrome/browser/ui/webui/ntp/ntp_resource_cache_factory.cc index e01cf89..50f602b 100644 --- a/chrome/browser/ui/webui/ntp/ntp_resource_cache_factory.cc +++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache_factory.cc @@ -19,7 +19,7 @@ NTPResourceCache* NTPResourceCacheFactory::GetForProfile(Profile* profile) { // static NTPResourceCacheFactory* NTPResourceCacheFactory::GetInstance() { - return Singleton<NTPResourceCacheFactory>::get(); + return base::Singleton<NTPResourceCacheFactory>::get(); } NTPResourceCacheFactory::NTPResourceCacheFactory() diff --git a/chrome/browser/ui/webui/ntp/ntp_resource_cache_factory.h b/chrome/browser/ui/webui/ntp/ntp_resource_cache_factory.h index cd1ebdb..ecb7dc0 100644 --- a/chrome/browser/ui/webui/ntp/ntp_resource_cache_factory.h +++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache_factory.h @@ -21,7 +21,7 @@ class NTPResourceCacheFactory : public BrowserContextKeyedServiceFactory { static NTPResourceCacheFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<NTPResourceCacheFactory>; + friend struct base::DefaultSingletonTraits<NTPResourceCacheFactory>; NTPResourceCacheFactory(); ~NTPResourceCacheFactory() override; diff --git a/chrome/browser/ui/webui/signin/login_ui_service_factory.cc b/chrome/browser/ui/webui/signin/login_ui_service_factory.cc index b23a420..35b275d 100644 --- a/chrome/browser/ui/webui/signin/login_ui_service_factory.cc +++ b/chrome/browser/ui/webui/signin/login_ui_service_factory.cc @@ -28,7 +28,7 @@ LoginUIService* LoginUIServiceFactory::GetForProfile(Profile* profile) { // static LoginUIServiceFactory* LoginUIServiceFactory::GetInstance() { - return Singleton<LoginUIServiceFactory>::get(); + return base::Singleton<LoginUIServiceFactory>::get(); } // static diff --git a/chrome/browser/ui/webui/signin/login_ui_service_factory.h b/chrome/browser/ui/webui/signin/login_ui_service_factory.h index 41230dc..434dbba 100644 --- a/chrome/browser/ui/webui/signin/login_ui_service_factory.h +++ b/chrome/browser/ui/webui/signin/login_ui_service_factory.h @@ -30,7 +30,7 @@ class LoginUIServiceFactory : public BrowserContextKeyedServiceFactory { static base::Closure GetShowLoginPopupCallbackForProfile(Profile* profile); private: - friend struct DefaultSingletonTraits<LoginUIServiceFactory>; + friend struct base::DefaultSingletonTraits<LoginUIServiceFactory>; LoginUIServiceFactory(); ~LoginUIServiceFactory() override; diff --git a/chrome/browser/undo/bookmark_undo_service_factory.cc b/chrome/browser/undo/bookmark_undo_service_factory.cc index dd9163a..dcece8a 100644 --- a/chrome/browser/undo/bookmark_undo_service_factory.cc +++ b/chrome/browser/undo/bookmark_undo_service_factory.cc @@ -24,7 +24,7 @@ BookmarkUndoService* BookmarkUndoServiceFactory::GetForProfileIfExists( // static BookmarkUndoServiceFactory* BookmarkUndoServiceFactory::GetInstance() { - return Singleton<BookmarkUndoServiceFactory>::get(); + return base::Singleton<BookmarkUndoServiceFactory>::get(); } BookmarkUndoServiceFactory::BookmarkUndoServiceFactory() diff --git a/chrome/browser/undo/bookmark_undo_service_factory.h b/chrome/browser/undo/bookmark_undo_service_factory.h index a774f21..c2909c6 100644 --- a/chrome/browser/undo/bookmark_undo_service_factory.h +++ b/chrome/browser/undo/bookmark_undo_service_factory.h @@ -20,7 +20,7 @@ class BookmarkUndoServiceFactory : public BrowserContextKeyedServiceFactory { static BookmarkUndoServiceFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<BookmarkUndoServiceFactory>; + friend struct base::DefaultSingletonTraits<BookmarkUndoServiceFactory>; BookmarkUndoServiceFactory(); ~BookmarkUndoServiceFactory() override; diff --git a/chrome/browser/upgrade_detector_impl.cc b/chrome/browser/upgrade_detector_impl.cc index 9efdb74..64bf7ca 100644 --- a/chrome/browser/upgrade_detector_impl.cc +++ b/chrome/browser/upgrade_detector_impl.cc @@ -511,7 +511,7 @@ void UpgradeDetectorImpl::NotifyOnUpgrade() { // static UpgradeDetectorImpl* UpgradeDetectorImpl::GetInstance() { - return Singleton<UpgradeDetectorImpl>::get(); + return base::Singleton<UpgradeDetectorImpl>::get(); } // static diff --git a/chrome/browser/upgrade_detector_impl.h b/chrome/browser/upgrade_detector_impl.h index 848e1b1..f5a5a1c2 100644 --- a/chrome/browser/upgrade_detector_impl.h +++ b/chrome/browser/upgrade_detector_impl.h @@ -11,7 +11,9 @@ #include "chrome/browser/upgrade_detector.h" #include "components/variations/service/variations_service.h" +namespace base { template <typename T> struct DefaultSingletonTraits; +} class UpgradeDetectorImpl : public UpgradeDetector, public variations::VariationsService::Observer { @@ -37,7 +39,7 @@ class UpgradeDetectorImpl : public UpgradeDetector, void NotifyOnUpgradeWithTimePassed(base::TimeDelta time_passed); private: - friend struct DefaultSingletonTraits<UpgradeDetectorImpl>; + friend struct base::DefaultSingletonTraits<UpgradeDetectorImpl>; // Start the timer that will call |CheckForUpgrade()|. void StartTimerForUpgradeCheck(); diff --git a/chrome/browser/web_data_service_factory.cc b/chrome/browser/web_data_service_factory.cc index 3dd86a1..3bac5d8 100644 --- a/chrome/browser/web_data_service_factory.cc +++ b/chrome/browser/web_data_service_factory.cc @@ -153,7 +153,7 @@ WebDataServiceFactory::GetPasswordWebDataForProfile( // static WebDataServiceFactory* WebDataServiceFactory::GetInstance() { - return Singleton<WebDataServiceFactory>::get(); + return base::Singleton<WebDataServiceFactory>::get(); } content::BrowserContext* WebDataServiceFactory::GetBrowserContextToUse( diff --git a/chrome/browser/web_data_service_factory.h b/chrome/browser/web_data_service_factory.h index 23565eb..d1b5608 100644 --- a/chrome/browser/web_data_service_factory.h +++ b/chrome/browser/web_data_service_factory.h @@ -10,7 +10,10 @@ #include "components/keyed_service/content/browser_context_keyed_service_factory.h" #include "components/keyed_service/core/service_access_type.h" +namespace base { template <typename T> struct DefaultSingletonTraits; +} + class KeywordWebDataService; class Profile; class TokenWebData; @@ -60,7 +63,7 @@ class WebDataServiceFactory : public BrowserContextKeyedServiceFactory { static WebDataServiceFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<WebDataServiceFactory>; + friend struct base::DefaultSingletonTraits<WebDataServiceFactory>; WebDataServiceFactory(); ~WebDataServiceFactory() override; diff --git a/chrome/common/mac/launchd.h b/chrome/common/mac/launchd.h index c43341c..6e86093 100644 --- a/chrome/common/mac/launchd.h +++ b/chrome/common/mac/launchd.h @@ -88,7 +88,7 @@ class Launchd { private: // TODO(dmaclach): remove this once http://crbug.com/76925 is fixed. // Scaffolding for doing unittests with our singleton. - friend struct DefaultSingletonTraits<Launchd>; + friend struct base::DefaultSingletonTraits<Launchd>; static Launchd* g_instance_; DISALLOW_COPY_AND_ASSIGN(Launchd); diff --git a/chrome/common/mac/launchd.mm b/chrome/common/mac/launchd.mm index de433df..09d3884 100644 --- a/chrome/common/mac/launchd.mm +++ b/chrome/common/mac/launchd.mm @@ -73,7 +73,7 @@ Launchd* Launchd::g_instance_ = NULL; Launchd* Launchd::GetInstance() { if (!g_instance_) { - g_instance_ = Singleton<Launchd>::get(); + g_instance_ = base::Singleton<Launchd>::get(); } return g_instance_; } diff --git a/chrome/renderer/plugins/plugin_uma.cc b/chrome/renderer/plugins/plugin_uma.cc index 9272d3c..60d2597 100644 --- a/chrome/renderer/plugins/plugin_uma.cc +++ b/chrome/renderer/plugins/plugin_uma.cc @@ -62,7 +62,7 @@ void UMASenderImpl::SendPluginUMA(PluginUMAReporter::ReportType report_type, // static. PluginUMAReporter* PluginUMAReporter::GetInstance() { - return Singleton<PluginUMAReporter>::get(); + return base::Singleton<PluginUMAReporter>::get(); } void PluginUMAReporter::ReportPluginMissing(const std::string& plugin_mime_type, diff --git a/chrome/renderer/plugins/plugin_uma.h b/chrome/renderer/plugins/plugin_uma.h index 6dbef19..5954199 100644 --- a/chrome/renderer/plugins/plugin_uma.h +++ b/chrome/renderer/plugins/plugin_uma.h @@ -59,7 +59,7 @@ class PluginUMAReporter { const GURL& plugin_src); private: - friend struct DefaultSingletonTraits<PluginUMAReporter>; + friend struct base::DefaultSingletonTraits<PluginUMAReporter>; friend class PluginUMATest; PluginUMAReporter(); diff --git a/chrome/test/base/tracing.cc b/chrome/test/base/tracing.cc index c3280ce..83cbbcc 100644 --- a/chrome/test/base/tracing.cc +++ b/chrome/test/base/tracing.cc @@ -46,7 +46,7 @@ class StringTraceSink : public content::TracingController::TraceDataSink { class InProcessTraceController { public: static InProcessTraceController* GetInstance() { - return Singleton<InProcessTraceController>::get(); + return base::Singleton<InProcessTraceController>::get(); } InProcessTraceController() @@ -126,7 +126,7 @@ class InProcessTraceController { } private: - friend struct DefaultSingletonTraits<InProcessTraceController>; + friend struct base::DefaultSingletonTraits<InProcessTraceController>; void OnEnableTracingComplete() { message_loop_runner_->Quit(); |