chrome/browser/invalidation/ticl_profile_settings_provider_unittest.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/ticl_profile_settings_provider_unittest.cc

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

Patch Set: Sync 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:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/invalidation/ticl_profile_settings_provider.cc ('K') | « chrome/browser/invalidation/ticl_profile_settings_provider.cc ('k') | chrome/browser/services/gcm/gcm_driver.h » ('j') | chrome/browser/services/gcm/gcm_driver.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/invalidation/ticl_profile_settings_provider_unittest.cc

diff --git a/chrome/browser/invalidation/ticl_profile_settings_provider_unittest.cc b/chrome/browser/invalidation/ticl_profile_settings_provider_unittest.cc

index 179760b8c50c62c5d4702df89f4c1e460329fc13..d7fb24b74c37c2358fdcdf879a9bcc9df84a33e0 100644

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

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

@@ -56,7 +56,7 @@ void TiclProfileSettingsProviderTest::SetUp() {

scoped_ptr<IdentityProvider>(new FakeIdentityProvider(&token_service_)),

scoped_ptr<TiclSettingsProvider>(

new TiclProfileSettingsProvider(&profile_)),

- gcm::GCMProfileServiceFactory::GetForProfile(&profile_),

+ gcm::GCMProfileServiceFactory::GetForProfile(&profile_)->driver(),

profile_.GetRequestContext()));

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

new syncer::FakeInvalidationStateTracker));