Index: components/search_engines/search_engine_data_type_controller_unittest.cc |
diff --git a/components/search_engines/search_engine_data_type_controller_unittest.cc b/components/search_engines/search_engine_data_type_controller_unittest.cc |
index 00e479d111859a51df80f98b0940a88305f902a2..bf37a330de2ea660ddc9e72898142ad85a900632 100644 |
--- a/components/search_engines/search_engine_data_type_controller_unittest.cc |
+++ b/components/search_engines/search_engine_data_type_controller_unittest.cc |
@@ -32,12 +32,11 @@ using testing::SetArgumentPointee; |
namespace browser_sync { |
namespace { |
-class SyncSearchEngineDataTypeControllerTest |
- : public testing::Test, |
- public sync_driver::FakeSyncClient { |
+class SyncSearchEngineDataTypeControllerTest : public testing::Test, |
+ public syncer::FakeSyncClient { |
public: |
SyncSearchEngineDataTypeControllerTest() |
- : sync_driver::FakeSyncClient(&profile_sync_factory_), |
+ : syncer::FakeSyncClient(&profile_sync_factory_), |
template_url_service_(nullptr, 0), |
search_engine_dtc_(base::Closure(), this, &template_url_service_) { |
// Disallow the TemplateURLService from loading until |
@@ -64,44 +63,42 @@ class SyncSearchEngineDataTypeControllerTest |
void SetStartExpectations() { |
search_engine_dtc_.SetGenericChangeProcessorFactoryForTest( |
- base::WrapUnique<sync_driver::GenericChangeProcessorFactory>( |
- new sync_driver::FakeGenericChangeProcessorFactory( |
- base::MakeUnique<sync_driver::FakeGenericChangeProcessor>( |
+ base::WrapUnique<syncer::GenericChangeProcessorFactory>( |
+ new syncer::FakeGenericChangeProcessorFactory( |
+ base::MakeUnique<syncer::FakeGenericChangeProcessor>( |
syncer::SEARCH_ENGINES, this)))); |
EXPECT_CALL(model_load_callback_, Run(_, _)); |
} |
void Start() { |
search_engine_dtc_.LoadModels( |
- base::Bind(&sync_driver::ModelLoadCallbackMock::Run, |
+ base::Bind(&syncer::ModelLoadCallbackMock::Run, |
base::Unretained(&model_load_callback_))); |
- search_engine_dtc_.StartAssociating( |
- base::Bind(&sync_driver::StartCallbackMock::Run, |
- base::Unretained(&start_callback_))); |
+ search_engine_dtc_.StartAssociating(base::Bind( |
+ &syncer::StartCallbackMock::Run, base::Unretained(&start_callback_))); |
base::RunLoop().RunUntilIdle(); |
} |
base::MessageLoop message_loop_; |
TemplateURLService template_url_service_; |
SearchEngineDataTypeController search_engine_dtc_; |
- SyncApiComponentFactoryMock profile_sync_factory_; |
+ syncer::SyncApiComponentFactoryMock profile_sync_factory_; |
syncer::FakeSyncableService syncable_service_; |
- sync_driver::StartCallbackMock start_callback_; |
- sync_driver::ModelLoadCallbackMock model_load_callback_; |
+ syncer::StartCallbackMock start_callback_; |
+ syncer::ModelLoadCallbackMock model_load_callback_; |
}; |
TEST_F(SyncSearchEngineDataTypeControllerTest, StartURLServiceReady) { |
SetStartExpectations(); |
// We want to start ready. |
PreloadTemplateURLService(); |
- EXPECT_CALL(start_callback_, Run(sync_driver::DataTypeController::OK, _, _)); |
+ EXPECT_CALL(start_callback_, Run(syncer::DataTypeController::OK, _, _)); |
- EXPECT_EQ(sync_driver::DataTypeController::NOT_RUNNING, |
+ EXPECT_EQ(syncer::DataTypeController::NOT_RUNNING, |
search_engine_dtc_.state()); |
EXPECT_FALSE(syncable_service_.syncing()); |
Start(); |
- EXPECT_EQ(sync_driver::DataTypeController::RUNNING, |
- search_engine_dtc_.state()); |
+ EXPECT_EQ(syncer::DataTypeController::RUNNING, search_engine_dtc_.state()); |
EXPECT_TRUE(syncable_service_.syncing()); |
} |
@@ -109,17 +106,17 @@ TEST_F(SyncSearchEngineDataTypeControllerTest, StartURLServiceNotReady) { |
EXPECT_CALL(model_load_callback_, Run(_, _)); |
EXPECT_FALSE(syncable_service_.syncing()); |
search_engine_dtc_.LoadModels( |
- base::Bind(&sync_driver::ModelLoadCallbackMock::Run, |
+ base::Bind(&syncer::ModelLoadCallbackMock::Run, |
base::Unretained(&model_load_callback_))); |
EXPECT_TRUE(search_engine_dtc_.GetSubscriptionForTesting()); |
- EXPECT_EQ(sync_driver::DataTypeController::MODEL_STARTING, |
+ EXPECT_EQ(syncer::DataTypeController::MODEL_STARTING, |
search_engine_dtc_.state()); |
EXPECT_FALSE(syncable_service_.syncing()); |
// Send the notification that the TemplateURLService has started. |
PreloadTemplateURLService(); |
EXPECT_EQ(NULL, search_engine_dtc_.GetSubscriptionForTesting()); |
- EXPECT_EQ(sync_driver::DataTypeController::MODEL_LOADED, |
+ EXPECT_EQ(syncer::DataTypeController::MODEL_LOADED, |
search_engine_dtc_.state()); |
// Wait until WebDB is loaded before we shut it down. |
@@ -130,7 +127,7 @@ TEST_F(SyncSearchEngineDataTypeControllerTest, StartAssociationFailed) { |
SetStartExpectations(); |
PreloadTemplateURLService(); |
EXPECT_CALL(start_callback_, |
- Run(sync_driver::DataTypeController::ASSOCIATION_FAILED, _, _)); |
+ Run(syncer::DataTypeController::ASSOCIATION_FAILED, _, _)); |
syncable_service_.set_merge_data_and_start_syncing_error( |
syncer::SyncError(FROM_HERE, |
syncer::SyncError::DATATYPE_ERROR, |
@@ -138,11 +135,10 @@ TEST_F(SyncSearchEngineDataTypeControllerTest, StartAssociationFailed) { |
syncer::SEARCH_ENGINES)); |
Start(); |
- EXPECT_EQ(sync_driver::DataTypeController::DISABLED, |
- search_engine_dtc_.state()); |
+ EXPECT_EQ(syncer::DataTypeController::DISABLED, search_engine_dtc_.state()); |
EXPECT_FALSE(syncable_service_.syncing()); |
search_engine_dtc_.Stop(); |
- EXPECT_EQ(sync_driver::DataTypeController::NOT_RUNNING, |
+ EXPECT_EQ(syncer::DataTypeController::NOT_RUNNING, |
search_engine_dtc_.state()); |
EXPECT_FALSE(syncable_service_.syncing()); |
} |
@@ -150,17 +146,16 @@ TEST_F(SyncSearchEngineDataTypeControllerTest, StartAssociationFailed) { |
TEST_F(SyncSearchEngineDataTypeControllerTest, Stop) { |
SetStartExpectations(); |
PreloadTemplateURLService(); |
- EXPECT_CALL(start_callback_, Run(sync_driver::DataTypeController::OK, _, _)); |
+ EXPECT_CALL(start_callback_, Run(syncer::DataTypeController::OK, _, _)); |
- EXPECT_EQ(sync_driver::DataTypeController::NOT_RUNNING, |
+ EXPECT_EQ(syncer::DataTypeController::NOT_RUNNING, |
search_engine_dtc_.state()); |
EXPECT_FALSE(syncable_service_.syncing()); |
Start(); |
- EXPECT_EQ(sync_driver::DataTypeController::RUNNING, |
- search_engine_dtc_.state()); |
+ EXPECT_EQ(syncer::DataTypeController::RUNNING, search_engine_dtc_.state()); |
EXPECT_TRUE(syncable_service_.syncing()); |
search_engine_dtc_.Stop(); |
- EXPECT_EQ(sync_driver::DataTypeController::NOT_RUNNING, |
+ EXPECT_EQ(syncer::DataTypeController::NOT_RUNNING, |
search_engine_dtc_.state()); |
EXPECT_FALSE(syncable_service_.syncing()); |
} |
@@ -168,15 +163,15 @@ TEST_F(SyncSearchEngineDataTypeControllerTest, Stop) { |
TEST_F(SyncSearchEngineDataTypeControllerTest, StopBeforeLoaded) { |
EXPECT_FALSE(syncable_service_.syncing()); |
search_engine_dtc_.LoadModels( |
- base::Bind(&sync_driver::ModelLoadCallbackMock::Run, |
+ base::Bind(&syncer::ModelLoadCallbackMock::Run, |
base::Unretained(&model_load_callback_))); |
EXPECT_TRUE(search_engine_dtc_.GetSubscriptionForTesting()); |
- EXPECT_EQ(sync_driver::DataTypeController::MODEL_STARTING, |
+ EXPECT_EQ(syncer::DataTypeController::MODEL_STARTING, |
search_engine_dtc_.state()); |
EXPECT_FALSE(syncable_service_.syncing()); |
search_engine_dtc_.Stop(); |
EXPECT_EQ(NULL, search_engine_dtc_.GetSubscriptionForTesting()); |
- EXPECT_EQ(sync_driver::DataTypeController::NOT_RUNNING, |
+ EXPECT_EQ(syncer::DataTypeController::NOT_RUNNING, |
search_engine_dtc_.state()); |
EXPECT_FALSE(syncable_service_.syncing()); |
} |