| Index: components/sync_driver/non_blocking_data_type_controller.h
|
| diff --git a/components/sync_driver/non_blocking_data_type_controller.h b/components/sync_driver/non_blocking_data_type_controller.h
|
| index 8ffb9be67bfd5a5e9c2783a3f23531024c02dac9..00cc12caca57461aad073f16d46fcc87418b418d 100644
|
| --- a/components/sync_driver/non_blocking_data_type_controller.h
|
| +++ b/components/sync_driver/non_blocking_data_type_controller.h
|
| @@ -63,7 +63,7 @@ class NonBlockingDataTypeController {
|
| // will only ever deal with a single type proxy.
|
| void InitializeType(
|
| const scoped_refptr<base::SequencedTaskRunner>& task_runner,
|
| - const base::WeakPtr<syncer::ModelTypeSyncProxyImpl>& type_sync_proxy);
|
| + const base::WeakPtr<syncer_v2::ModelTypeSyncProxyImpl>& type_sync_proxy);
|
|
|
| // Initialize the connection to the SyncContextProxy.
|
| //
|
| @@ -125,7 +125,7 @@ class NonBlockingDataTypeController {
|
|
|
| // The ModelTypeSyncProxyImpl and its associated thread. May be NULL.
|
| scoped_refptr<base::SequencedTaskRunner> task_runner_;
|
| - base::WeakPtr<syncer::ModelTypeSyncProxyImpl> type_sync_proxy_;
|
| + base::WeakPtr<syncer_v2::ModelTypeSyncProxyImpl> type_sync_proxy_;
|
|
|
| // The SyncContextProxy that connects to the current sync backend. May be
|
| // NULL.
|
|
|