Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1164)

Unified Diff: chrome/browser/invalidation/invalidation_service_factory.cc

Issue 15517005: Remove references to Profile from browser_context_keyed_service. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase & style Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/invalidation/invalidation_service_factory.cc
diff --git a/chrome/browser/invalidation/invalidation_service_factory.cc b/chrome/browser/invalidation/invalidation_service_factory.cc
index d5d3b173bdda8f1c69fe2a543ed2fc3246f06b09..0fa857b3fca40d40312848a3ce1643f6e570621e 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)

Powered by Google App Engine
This is Rietveld 408576698