| Index: components/autofill/core/browser/webdata/autofill_data_type_controller_unittest.cc
|
| diff --git a/components/autofill/core/browser/webdata/autofill_data_type_controller_unittest.cc b/components/autofill/core/browser/webdata/autofill_data_type_controller_unittest.cc
|
| index 1d2df0a680959c96448d397a468d46ab61a614d2..bcee6252f97054969fecc38247a3f031bc67c871 100644
|
| --- a/components/autofill/core/browser/webdata/autofill_data_type_controller_unittest.cc
|
| +++ b/components/autofill/core/browser/webdata/autofill_data_type_controller_unittest.cc
|
| @@ -113,7 +113,7 @@ class SyncAutofillDataTypeControllerTest : public testing::Test {
|
| public:
|
| SyncAutofillDataTypeControllerTest()
|
| : db_thread_("DB_Thread"),
|
| - last_start_result_(syncer::DataTypeController::OK),
|
| + last_start_result_(sync_driver::DataTypeController::OK),
|
| weak_ptr_factory_(this) {}
|
| ~SyncAutofillDataTypeControllerTest() override {}
|
|
|
| @@ -138,7 +138,7 @@ class SyncAutofillDataTypeControllerTest : public testing::Test {
|
| }
|
|
|
| // Passed to AutofillDTC::Start().
|
| - void OnStartFinished(syncer::DataTypeController::ConfigureResult result,
|
| + void OnStartFinished(sync_driver::DataTypeController::ConfigureResult result,
|
| const syncer::SyncMergeResult& local_merge_result,
|
| const syncer::SyncMergeResult& syncer_merge_result) {
|
| last_start_result_ = result;
|
| @@ -160,12 +160,12 @@ class SyncAutofillDataTypeControllerTest : public testing::Test {
|
| protected:
|
| base::MessageLoop message_loop_;
|
| base::Thread db_thread_;
|
| - syncer::FakeSyncClient sync_client_;
|
| + sync_driver::FakeSyncClient sync_client_;
|
| std::unique_ptr<AutofillDataTypeController> autofill_dtc_;
|
| scoped_refptr<FakeWebDataService> web_data_service_;
|
|
|
| // Stores arguments of most recent call of OnStartFinished().
|
| - syncer::DataTypeController::ConfigureResult last_start_result_;
|
| + sync_driver::DataTypeController::ConfigureResult last_start_result_;
|
| syncer::SyncError last_start_error_;
|
| base::WeakPtrFactory<SyncAutofillDataTypeControllerTest> weak_ptr_factory_;
|
| };
|
| @@ -184,9 +184,10 @@ TEST_F(SyncAutofillDataTypeControllerTest, StartWDSReady) {
|
| weak_ptr_factory_.GetWeakPtr()));
|
| BlockForDBThread();
|
|
|
| - EXPECT_EQ(syncer::DataTypeController::ASSOCIATION_FAILED, last_start_result_);
|
| + EXPECT_EQ(sync_driver::DataTypeController::ASSOCIATION_FAILED,
|
| + last_start_result_);
|
| EXPECT_TRUE(last_start_error_.IsSet());
|
| - EXPECT_EQ(syncer::DataTypeController::DISABLED, autofill_dtc_->state());
|
| + EXPECT_EQ(sync_driver::DataTypeController::DISABLED, autofill_dtc_->state());
|
| }
|
|
|
| // Start the autofill DTC without the WDS's database loaded, then
|
| @@ -198,9 +199,10 @@ TEST_F(SyncAutofillDataTypeControllerTest, StartWDSNotReady) {
|
| base::Bind(&SyncAutofillDataTypeControllerTest::OnLoadFinished,
|
| weak_ptr_factory_.GetWeakPtr()));
|
|
|
| - EXPECT_EQ(syncer::DataTypeController::OK, last_start_result_);
|
| + EXPECT_EQ(sync_driver::DataTypeController::OK, last_start_result_);
|
| EXPECT_FALSE(last_start_error_.IsSet());
|
| - EXPECT_EQ(syncer::DataTypeController::MODEL_STARTING, autofill_dtc_->state());
|
| + EXPECT_EQ(sync_driver::DataTypeController::MODEL_STARTING,
|
| + autofill_dtc_->state());
|
|
|
| web_data_service_->LoadDatabase();
|
|
|
| @@ -209,10 +211,11 @@ TEST_F(SyncAutofillDataTypeControllerTest, StartWDSNotReady) {
|
| weak_ptr_factory_.GetWeakPtr()));
|
| BlockForDBThread();
|
|
|
| - EXPECT_EQ(syncer::DataTypeController::ASSOCIATION_FAILED, last_start_result_);
|
| + EXPECT_EQ(sync_driver::DataTypeController::ASSOCIATION_FAILED,
|
| + last_start_result_);
|
| EXPECT_TRUE(last_start_error_.IsSet());
|
|
|
| - EXPECT_EQ(syncer::DataTypeController::DISABLED, autofill_dtc_->state());
|
| + EXPECT_EQ(sync_driver::DataTypeController::DISABLED, autofill_dtc_->state());
|
| }
|
|
|
| } // namespace
|
|
|