diff options
author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-22 23:25:44 +0000 |
---|---|---|
committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-22 23:25:44 +0000 |
commit | f1484c5242850142011c4db4572b9b742f6b56f5 (patch) | |
tree | 6cc51ae1fca2aea4a7f76ab9171a4247eff78a9f /chrome/browser/invalidation/invalidation_service_factory.cc | |
parent | 59bf05a05ddf1bec2d2a4ad6d38a3338a41b7805 (diff) | |
download | chromium_src-f1484c5242850142011c4db4572b9b742f6b56f5.zip chromium_src-f1484c5242850142011c4db4572b9b742f6b56f5.tar.gz chromium_src-f1484c5242850142011c4db4572b9b742f6b56f5.tar.bz2 |
Remove references to Profile from browser_context_keyed_service.
BUG=227219
R=joi@chromium.org
Review URL: https://codereview.chromium.org/15517005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@201634 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/invalidation/invalidation_service_factory.cc')
-rw-r--r-- | chrome/browser/invalidation/invalidation_service_factory.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/chrome/browser/invalidation/invalidation_service_factory.cc b/chrome/browser/invalidation/invalidation_service_factory.cc index d5d3b17..0fa857b 100644 --- a/chrome/browser/invalidation/invalidation_service_factory.cc +++ b/chrome/browser/invalidation/invalidation_service_factory.cc @@ -19,12 +19,12 @@ class TokenService; namespace invalidation { // TODO(rlarocque): Re-enable this once InvalidationFrontend can -// extend ProfileKeyedService. +// extend BrowserContextKeyedService. // // static // InvalidationFrontend* InvalidationServiceFactory::GetForProfile( // Profile* profile) { // return static_cast<InvalidationFrontend*>( -// GetInstance()->GetServiceForProfile(profile, true)); +// GetInstance()->GetServiceForBrowserContext(profile, true)); // } // static @@ -33,8 +33,9 @@ InvalidationServiceFactory* InvalidationServiceFactory::GetInstance() { } InvalidationServiceFactory::InvalidationServiceFactory() - : ProfileKeyedServiceFactory("InvalidationService", - ProfileDependencyManager::GetInstance()) { + : BrowserContextKeyedServiceFactory( + "InvalidationService", + BrowserContextDependencyManager::GetInstance()) { #if !defined(OS_ANDROID) DependsOn(SigninManagerFactory::GetInstance()); DependsOn(TokenServiceFactory::GetInstance()); @@ -44,12 +45,12 @@ InvalidationServiceFactory::InvalidationServiceFactory() InvalidationServiceFactory::~InvalidationServiceFactory() {} // static -ProfileKeyedService* +BrowserContextKeyedService* InvalidationServiceFactory::BuildP2PInvalidationServiceFor(Profile* profile) { return new P2PInvalidationService(profile); } -ProfileKeyedService* InvalidationServiceFactory::BuildServiceInstanceFor( +BrowserContextKeyedService* InvalidationServiceFactory::BuildServiceInstanceFor( content::BrowserContext* context) const { Profile* profile = static_cast<Profile*>(context); #if defined(OS_ANDROID) |