| Index: components/sync/driver/ui_data_type_controller_unittest.cc
|
| diff --git a/components/sync/driver/ui_data_type_controller_unittest.cc b/components/sync/driver/ui_data_type_controller_unittest.cc
|
| index 0556cf5e4ec945115de81b450919fca282fead14..43ea734b69ede84b0b06259a14d417f3cbd987d3 100644
|
| --- a/components/sync/driver/ui_data_type_controller_unittest.cc
|
| +++ b/components/sync/driver/ui_data_type_controller_unittest.cc
|
| @@ -26,17 +26,17 @@ using testing::Invoke;
|
| using testing::InvokeWithoutArgs;
|
| using testing::Return;
|
|
|
| -namespace sync_driver {
|
| +namespace syncer {
|
| namespace {
|
|
|
| class UIDataTypeControllerFake : public UIDataTypeController {
|
| public:
|
| - UIDataTypeControllerFake(syncer::ModelType type,
|
| + UIDataTypeControllerFake(ModelType type,
|
| const base::Closure& dump_stack,
|
| SyncClient* sync_client)
|
| : UIDataTypeController(type, dump_stack, sync_client) {}
|
|
|
| - void OnUnrecoverableError(const syncer::SyncError& error) {
|
| + void OnUnrecoverableError(const SyncError& error) {
|
| CreateErrorHandler()->OnUnrecoverableError(error);
|
| }
|
| };
|
| @@ -49,11 +49,11 @@ class SyncUIDataTypeControllerTest : public testing::Test,
|
| public FakeSyncClient {
|
| public:
|
| SyncUIDataTypeControllerTest()
|
| - : type_(syncer::PREFERENCES), change_processor_(NULL) {}
|
| + : type_(PREFERENCES), change_processor_(NULL) {}
|
|
|
| // FakeSyncClient overrides.
|
| - base::WeakPtr<syncer::SyncableService> GetSyncableServiceForType(
|
| - syncer::ModelType type) override {
|
| + base::WeakPtr<SyncableService> GetSyncableServiceForType(
|
| + ModelType type) override {
|
| return syncable_service_.AsWeakPtr();
|
| }
|
|
|
| @@ -92,11 +92,11 @@ class SyncUIDataTypeControllerTest : public testing::Test,
|
| void PumpLoop() { base::RunLoop().RunUntilIdle(); }
|
|
|
| base::MessageLoop message_loop_;
|
| - const syncer::ModelType type_;
|
| + const ModelType type_;
|
| StartCallbackMock start_callback_;
|
| ModelLoadCallbackMock model_load_callback_;
|
| FakeGenericChangeProcessor* change_processor_;
|
| - syncer::FakeSyncableService syncable_service_;
|
| + FakeSyncableService syncable_service_;
|
| std::unique_ptr<UIDataTypeControllerFake> preference_dtc_;
|
| };
|
|
|
| @@ -163,8 +163,8 @@ TEST_F(SyncUIDataTypeControllerTest, StartStopFirstRun) {
|
| TEST_F(SyncUIDataTypeControllerTest, StartAssociationFailed) {
|
| EXPECT_CALL(start_callback_,
|
| Run(DataTypeController::ASSOCIATION_FAILED, _, _));
|
| - syncable_service_.set_merge_data_and_start_syncing_error(syncer::SyncError(
|
| - FROM_HERE, syncer::SyncError::DATATYPE_ERROR, "Error", type_));
|
| + syncable_service_.set_merge_data_and_start_syncing_error(
|
| + SyncError(FROM_HERE, SyncError::DATATYPE_ERROR, "Error", type_));
|
|
|
| EXPECT_EQ(DataTypeController::NOT_RUNNING, preference_dtc_->state());
|
| EXPECT_FALSE(syncable_service_.syncing());
|
| @@ -204,11 +204,10 @@ TEST_F(SyncUIDataTypeControllerTest, OnSingleDatatypeUnrecoverableError) {
|
|
|
| testing::Mock::VerifyAndClearExpectations(&start_callback_);
|
| EXPECT_CALL(model_load_callback_, Run(_, _));
|
| - syncer::SyncError error(FROM_HERE, syncer::SyncError::DATATYPE_ERROR, "error",
|
| - syncer::PREFERENCES);
|
| + SyncError error(FROM_HERE, SyncError::DATATYPE_ERROR, "error", PREFERENCES);
|
| preference_dtc_->OnUnrecoverableError(error);
|
| PumpLoop();
|
| }
|
|
|
| } // namespace
|
| -} // namespace sync_driver
|
| +} // namespace syncer
|
|
|