chrome/browser/invalidation/invalidation_service_factory.cc - Issue 286213003: Make GCMProfileService own GCMDriver, instead of deriving from it

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 286213003: Make GCMProfileService own GCMDriver, instead of deriving from it (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix trybots Created 6 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:

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 a78014317e32fcd3592e2d69214d9aaba3a6cd71..76797b2f5710564c8c15cf897f0ea55f9ee23e4f 100644

--- a/chrome/browser/invalidation/invalidation_service_factory.cc

+++ b/chrome/browser/invalidation/invalidation_service_factory.cc

@@ -125,7 +125,7 @@ KeyedService* InvalidationServiceFactory::BuildServiceInstanceFor(

identity_provider.Pass(),

scoped_ptr<TiclSettingsProvider>(

new TiclProfileSettingsProvider(profile)),

- gcm::GCMProfileServiceFactory::GetForProfile(profile),

+ gcm::GCMProfileServiceFactory::GetForProfile(profile)->driver(),

profile->GetRequestContext());

service->Init(scoped_ptr<syncer::InvalidationStateTracker>(

new InvalidatorStorage(profile->GetPrefs())));