chrome/browser/sync/glue/frontend_data_type_controller_unittest.cc - Issue 10662035: [Sync] Put everything in sync/api into csync namespace

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 10662035: [Sync] Put everything in sync/api into csync namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 6 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/extensions/settings/settings_sync_unittest.cc ('K') | « chrome/browser/sync/glue/frontend_data_type_controller_mock.h ('k') | chrome/browser/sync/glue/generic_change_processor.h » ('j') | no next file with comments »
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 657f4db76f786a4c8bf0d2456fdc17d0236430b4..f0e6747716aae50eb4b5962e2ddd9ca99e8fa249 100644

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

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

@@ -113,7 +113,7 @@ class SyncFrontendDataTypeControllerTest : public testing::Test {

EXPECT_CALL(*model_associator_, SyncModelHasUserCreatedNodes(_)).

WillOnce(DoAll(SetArgumentPointee<0>(true), Return(true)));

EXPECT_CALL(*model_associator_, AssociateModels()).

- WillOnce(Return(SyncError()));

+ WillOnce(Return(csync::SyncError()));

EXPECT_CALL(*dtc_mock_, RecordAssociationTime(_));

}

@@ -126,7 +126,7 @@ class SyncFrontendDataTypeControllerTest : public testing::Test {

EXPECT_CALL(*dtc_mock_, CleanUpState());

EXPECT_CALL(service_, DeactivateDataType(_));

EXPECT_CALL(*model_associator_, DisassociateModels()).

- WillOnce(Return(SyncError()));

+ WillOnce(Return(csync::SyncError()));

}

void SetStartFailExpectations(DataTypeController::StartResult result) {

@@ -179,7 +179,7 @@ TEST_F(SyncFrontendDataTypeControllerTest, StartFirstRun) {

EXPECT_CALL(*model_associator_, SyncModelHasUserCreatedNodes(_)).

WillOnce(DoAll(SetArgumentPointee<0>(false), Return(true)));

EXPECT_CALL(*model_associator_, AssociateModels()).

- WillOnce(Return(SyncError()));

+ WillOnce(Return(csync::SyncError()));

EXPECT_CALL(*dtc_mock_, RecordAssociationTime(_));

SetActivateExpectations(DataTypeController::OK_FIRST_RUN);

EXPECT_EQ(DataTypeController::NOT_RUNNING, frontend_dtc_->state());

@@ -207,7 +207,7 @@ TEST_F(SyncFrontendDataTypeControllerTest, StartAssociationFailed) {

EXPECT_CALL(*model_associator_, SyncModelHasUserCreatedNodes(_)).

WillOnce(DoAll(SetArgumentPointee<0>(true), Return(true)));

EXPECT_CALL(*model_associator_, AssociateModels()).

- WillOnce(Return(SyncError(FROM_HERE,

+ WillOnce(Return(csync::SyncError(FROM_HERE,

"error",

syncable::PREFERENCES)));