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))); |