chrome/browser/sync/glue/frontend_data_type_controller_unittest.cc - Issue 6905044: Refactor preference syncing.

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/glue/frontend_data_type_controller_unittest.cc

Issue 6905044: Refactor preference syncing. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix the previous fix Created 9 years, 8 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/prefs/pref_model_associator.cc ('K') | « chrome/browser/sync/glue/frontend_data_type_controller.cc ('k') | chrome/browser/sync/glue/generic_change_processor.h » ('j') | chrome/browser/sync/glue/model_associator.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/glue/frontend_data_type_controller_unittest.cc

diff --git a/chrome/browser/sync/glue/frontend_data_type_controller_unittest.cc b/chrome/browser/sync/glue/frontend_data_type_controller_unittest.cc

index ee3f42f0d6448c70a6358e1cee0c48552850be31..a663d8703549a979c534182ad0fed9bb43ecc90e 100644

--- a/chrome/browser/sync/glue/frontend_data_type_controller_unittest.cc

+++ b/chrome/browser/sync/glue/frontend_data_type_controller_unittest.cc

@@ -22,7 +22,7 @@ using browser_sync::ChangeProcessorMock;

using browser_sync::DataTypeController;

using browser_sync::FrontendDataTypeController;

using browser_sync::FrontendDataTypeControllerMock;

-using browser_sync::ModelAssociatorMock;

+using browser_sync::NewModelAssociatorMock;

using testing::_;

using testing::DoAll;

using testing::InvokeWithoutArgs;

@@ -54,7 +54,8 @@ class FrontendDataTypeControllerFake : public FrontendDataTypeController {

ProfileSyncFactory::SyncComponents sync_components =

profile_sync_factory_->

CreateBookmarkSyncComponents(sync_service_, this);

- model_associator_.reset(sync_components.model_associator);

+ model_associator_ = reinterpret_cast<browser_sync::NewAssociatorInterface*>(

+ sync_components.model_associator);

change_processor_.reset(sync_components.change_processor);

}

@@ -99,7 +100,7 @@ class FrontendDataTypeControllerTest : public testing::Test {

protected:

void SetStartExpectations() {

EXPECT_CALL(*dtc_mock_, StartModels()).WillOnce(Return(true));

- model_associator_ = new ModelAssociatorMock();

+ model_associator_ = new NewModelAssociatorMock();

change_processor_ = new ChangeProcessorMock();

EXPECT_CALL(*profile_sync_factory_, CreateBookmarkSyncComponents(_, _)).

WillOnce(Return(ProfileSyncFactory::SyncComponents(model_associator_,

@@ -140,7 +141,7 @@ class FrontendDataTypeControllerTest : public testing::Test {

scoped_refptr<FrontendDataTypeControllerMock> dtc_mock_;

ProfileMock profile_;

ProfileSyncServiceMock service_;

- ModelAssociatorMock* model_associator_;

+ NewModelAssociatorMock* model_associator_;

ChangeProcessorMock* change_processor_;

StartCallback start_callback_;

};