Index: chrome/browser/sync/glue/non_frontend_data_type_controller_unittest.cc |
diff --git a/chrome/browser/sync/glue/non_frontend_data_type_controller_unittest.cc b/chrome/browser/sync/glue/non_frontend_data_type_controller_unittest.cc |
index a031b1f309b945ff648aea8c4f7624ca423720a0..1df3a866ef282a70560fbc77a50fd322cd055957 100644 |
--- a/chrome/browser/sync/glue/non_frontend_data_type_controller_unittest.cc |
+++ b/chrome/browser/sync/glue/non_frontend_data_type_controller_unittest.cc |
@@ -149,7 +149,7 @@ class SyncNonFrontendDataTypeControllerTest : 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(_)); |
} |
@@ -162,7 +162,7 @@ class SyncNonFrontendDataTypeControllerTest : public testing::Test { |
EXPECT_CALL(*dtc_mock_, StopModels()); |
EXPECT_CALL(service_, DeactivateDataType(_)); |
EXPECT_CALL(*model_associator_, DisassociateModels()). |
- WillOnce(Return(SyncError())); |
+ WillOnce(Return(csync::SyncError())); |
} |
void SetStartFailExpectations(DataTypeController::StartResult result) { |
@@ -171,7 +171,7 @@ class SyncNonFrontendDataTypeControllerTest : public testing::Test { |
EXPECT_CALL(*dtc_mock_, RecordUnrecoverableError(_, _)); |
if (model_associator_) { |
EXPECT_CALL(*model_associator_, DisassociateModels()). |
- WillOnce(Return(SyncError())); |
+ WillOnce(Return(csync::SyncError())); |
} |
EXPECT_CALL(*dtc_mock_, RecordStartFailure(result)); |
EXPECT_CALL(start_callback_, Run(result,_)); |
@@ -233,7 +233,7 @@ TEST_F(SyncNonFrontendDataTypeControllerTest, 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, non_frontend_dtc_->state()); |
@@ -249,7 +249,8 @@ TEST_F(SyncNonFrontendDataTypeControllerTest, StartAssociationFailed) { |
EXPECT_CALL(*model_associator_, SyncModelHasUserCreatedNodes(_)). |
WillOnce(DoAll(SetArgumentPointee<0>(true), Return(true))); |
EXPECT_CALL(*model_associator_, AssociateModels()). |
- WillOnce(Return(SyncError(FROM_HERE, "Error", syncable::AUTOFILL))); |
+ WillOnce( |
+ Return(csync::SyncError(FROM_HERE, "Error", syncable::AUTOFILL))); |
EXPECT_CALL(*dtc_mock_, RecordAssociationTime(_)); |
SetStartFailExpectations(DataTypeController::ASSOCIATION_FAILED); |
// Set up association to fail with an association failed error. |
@@ -304,7 +305,7 @@ TEST_F(SyncNonFrontendDataTypeControllerTest, AbortDuringAssociationInactive) { |
EXPECT_CALL(*model_associator_, AbortAssociation()).WillOnce( |
SignalEvent(&pause_db_thread)); |
EXPECT_CALL(*model_associator_, AssociateModels()). |
- WillOnce(Return(SyncError())); |
+ WillOnce(Return(csync::SyncError())); |
EXPECT_CALL(*dtc_mock_, RecordAssociationTime(_)); |
EXPECT_CALL(service_, ActivateDataType(_, _, _)); |
EXPECT_CALL(start_callback_, Run(DataTypeController::ABORTED,_)); |
@@ -333,7 +334,7 @@ TEST_F(SyncNonFrontendDataTypeControllerTest, AbortDuringAssociationActivated) { |
EXPECT_CALL(*model_associator_, AbortAssociation()).WillOnce( |
SignalEvent(&pause_db_thread)); |
EXPECT_CALL(*model_associator_, AssociateModels()). |
- WillOnce(Return(SyncError())); |
+ WillOnce(Return(csync::SyncError())); |
EXPECT_CALL(*dtc_mock_, RecordAssociationTime(_)); |
EXPECT_CALL(service_, ActivateDataType(_, _, _)).WillOnce(DoAll( |
SignalEvent(&wait_for_db_thread_pause), |