| Index: components/browser_sync/profile_sync_components_factory_impl.cc
|
| diff --git a/components/browser_sync/profile_sync_components_factory_impl.cc b/components/browser_sync/profile_sync_components_factory_impl.cc
|
| index aa5c627f66535324f0c5a51c8e8296111a5cac76..00f400dc36036cce7762c45fb68988305de81a7e 100644
|
| --- a/components/browser_sync/profile_sync_components_factory_impl.cc
|
| +++ b/components/browser_sync/profile_sync_components_factory_impl.cc
|
| @@ -52,15 +52,15 @@ using bookmarks::BookmarkModel;
|
| using sync_bookmarks::BookmarkChangeProcessor;
|
| using sync_bookmarks::BookmarkDataTypeController;
|
| using sync_bookmarks::BookmarkModelAssociator;
|
| +using sync_sessions::SessionDataTypeController;
|
| +using syncer::AsyncDirectoryTypeController;
|
| using syncer::DataTypeController;
|
| using syncer::DataTypeManager;
|
| using syncer::DataTypeManagerImpl;
|
| using syncer::DataTypeManagerObserver;
|
| using syncer::DeviceInfoDataTypeController;
|
| -using syncer::ProxyDataTypeController;
|
| using syncer::ModelTypeController;
|
| -using syncer::AsyncDirectoryTypeController;
|
| -using sync_sessions::SessionDataTypeController;
|
| +using syncer::ProxyDataTypeController;
|
|
|
| namespace browser_sync {
|
|
|
| @@ -297,14 +297,16 @@ void ProfileSyncComponentsFactoryImpl::RegisterCommonDataTypes(
|
| }
|
|
|
| DataTypeManager* ProfileSyncComponentsFactoryImpl::CreateDataTypeManager(
|
| + syncer::ModelTypeSet initial_types,
|
| const syncer::WeakHandle<syncer::DataTypeDebugInfoListener>&
|
| debug_info_listener,
|
| const DataTypeController::TypeMap* controllers,
|
| const syncer::DataTypeEncryptionHandler* encryption_handler,
|
| - syncer::SyncEngine* engine,
|
| + syncer::ModelTypeConfigurer* configurer,
|
| DataTypeManagerObserver* observer) {
|
| - return new DataTypeManagerImpl(debug_info_listener, controllers,
|
| - encryption_handler, engine, observer);
|
| + return new DataTypeManagerImpl(initial_types, debug_info_listener,
|
| + controllers, encryption_handler, configurer,
|
| + observer);
|
| }
|
|
|
| syncer::SyncEngine* ProfileSyncComponentsFactoryImpl::CreateSyncEngine(
|
|
|