| Index: components/sync_driver/non_blocking_data_type_manager.h
|
| diff --git a/components/sync_driver/non_blocking_data_type_manager.h b/components/sync_driver/non_blocking_data_type_manager.h
|
| index 49e85b31d8a933dbf8595c61176ad3a0b3cf8055..19b4731da7ba113d5c93f0aa41289e1c4d9f90b5 100644
|
| --- a/components/sync_driver/non_blocking_data_type_manager.h
|
| +++ b/components/sync_driver/non_blocking_data_type_manager.h
|
| @@ -18,8 +18,8 @@ class SequencedTaskRunner;
|
| } // namespace base
|
|
|
| namespace syncer {
|
| -class NonBlockingTypeProcessor;
|
| -class SyncCoreProxy;
|
| +class ModelTypeSyncProxyImpl;
|
| +class SyncContextProxy;
|
| } //namespace syncer
|
|
|
| namespace browser_sync {
|
| @@ -42,16 +42,16 @@ class NonBlockingDataTypeManager {
|
| // The |preferred| flag indicates whether or not this type should be synced.
|
| void RegisterType(syncer::ModelType type, bool preferred);
|
|
|
| - // Connects the NonBlockingTypeProcessor and associated model type
|
| + // Connects the ModelTypeSyncProxyImpl and associated model type
|
| // thread to its NonBlockingDataTypeController on the UI thread.
|
| - void InitializeTypeProcessor(
|
| + void InitializeType(
|
| syncer::ModelType type,
|
| const scoped_refptr<base::SequencedTaskRunner>& task_runner,
|
| - const base::WeakPtr<syncer::NonBlockingTypeProcessor>& processor);
|
| + const base::WeakPtr<syncer::ModelTypeSyncProxyImpl>& type_sync_proxy);
|
|
|
| - // Connects the sync backend, as represented by a SyncCoreProxy, to the
|
| + // Connects the sync backend, as represented by a SyncContextProxy, to the
|
| // NonBlockingDataTypeController on the UI thread.
|
| - void ConnectSyncBackend(scoped_ptr<syncer::SyncCoreProxy> proxy);
|
| + void ConnectSyncBackend(scoped_ptr<syncer::SyncContextProxy> proxy);
|
|
|
| // Disconnects the sync backend from the UI thread. Should be called
|
| // early on during shutdown, but the whole procedure is asynchronous so
|
|
|