[Sync] Move reenable logic into DTM

components/sync_driver/data_type_manager_impl_unittest.cc

Index: components/sync_driver/data_type_manager_impl_unittest.cc
diff --git a/components/sync_driver/data_type_manager_impl_unittest.cc b/components/sync_driver/data_type_manager_impl_unittest.cc
index de5855bafa69fa0b14d26df7d1cd29fe9b07325e..80edbe05b7de49fccf53eeb67427852f2fa5f8fe 100644
--- a/components/sync_driver/data_type_manager_impl_unittest.cc
+++ b/components/sync_driver/data_type_manager_impl_unittest.cc
@@ -1180,12 +1180,9 @@ TEST_F(SyncDataTypeManagerImplTest, ReenableAfterDataTypeError) {
   Mock::VerifyAndClearExpectations(&observer_);
 
   // Re-enable bookmarks.
-  failed_data_types_handler_.ResetDataTypeErrorFor(syncer::BOOKMARKS);
-
-  SetConfigureStartExpectation();
   SetConfigureDoneExpectation(DataTypeManager::OK);
+  dtm_->ReenableType(syncer::BOOKMARKS);
 
-  Configure(dtm_.get(), ModelTypeSet(BOOKMARKS, PREFERENCES));
   EXPECT_EQ(DataTypeManager::DOWNLOAD_PENDING, dtm_->state());
   FinishDownload(*dtm_, ModelTypeSet(), ModelTypeSet());
   FinishDownload(*dtm_, ModelTypeSet(BOOKMARKS), ModelTypeSet());
@@ -1194,6 +1191,9 @@ TEST_F(SyncDataTypeManagerImplTest, ReenableAfterDataTypeError) {
   EXPECT_EQ(DataTypeManager::CONFIGURED, dtm_->state());
   EXPECT_EQ(DataTypeController::RUNNING, GetController(PREFERENCES)->state());
   EXPECT_EQ(DataTypeController::RUNNING, GetController(BOOKMARKS)->state());
+
+  // Should do nothing.
+  dtm_->ReenableType(syncer::BOOKMARKS);
 }
 
 TEST_F(SyncDataTypeManagerImplTest, UnreadyType) {
@@ -1212,9 +1212,8 @@ TEST_F(SyncDataTypeManagerImplTest, UnreadyType) {
 
   // Bookmarks should start normally now.
   GetController(BOOKMARKS)->SetReadyForStart(true);
-  SetConfigureStartExpectation();
   SetConfigureDoneExpectation(DataTypeManager::OK);
-  Configure(dtm_.get(), ModelTypeSet(BOOKMARKS));
+  dtm_->ReenableType(BOOKMARKS);
   EXPECT_EQ(DataTypeManager::DOWNLOAD_PENDING, dtm_->state());
 
   FinishDownload(*dtm_, ModelTypeSet(), ModelTypeSet());
@@ -1225,6 +1224,10 @@ TEST_F(SyncDataTypeManagerImplTest, UnreadyType) {
   EXPECT_EQ(DataTypeManager::CONFIGURED, dtm_->state());
   EXPECT_EQ(1U, configurer_.activated_types().Size());
 
+  // Should do nothing.
+  Mock::VerifyAndClearExpectations(&observer_);
+  dtm_->ReenableType(BOOKMARKS);
+
   dtm_->Stop();
   EXPECT_EQ(DataTypeManager::STOPPED, dtm_->state());
   EXPECT_TRUE(configurer_.activated_types().Empty());