Revert of [Sync] Make directory types registration explicit in ModelTypeRegistry

components/sync/driver/model_association_manager_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/sync/driver/model_association_manager.h"
 
 #include "base/callback.h"
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "components/sync/driver/fake_data_type_controller.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::_;
 
 namespace syncer {
 
 class MockModelAssociationManagerDelegate
     : public ModelAssociationManagerDelegate {
  public:
   MockModelAssociationManagerDelegate() {}
   ~MockModelAssociationManagerDelegate() {}
   MOCK_METHOD0(OnAllDataTypesReadyForConfigure, void());
   MOCK_METHOD2(OnSingleDataTypeAssociationDone,
                void(ModelType type,
                     const DataTypeAssociationStats& association_stats));
-  MOCK_METHOD1(OnSingleDataTypeWillStart, void(ModelType type));
   MOCK_METHOD2(OnSingleDataTypeWillStop,
                void(ModelType, const SyncError& error));
   MOCK_METHOD1(OnModelAssociationDone,
                void(const DataTypeManager::ConfigureResult& result));
 };
 
 FakeDataTypeController* GetController(
     const DataTypeController::TypeMap& controllers,
     ModelType model_type) {
   DataTypeController::TypeMap::const_iterator it = controllers.find(model_type);
@@ skipping 19 matching lines @@
 };
 
 // Start a type and make sure ModelAssociationManager callst the |Start|
 // method and calls the callback when it is done.
 TEST_F(SyncModelAssociationManagerTest, SimpleModelStart) {
   controllers_[BOOKMARKS] = base::MakeUnique<FakeDataTypeController>(BOOKMARKS);
   controllers_[APPS] = base::MakeUnique<FakeDataTypeController>(APPS);
   ModelAssociationManager model_association_manager(&controllers_, &delegate_);
   ModelTypeSet types(BOOKMARKS, APPS);
   DataTypeManager::ConfigureResult expected_result(DataTypeManager::OK, types);
-  EXPECT_CALL(delegate_, OnSingleDataTypeWillStart(BOOKMARKS));
-  EXPECT_CALL(delegate_, OnSingleDataTypeWillStart(APPS));
   EXPECT_CALL(delegate_, OnAllDataTypesReadyForConfigure());
   EXPECT_CALL(delegate_, OnModelAssociationDone(_))
       .WillOnce(VerifyResult(expected_result));
 
   EXPECT_EQ(GetController(controllers_, BOOKMARKS)->state(),
             DataTypeController::NOT_RUNNING);
   EXPECT_EQ(GetController(controllers_, APPS)->state(),
             DataTypeController::NOT_RUNNING);
 
   // Initialize() kicks off model loading.
@@ skipping 15 matching lines @@
 }
 
 // Start a type and call stop before it finishes associating.
 TEST_F(SyncModelAssociationManagerTest, StopModelBeforeFinish) {
   controllers_[BOOKMARKS] = base::MakeUnique<FakeDataTypeController>(BOOKMARKS);
   ModelAssociationManager model_association_manager(&controllers_, &delegate_);
 
   ModelTypeSet types;
   types.Put(BOOKMARKS);
 
-  EXPECT_CALL(delegate_, OnSingleDataTypeWillStart(BOOKMARKS));
   DataTypeManager::ConfigureResult expected_result(DataTypeManager::ABORTED,
                                                    types);
+
   EXPECT_CALL(delegate_, OnModelAssociationDone(_))
       .WillOnce(VerifyResult(expected_result));
   EXPECT_CALL(delegate_, OnSingleDataTypeWillStop(BOOKMARKS, _));
 
   model_association_manager.Initialize(types);
   model_association_manager.StartAssociationAsync(types);
 
   EXPECT_EQ(GetController(controllers_, BOOKMARKS)->state(),
             DataTypeController::ASSOCIATING);
   model_association_manager.Stop();
   EXPECT_EQ(GetController(controllers_, BOOKMARKS)->state(),
             DataTypeController::NOT_RUNNING);
 }
 
 // Start a type, let it finish and then call stop.
 TEST_F(SyncModelAssociationManagerTest, StopAfterFinish) {
   controllers_[BOOKMARKS] = base::MakeUnique<FakeDataTypeController>(BOOKMARKS);
   ModelAssociationManager model_association_manager(&controllers_, &delegate_);
   ModelTypeSet types;
   types.Put(BOOKMARKS);
-  EXPECT_CALL(delegate_, OnSingleDataTypeWillStart(BOOKMARKS));
   DataTypeManager::ConfigureResult expected_result(DataTypeManager::OK, types);
   EXPECT_CALL(delegate_, OnModelAssociationDone(_))
       .WillOnce(VerifyResult(expected_result));
   EXPECT_CALL(delegate_, OnSingleDataTypeWillStop(BOOKMARKS, _));
 
   model_association_manager.Initialize(types);
   model_association_manager.StartAssociationAsync(types);
 
   EXPECT_EQ(GetController(controllers_, BOOKMARKS)->state(),
             DataTypeController::ASSOCIATING);
   GetController(controllers_, BOOKMARKS)->FinishStart(DataTypeController::OK);
 
   model_association_manager.Stop();
   EXPECT_EQ(GetController(controllers_, BOOKMARKS)->state(),
             DataTypeController::NOT_RUNNING);
 }
 
 // Make a type fail model association and verify correctness.
 TEST_F(SyncModelAssociationManagerTest, TypeFailModelAssociation) {
   controllers_[BOOKMARKS] = base::MakeUnique<FakeDataTypeController>(BOOKMARKS);
   ModelAssociationManager model_association_manager(&controllers_, &delegate_);
   ModelTypeSet types;
   types.Put(BOOKMARKS);
-  EXPECT_CALL(delegate_, OnSingleDataTypeWillStart(BOOKMARKS));
   DataTypeManager::ConfigureResult expected_result(DataTypeManager::OK, types);
   EXPECT_CALL(delegate_, OnSingleDataTypeWillStop(BOOKMARKS, _));
   EXPECT_CALL(delegate_, OnModelAssociationDone(_))
       .WillOnce(VerifyResult(expected_result));
 
   model_association_manager.Initialize(types);
   model_association_manager.StartAssociationAsync(types);
 
   EXPECT_EQ(GetController(controllers_, BOOKMARKS)->state(),
             DataTypeController::ASSOCIATING);
   GetController(controllers_, BOOKMARKS)
       ->FinishStart(DataTypeController::ASSOCIATION_FAILED);
   EXPECT_EQ(GetController(controllers_, BOOKMARKS)->state(),
             DataTypeController::NOT_RUNNING);
 }
 
 // Ensure configuring stops when a type returns a unrecoverable error.
 TEST_F(SyncModelAssociationManagerTest, TypeReturnUnrecoverableError) {
   controllers_[BOOKMARKS] = base::MakeUnique<FakeDataTypeController>(BOOKMARKS);
   ModelAssociationManager model_association_manager(&controllers_, &delegate_);
   ModelTypeSet types;
   types.Put(BOOKMARKS);
-  EXPECT_CALL(delegate_, OnSingleDataTypeWillStart(BOOKMARKS));
   DataTypeManager::ConfigureResult expected_result(
       DataTypeManager::UNRECOVERABLE_ERROR, types);
   EXPECT_CALL(delegate_, OnSingleDataTypeWillStop(BOOKMARKS, _));
   EXPECT_CALL(delegate_, OnModelAssociationDone(_))
       .WillOnce(VerifyResult(expected_result));
 
   model_association_manager.Initialize(types);
 
   model_association_manager.StartAssociationAsync(types);
 
   EXPECT_EQ(GetController(controllers_, BOOKMARKS)->state(),
             DataTypeController::ASSOCIATING);
   GetController(controllers_, BOOKMARKS)
       ->FinishStart(DataTypeController::UNRECOVERABLE_ERROR);
 }
 
 TEST_F(SyncModelAssociationManagerTest, SlowTypeAsFailedType) {
   controllers_[BOOKMARKS] = base::MakeUnique<FakeDataTypeController>(BOOKMARKS);
   controllers_[APPS] = base::MakeUnique<FakeDataTypeController>(APPS);
   GetController(controllers_, BOOKMARKS)->SetDelayModelLoad();
   ModelAssociationManager model_association_manager(&controllers_, &delegate_);
   ModelTypeSet types;
   types.Put(BOOKMARKS);
   types.Put(APPS);
 
   DataTypeManager::ConfigureResult expected_result_partially_done(
       DataTypeManager::OK, types);
 
-  EXPECT_CALL(delegate_, OnSingleDataTypeWillStart(BOOKMARKS));
-  EXPECT_CALL(delegate_, OnSingleDataTypeWillStart(APPS));
   EXPECT_CALL(delegate_, OnModelAssociationDone(_))
       .WillOnce(VerifyResult(expected_result_partially_done));
 
   model_association_manager.Initialize(types);
   model_association_manager.StartAssociationAsync(types);
   GetController(controllers_, APPS)->FinishStart(DataTypeController::OK);
 
   EXPECT_CALL(delegate_, OnSingleDataTypeWillStop(BOOKMARKS, _));
   model_association_manager.GetTimerForTesting()->user_task().Run();
 
@@ skipping 47 matching lines @@
 // is reported and stopped properly.
 TEST_F(SyncModelAssociationManagerTest, ModelLoadFailBeforeAssociationStart) {
   controllers_[BOOKMARKS] = base::MakeUnique<FakeDataTypeController>(BOOKMARKS);
   GetController(controllers_, BOOKMARKS)
       ->SetModelLoadError(
           SyncError(FROM_HERE, SyncError::DATATYPE_ERROR, "", BOOKMARKS));
   ModelAssociationManager model_association_manager(&controllers_, &delegate_);
   ModelTypeSet types;
   types.Put(BOOKMARKS);
   DataTypeManager::ConfigureResult expected_result(DataTypeManager::OK, types);
-  EXPECT_CALL(delegate_, OnSingleDataTypeWillStart(BOOKMARKS));
   EXPECT_CALL(delegate_, OnSingleDataTypeWillStop(BOOKMARKS, _));
   EXPECT_CALL(delegate_, OnModelAssociationDone(_))
       .WillOnce(VerifyResult(expected_result));
 
   model_association_manager.Initialize(types);
   EXPECT_EQ(DataTypeController::NOT_RUNNING,
             GetController(controllers_, BOOKMARKS)->state());
   model_association_manager.StartAssociationAsync(types);
   EXPECT_EQ(DataTypeController::NOT_RUNNING,
             GetController(controllers_, BOOKMARKS)->state());
 }
 
 // Test that a runtime error is handled by stopping the type.
 TEST_F(SyncModelAssociationManagerTest, StopAfterConfiguration) {
   controllers_[BOOKMARKS] = base::MakeUnique<FakeDataTypeController>(BOOKMARKS);
   ModelAssociationManager model_association_manager(&controllers_, &delegate_);
   ModelTypeSet types;
   types.Put(BOOKMARKS);
   DataTypeManager::ConfigureResult expected_result(DataTypeManager::OK, types);
-  EXPECT_CALL(delegate_, OnSingleDataTypeWillStart(BOOKMARKS));
   EXPECT_CALL(delegate_, OnModelAssociationDone(_))
       .WillOnce(VerifyResult(expected_result));
 
   model_association_manager.Initialize(types);
   model_association_manager.StartAssociationAsync(types);
 
   EXPECT_EQ(GetController(controllers_, BOOKMARKS)->state(),
             DataTypeController::ASSOCIATING);
   GetController(controllers_, BOOKMARKS)->FinishStart(DataTypeController::OK);
   EXPECT_EQ(GetController(controllers_, BOOKMARKS)->state(),
@@ skipping 14 matching lines @@
   ModelAssociationManager model_association_manager(&controllers_, &delegate_);
   ModelTypeSet types;
   types.Put(BOOKMARKS);
   types.Put(APPS);
 
   ModelTypeSet expected_types_unfinished;
   expected_types_unfinished.Put(BOOKMARKS);
   DataTypeManager::ConfigureResult expected_result_partially_done(
       DataTypeManager::OK, types);
 
-  EXPECT_CALL(delegate_, OnSingleDataTypeWillStart(BOOKMARKS));
-  EXPECT_CALL(delegate_, OnSingleDataTypeWillStart(APPS));
   EXPECT_CALL(delegate_, OnModelAssociationDone(_))
       .WillOnce(VerifyResult(expected_result_partially_done));
 
   model_association_manager.Initialize(types);
   model_association_manager.StartAssociationAsync(types);
   GetController(controllers_, APPS)->FinishStart(DataTypeController::OK);
   EXPECT_EQ(GetController(controllers_, APPS)->state(),
             DataTypeController::RUNNING);
   EXPECT_EQ(GetController(controllers_, BOOKMARKS)->state(),
             DataTypeController::ASSOCIATING);
@@ skipping 15 matching lines @@
   GetController(controllers_, APPS)->SetDelayModelLoad();
 
   // APPS controller requires LoadModels complete before configure.
   GetController(controllers_, APPS)->SetShouldLoadModelBeforeConfigure(true);
 
   ModelAssociationManager model_association_manager(&controllers_, &delegate_);
   ModelTypeSet types(BOOKMARKS, APPS);
   DataTypeManager::ConfigureResult expected_result(DataTypeManager::OK, types);
   // OnAllDataTypesReadyForConfigure shouldn't be called, APPS data type is not
   // loaded yet.
-  EXPECT_CALL(delegate_, OnSingleDataTypeWillStart(BOOKMARKS));
-  EXPECT_CALL(delegate_, OnSingleDataTypeWillStart(APPS));
   EXPECT_CALL(delegate_, OnAllDataTypesReadyForConfigure()).Times(0);
 
   model_association_manager.Initialize(types);
 
   EXPECT_EQ(GetController(controllers_, BOOKMARKS)->state(),
             DataTypeController::MODEL_STARTING);
   EXPECT_EQ(GetController(controllers_, APPS)->state(),
             DataTypeController::MODEL_STARTING);
 
   testing::Mock::VerifyAndClearExpectations(&delegate_);
@@ skipping 25 matching lines @@
   GetController(controllers_, APPS)->SetDelayModelLoad();
 
   // APPS controller requires LoadModels complete before configure.
   GetController(controllers_, APPS)->SetShouldLoadModelBeforeConfigure(true);
 
   ModelAssociationManager model_association_manager(&controllers_, &delegate_);
   ModelTypeSet types(APPS);
   DataTypeManager::ConfigureResult expected_result(DataTypeManager::OK, types);
   // OnAllDataTypesReadyForConfigure shouldn't be called, APPS data type is not
   // loaded yet.
-  EXPECT_CALL(delegate_, OnSingleDataTypeWillStart(APPS));
   EXPECT_CALL(delegate_, OnAllDataTypesReadyForConfigure()).Times(0);
 
   model_association_manager.Initialize(types);
 
   EXPECT_EQ(GetController(controllers_, APPS)->state(),
             DataTypeController::MODEL_STARTING);
 
   testing::Mock::VerifyAndClearExpectations(&delegate_);
 
   EXPECT_CALL(delegate_, OnAllDataTypesReadyForConfigure());
@@ skipping 21 matching lines @@
   GetController(controllers_, BOOKMARKS)
       ->SetShouldLoadModelBeforeConfigure(true);
   GetController(controllers_, APPS)->SetShouldLoadModelBeforeConfigure(true);
 
   ModelAssociationManager model_association_manager(&controllers_, &delegate_);
   ModelTypeSet types(BOOKMARKS, APPS);
   DataTypeManager::ConfigureResult expected_result(DataTypeManager::OK, types);
 
   // Apps will finish loading but bookmarks won't.
   // OnAllDataTypesReadyForConfigure shouldn't be called.
-  EXPECT_CALL(delegate_, OnSingleDataTypeWillStart(BOOKMARKS));
-  EXPECT_CALL(delegate_, OnSingleDataTypeWillStart(APPS));
   EXPECT_CALL(delegate_, OnAllDataTypesReadyForConfigure()).Times(0);
 
   model_association_manager.Initialize(types);
 
   GetController(controllers_, APPS)->SimulateModelLoadFinishing();
 
   EXPECT_EQ(GetController(controllers_, BOOKMARKS)->state(),
             DataTypeController::MODEL_STARTING);
   EXPECT_EQ(GetController(controllers_, APPS)->state(),
             DataTypeController::MODEL_LOADED);
@@ skipping 14 matching lines @@
 
   EXPECT_CALL(delegate_, OnAllDataTypesReadyForConfigure());
   // Finish loading BOOKMARKS. This should trigger
   // OnAllDataTypesReadyForConfigure().
   GetController(controllers_, BOOKMARKS)->SimulateModelLoadFinishing();
   EXPECT_EQ(GetController(controllers_, BOOKMARKS)->state(),
             DataTypeController::MODEL_LOADED);
 }
 
 }  // namespace syncer