[sync] Divorce DataTypeManager from NotificationService notifications by creating a new DataTypeMa…

chrome/browser/sync/profile_sync_components_factory.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_SYNC_PROFILE_SYNC_COMPONENTS_FACTORY_H__
 #define CHROME_BROWSER_SYNC_PROFILE_SYNC_COMPONENTS_FACTORY_H__
 
 #include <string>
 
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/sync/glue/data_type_controller.h"
 #include "chrome/browser/sync/glue/data_type_error_handler.h"
 #include "sync/internal_api/public/util/unrecoverable_error_handler.h"
 
 class PasswordStore;
 class ProfileSyncService;
 class WebDataService;
 
 namespace browser_sync {
 class AssociatorInterface;
 class ChangeProcessor;
 class DataTypeManager;
+class DataTypeManagerObserver;
 class GenericChangeProcessor;
 class SharedChangeProcessor;
 class SyncBackendHost;
 class DataTypeErrorHandler;
 }
 
 namespace syncer {
 class SyncableService;
 }
 
@@ skipping 24 matching lines @@
                    browser_sync::ChangeProcessor* cp)
         : model_associator(ma), change_processor(cp) {}
   };
 
   virtual ~ProfileSyncComponentsFactory() {}
 
   // Creates and registers enabled datatypes with the provided
   // ProfileSyncService.
   virtual void RegisterDataTypes(ProfileSyncService* pss) = 0;
 
-  // Instantiates a new DataTypeManager with a SyncBackendHost and a
-  // list of data type controllers.  The return pointer is owned by
-  // the caller.
+  // Instantiates a new DataTypeManager with a SyncBackendHost, a list of data
+  // type controllers and a DataTypeManagerObserver.  The return pointer is
+  // owned by the caller.
   virtual browser_sync::DataTypeManager* CreateDataTypeManager(
       browser_sync::SyncBackendHost* backend,
-      const browser_sync::DataTypeController::TypeMap* controllers) = 0;
+      const browser_sync::DataTypeController::TypeMap* controllers,
+      browser_sync::DataTypeManagerObserver* observer) = 0;
 
   // Creating this in the factory helps us mock it out in testing.
   virtual browser_sync::GenericChangeProcessor* CreateGenericChangeProcessor(
       ProfileSyncService* profile_sync_service,
       browser_sync::DataTypeErrorHandler* error_handler,
       const base::WeakPtr<syncer::SyncableService>& local_service) = 0;
 
   virtual browser_sync::SharedChangeProcessor*
       CreateSharedChangeProcessor() = 0;
 
@@ skipping 19 matching lines @@
   virtual SyncComponents CreateTypedUrlSyncComponents(
       ProfileSyncService* profile_sync_service,
       history::HistoryBackend* history_backend,
       browser_sync::DataTypeErrorHandler* error_handler) = 0;
   virtual SyncComponents CreateSessionSyncComponents(
       ProfileSyncService* profile_sync_service,
       browser_sync::DataTypeErrorHandler* error_handler) = 0;
 };
 
 #endif  // CHROME_BROWSER_SYNC_PROFILE_SYNC_COMPONENTS_FACTORY_H__