Revert 39964 - Move data type start/stop management into DataTypeManager

This change introduces a new interface/class called DataTypeManager whose job is to choreograph the start up and shut down of all registered data types.  It starts each data type serially, waiting for each data type to finish starting before starting the next one.  If anything goes wrong on startup, all data types are stopped.

Note that this change also simplifies the ProfileSyncServiceStartupTest as many of the cases it tested for are now the responsibility of the DataTypeManagerImpl (and these are thoroughly tested in its unit test).

I also killed off the TestProfileSyncFactory in the ProfileSyncServiceTest since it was lame and could be done with the mock.

BUG=36506

Review URL: http://codereview.chromium.org/650175

TBR=skrul@chromium.org
Review URL: http://codereview.chromium.org/661053

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39977 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 11 insertions, 26 deletions

diff --git a/chrome/browser/sync/profile_sync_service_unittest.cc b/chrome/browser/sync/profile_sync_service_unittest.cc
index 8aca17e..d3da5ed 100644
--- a/chrome/browser/sync/profile_sync_service_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_unittest.cc
@@ -18,29 +18,23 @@
 #include "chrome/browser/sync/glue/bookmark_change_processor.h"
 #include "chrome/browser/sync/glue/bookmark_data_type_controller.h"
 #include "chrome/browser/sync/glue/bookmark_model_associator.h"
-#include "chrome/browser/sync/glue/data_type_controller.h"
 #include "chrome/browser/sync/glue/model_associator.h"
 #include "chrome/browser/sync/glue/sync_backend_host.h"
 #include "chrome/browser/sync/notification_method.h"
 #include "chrome/browser/sync/profile_sync_factory.h"
-#include "chrome/browser/sync/profile_sync_factory_mock.h"
 #include "chrome/browser/sync/test_profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_test_util.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/testing_profile.h"
-#include "testing/gmock/include/gmock/gmock.h"
 
 using std::vector;
 using browser_sync::AssociatorInterface;
 using browser_sync::BookmarkChangeProcessor;
 using browser_sync::BookmarkModelAssociator;
 using browser_sync::ChangeProcessor;
-using browser_sync::DataTypeController;
 using browser_sync::ModelAssociator;
 using browser_sync::SyncBackendHost;
-using testing::_;
-using testing::Return;
 
 class TestBookmarkModelAssociator :
     public TestModelAssociator<BookmarkModelAssociator> {
@@ -228,22 +222,17 @@ class ProfileSyncServiceTest : public testing::Test {
 
   void StartSyncService() {
     if (!service_.get()) {
-      service_.reset(new TestProfileSyncService(&factory_,
-                                                profile_.get(),
-                                                false));
+      service_.reset(new TestProfileSyncService(profile_.get(), false));
 
       // Register the bookmark data type.
       model_associator_ = new TestBookmarkModelAssociator(service_.get());
       change_processor_ = new BookmarkChangeProcessor(model_associator_,
                                                       service_.get());
-      EXPECT_CALL(factory_, CreateBookmarkSyncComponents(_)).
-          WillOnce(Return(ProfileSyncFactory::SyncComponents(
-              model_associator_, change_processor_)));
-      EXPECT_CALL(factory_, CreateDataTypeManager(_)).
-          WillOnce(MakeDataTypeManager());
-
+      factory_.reset(new TestProfileSyncFactory(NULL,
+                                                model_associator_,
+                                                change_processor_));
       service_->RegisterDataTypeController(
-          new browser_sync::BookmarkDataTypeController(&factory_,
+          new browser_sync::BookmarkDataTypeController(factory_.get(),
                                                        profile_.get(),
                                                        service_.get()));
       service_->Initialize();
@@ -425,7 +414,7 @@ class ProfileSyncServiceTest : public testing::Test {
 
   scoped_ptr<TestProfileSyncService> service_;
   scoped_ptr<TestingProfile> profile_;
-  ProfileSyncFactoryMock factory_;
+  scoped_ptr<TestProfileSyncFactory> factory_;
   BookmarkModel* model_;
   TestBookmarkModelAssociator* model_associator_;
   BookmarkChangeProcessor* change_processor_;
@@ -1307,21 +1296,17 @@ TEST_F(ProfileSyncServiceTestWithData, MAYBE_TestStartupWithOldSyncData) {
 
   LoadBookmarkModel(LOAD_FROM_STORAGE, SAVE_TO_STORAGE);
   if (!service_.get()) {
-    service_.reset(
-        new TestProfileSyncService(&factory_, profile_.get(), false));
+    service_.reset(new TestProfileSyncService(profile_.get(), false));
     profile_->GetPrefs()->SetBoolean(prefs::kSyncHasSetupCompleted, false);
 
     model_associator_ = new TestBookmarkModelAssociator(service_.get());
     change_processor_ = new BookmarkChangeProcessor(model_associator_,
                                                     service_.get());
-    EXPECT_CALL(factory_, CreateBookmarkSyncComponents(_)).
-        WillOnce(Return(ProfileSyncFactory::SyncComponents(
-            model_associator_, change_processor_)));
-    EXPECT_CALL(factory_, CreateDataTypeManager(_)).
-        WillOnce(MakeDataTypeManager());
-
+    factory_.reset(new TestProfileSyncFactory(NULL,
+                                              model_associator_,
+                                              change_processor_));
     service_->RegisterDataTypeController(
-        new browser_sync::BookmarkDataTypeController(&factory_,
+        new browser_sync::BookmarkDataTypeController(factory_.get(),
                                                      profile_.get(),
                                                      service_.get()));