diff options
Diffstat (limited to 'chrome/browser/chromeos')
68 files changed, 110 insertions, 84 deletions
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(); |