| Index: chrome/browser/sync/glue/non_ui_data_type_controller_unittest.cc
|
| diff --git a/chrome/browser/sync/glue/non_ui_data_type_controller_unittest.cc b/chrome/browser/sync/glue/non_ui_data_type_controller_unittest.cc
|
| index 43107dade515d279e5f0f269545ed5a5fa1a1723..f546bf627ab781bf646d3848ef118deeba77dfc0 100644
|
| --- a/chrome/browser/sync/glue/non_ui_data_type_controller_unittest.cc
|
| +++ b/chrome/browser/sync/glue/non_ui_data_type_controller_unittest.cc
|
| @@ -323,7 +323,9 @@ TEST_F(SyncNonUIDataTypeControllerTest, StartAssociationFailed) {
|
| EXPECT_EQ(DataTypeController::NOT_RUNNING, non_ui_dtc_->state());
|
| syncable_service_.set_merge_data_and_start_syncing_error(
|
| syncer::SyncError(FROM_HERE,
|
| - "Sync Error", non_ui_dtc_->type()));
|
| + syncer::SyncError::DATATYPE_ERROR,
|
| + "Sync Error",
|
| + non_ui_dtc_->type()));
|
| Start();
|
| WaitForDTC();
|
| EXPECT_EQ(DataTypeController::DISABLED, non_ui_dtc_->state());
|
| @@ -381,7 +383,10 @@ TEST_F(SyncNonUIDataTypeControllerTest, AbortDuringAssociation) {
|
| SetArgumentPointee<0>(true),
|
| Return(true)));
|
| EXPECT_CALL(*change_processor_.get(), GetSyncData(_)).WillOnce(
|
| - Return(syncer::SyncError(FROM_HERE, "Disconnected.", AUTOFILL_PROFILE)));
|
| + Return(syncer::SyncError(FROM_HERE,
|
| + syncer::SyncError::DATATYPE_ERROR,
|
| + "Disconnected.",
|
| + AUTOFILL_PROFILE)));
|
| EXPECT_CALL(*change_processor_.get(), Disconnect())
|
| .WillOnce(DoAll(SignalEvent(&pause_db_thread), Return(true)));
|
| EXPECT_CALL(service_, DeactivateDataType(_));
|
|
|