| Index: chrome/browser/sync/glue/ui_data_type_controller_unittest.cc
|
| diff --git a/chrome/browser/sync/glue/ui_data_type_controller_unittest.cc b/chrome/browser/sync/glue/ui_data_type_controller_unittest.cc
|
| index 49c6f5be036cfc05669f6b4b3b33f9ca2c73fe80..b252971b3bb10b95638bc54ffc6fe8eb3c8fa28c 100644
|
| --- a/chrome/browser/sync/glue/ui_data_type_controller_unittest.cc
|
| +++ b/chrome/browser/sync/glue/ui_data_type_controller_unittest.cc
|
| @@ -105,7 +105,7 @@ class SyncUIDataTypeControllerTest : public testing::Test {
|
| ModelLoadCallbackMock model_load_callback_;
|
| scoped_refptr<UIDataTypeController> preference_dtc_;
|
| scoped_ptr<FakeGenericChangeProcessor> change_processor_;
|
| - FakeSyncableService syncable_service_;
|
| + csync::FakeSyncableService syncable_service_;
|
| };
|
|
|
| // Start the DTC. Verify that the callback is called with OK, the
|
| @@ -165,7 +165,7 @@ TEST_F(SyncUIDataTypeControllerTest, StartAssociationFailed) {
|
| EXPECT_CALL(start_callback_,
|
| Run(DataTypeController::ASSOCIATION_FAILED, _));
|
| syncable_service_.set_merge_data_and_start_syncing_error(
|
| - SyncError(FROM_HERE, "Error", type_));
|
| + csync::SyncError(FROM_HERE, "Error", type_));
|
|
|
| EXPECT_EQ(DataTypeController::NOT_RUNNING, preference_dtc_->state());
|
| EXPECT_FALSE(syncable_service_.syncing());
|
|
|