| Index: components/sync_driver/non_blocking_data_type_controller.cc | 
| diff --git a/components/sync_driver/non_blocking_data_type_controller.cc b/components/sync_driver/non_blocking_data_type_controller.cc | 
| index a8ca5c05d92de6c85b4a5db562df26b1be4f14b1..5b5659b74e7a8d550dc40b24b0701c8e966482f8 100644 | 
| --- a/components/sync_driver/non_blocking_data_type_controller.cc | 
| +++ b/components/sync_driver/non_blocking_data_type_controller.cc | 
| @@ -7,7 +7,7 @@ | 
| #include "base/bind.h" | 
| #include "base/bind_helpers.h" | 
| #include "base/location.h" | 
| -#include "sync/engine/model_type_sync_proxy_impl.h" | 
| +#include "sync/engine/model_type_processor_impl.h" | 
|  | 
| namespace sync_driver_v2 { | 
|  | 
| @@ -21,7 +21,7 @@ NonBlockingDataTypeController::~NonBlockingDataTypeController() {} | 
|  | 
| void NonBlockingDataTypeController::InitializeType( | 
| const scoped_refptr<base::SequencedTaskRunner>& task_runner, | 
| -    const base::WeakPtr<syncer_v2::ModelTypeSyncProxyImpl>& type_sync_proxy) { | 
| +    const base::WeakPtr<syncer_v2::ModelTypeProcessorImpl>& type_sync_proxy) { | 
| DCHECK(!IsSyncProxyConnected()); | 
| task_runner_ = task_runner; | 
| type_sync_proxy_ = type_sync_proxy; | 
| @@ -86,7 +86,7 @@ void NonBlockingDataTypeController::SendEnableSignal() { | 
|  | 
| task_runner_->PostTask( | 
| FROM_HERE, | 
| -      base::Bind(&syncer_v2::ModelTypeSyncProxyImpl::Enable, type_sync_proxy_, | 
| +      base::Bind(&syncer_v2::ModelTypeProcessorImpl::Enable, type_sync_proxy_, | 
| base::Passed(sync_context_proxy_->Clone()))); | 
| current_state_ = ENABLED; | 
| } | 
| @@ -95,7 +95,7 @@ void NonBlockingDataTypeController::SendDisableSignal() { | 
| DCHECK_EQ(DISABLED, GetDesiredState()); | 
| DVLOG(1) << "Disabling non-blocking sync type " << ModelTypeToString(type_); | 
| task_runner_->PostTask(FROM_HERE, | 
| -                         base::Bind(&syncer_v2::ModelTypeSyncProxyImpl::Disable, | 
| +                         base::Bind(&syncer_v2::ModelTypeProcessorImpl::Disable, | 
| type_sync_proxy_)); | 
| current_state_ = DISABLED; | 
| } | 
| @@ -105,7 +105,7 @@ void NonBlockingDataTypeController::SendDisconnectSignal() { | 
| DVLOG(1) << "Disconnecting non-blocking sync type " | 
| << ModelTypeToString(type_); | 
| task_runner_->PostTask( | 
| -      FROM_HERE, base::Bind(&syncer_v2::ModelTypeSyncProxyImpl::Disconnect, | 
| +      FROM_HERE, base::Bind(&syncer_v2::ModelTypeProcessorImpl::Disconnect, | 
| type_sync_proxy_)); | 
| current_state_ = DISCONNECTED; | 
| } | 
|  |