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