chrome/browser/sync/profile_sync_service_preference_unittest.cc - Issue 9749012: [Sync] Have SyncableService's take ownership of their SyncChangeProcessor.

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/sync/profile_sync_service_preference_unittest.cc

Issue 9749012: [Sync] Have SyncableService's take ownership of their SyncChangeProcessor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix merge conflict Created 8 years, 9 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

« no previous file with comments | « chrome/browser/sync/glue/ui_data_type_controller_unittest.cc ('k') | chrome/browser/webdata/autocomplete_syncable_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/profile_sync_service_preference_unittest.cc

diff --git a/chrome/browser/sync/profile_sync_service_preference_unittest.cc b/chrome/browser/sync/profile_sync_service_preference_unittest.cc

index e72818d9fa46bc2d44283fcc7a2833858ca5ec4b..b22406aac7c97524a4715f3e10c9ebfb1a7b84a2 100644

--- a/chrome/browser/sync/profile_sync_service_preference_unittest.cc

+++ b/chrome/browser/sync/profile_sync_service_preference_unittest.cc

@@ -41,8 +41,8 @@

using base::JSONReader;

using browser_sync::GenericChangeProcessor;

+using browser_sync::SharedChangeProcessor;

using browser_sync::UIDataTypeController;

-using browser_sync::SyncBackendHost;

using sync_api::ChangeRecord;

using testing::_;

using testing::Invoke;

@@ -134,8 +134,10 @@ class ProfileSyncServicePreferenceTest

factory,

profile_.get(),

service_.get());

- EXPECT_CALL(*factory, CreateGenericChangeProcessor(_, _, _)).

- WillOnce(CreateAndSaveChangeProcessor(&change_processor_));

+ EXPECT_CALL(*factory, CreateSharedChangeProcessor()).

+ WillOnce(Return(new SharedChangeProcessor()));

+ EXPECT_CALL(*factory, CreateGenericChangeProcessor(_, _, _)).

+ WillOnce(CreateAndSaveChangeProcessor(&change_processor_));

service_->RegisterDataTypeController(dtc_);

TokenServiceFactory::GetForProfile(profile_.get())->IssueAuthTokenForTest(

GaiaConstants::kSyncService, "token");