| Index: chrome/browser/sync/sessions/session_data_type_controller_unittest.cc
|
| diff --git a/chrome/browser/sync/sessions/session_data_type_controller_unittest.cc b/chrome/browser/sync/sessions/session_data_type_controller_unittest.cc
|
| index 90f08d0d586f72262e676c15f197b774e1da294e..4b86bab74f2cd8a972c73c9aeb97bc75f0bad53d 100644
|
| --- a/chrome/browser/sync/sessions/session_data_type_controller_unittest.cc
|
| +++ b/chrome/browser/sync/sessions/session_data_type_controller_unittest.cc
|
| @@ -104,7 +104,7 @@ class SessionDataTypeControllerTest
|
| &profile_,
|
| synced_window_getter_.get(),
|
| local_device_.get(),
|
| - DataTypeController::DisableTypeCallback());
|
| + sync_driver::DataTypeController::DisableTypeCallback());
|
|
|
| load_finished_ = false;
|
| last_type_ = syncer::UNSPECIFIED;
|
| @@ -169,7 +169,8 @@ class SessionDataTypeControllerTest
|
|
|
| TEST_F(SessionDataTypeControllerTest, StartModels) {
|
| Start();
|
| - EXPECT_EQ(DataTypeController::MODEL_LOADED, controller_->state());
|
| + EXPECT_EQ(sync_driver::DataTypeController::MODEL_LOADED,
|
| + controller_->state());
|
| EXPECT_TRUE(LoadResult());
|
| }
|
|
|
| @@ -177,10 +178,12 @@ TEST_F(SessionDataTypeControllerTest, StartModelsDelayedByLocalDevice) {
|
| local_device_->SetInitialized(false);
|
| Start();
|
| EXPECT_FALSE(load_finished_);
|
| - EXPECT_EQ(DataTypeController::MODEL_STARTING, controller_->state());
|
| + EXPECT_EQ(sync_driver::DataTypeController::MODEL_STARTING,
|
| + controller_->state());
|
|
|
| local_device_->SetInitialized(true);
|
| - EXPECT_EQ(DataTypeController::MODEL_LOADED, controller_->state());
|
| + EXPECT_EQ(sync_driver::DataTypeController::MODEL_LOADED,
|
| + controller_->state());
|
| EXPECT_TRUE(LoadResult());
|
| }
|
|
|
| @@ -188,47 +191,55 @@ TEST_F(SessionDataTypeControllerTest, StartModelsDelayedByRestoreInProgress) {
|
| synced_window_delegate_->SetSessionRestoreInProgress(true);
|
| Start();
|
| EXPECT_FALSE(load_finished_);
|
| - EXPECT_EQ(DataTypeController::MODEL_STARTING, controller_->state());
|
| + EXPECT_EQ(sync_driver::DataTypeController::MODEL_STARTING,
|
| + controller_->state());
|
|
|
| synced_window_delegate_->SetSessionRestoreInProgress(false);
|
| - EXPECT_EQ(DataTypeController::MODEL_LOADED, controller_->state());
|
| + EXPECT_EQ(sync_driver::DataTypeController::MODEL_LOADED,
|
| + controller_->state());
|
| EXPECT_TRUE(LoadResult());
|
| }
|
|
|
| TEST_F(SessionDataTypeControllerTest,
|
| - StartModelsDelayedByLocalDeviceThenRestoreInProgress) {
|
| + StartModelsDelayedByLocalDeviceThenRestoreInProgress) {
|
| local_device_->SetInitialized(false);
|
| synced_window_delegate_->SetSessionRestoreInProgress(true);
|
| Start();
|
| EXPECT_FALSE(load_finished_);
|
| - EXPECT_EQ(DataTypeController::MODEL_STARTING, controller_->state());
|
| + EXPECT_EQ(sync_driver::DataTypeController::MODEL_STARTING,
|
| + controller_->state());
|
|
|
| local_device_->SetInitialized(true);
|
| EXPECT_FALSE(load_finished_);
|
| - EXPECT_EQ(DataTypeController::MODEL_STARTING, controller_->state());
|
| + EXPECT_EQ(sync_driver::DataTypeController::MODEL_STARTING,
|
| + controller_->state());
|
|
|
| synced_window_delegate_->SetSessionRestoreInProgress(false);
|
| - EXPECT_EQ(DataTypeController::MODEL_LOADED, controller_->state());
|
| + EXPECT_EQ(sync_driver::DataTypeController::MODEL_LOADED,
|
| + controller_->state());
|
| EXPECT_TRUE(LoadResult());
|
| }
|
|
|
| TEST_F(SessionDataTypeControllerTest,
|
| - StartModelsDelayedByRestoreInProgressThenLocalDevice) {
|
| + StartModelsDelayedByRestoreInProgressThenLocalDevice) {
|
| local_device_->SetInitialized(false);
|
| synced_window_delegate_->SetSessionRestoreInProgress(true);
|
| Start();
|
| EXPECT_FALSE(load_finished_);
|
| - EXPECT_EQ(DataTypeController::MODEL_STARTING, controller_->state());
|
| + EXPECT_EQ(sync_driver::DataTypeController::MODEL_STARTING,
|
| + controller_->state());
|
|
|
| synced_window_delegate_->SetSessionRestoreInProgress(false);
|
| EXPECT_FALSE(load_finished_);
|
| - EXPECT_EQ(DataTypeController::MODEL_STARTING, controller_->state());
|
| + EXPECT_EQ(sync_driver::DataTypeController::MODEL_STARTING,
|
| + controller_->state());
|
|
|
| local_device_->SetInitialized(true);
|
| - EXPECT_EQ(DataTypeController::MODEL_LOADED, controller_->state());
|
| + EXPECT_EQ(sync_driver::DataTypeController::MODEL_LOADED,
|
| + controller_->state());
|
| EXPECT_TRUE(LoadResult());
|
| }
|
|
|
| -} // namespace
|
| +} // namespace
|
|
|
| -} // namespace browser_sync
|
| +} // namespace browser_sync
|
|
|