| 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 9b20d31bba2462fb504787870dd3a4d64adbc4a4..823b3270f3f211716f49780facd7f035989d96b0 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_processor_impl.h"
 | 
| +#include "sync/internal_api/public/shared_model_type_processor.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::ModelTypeProcessorImpl>& type_processor) {
 | 
| +    const base::WeakPtr<syncer_v2::SharedModelTypeProcessor>& type_processor) {
 | 
|    DCHECK(!IsSyncProxyConnected());
 | 
|    task_runner_ = task_runner;
 | 
|    type_processor_ = type_processor;
 | 
| @@ -86,7 +86,7 @@ void NonBlockingDataTypeController::SendEnableSignal() {
 | 
|  
 | 
|    task_runner_->PostTask(
 | 
|        FROM_HERE,
 | 
| -      base::Bind(&syncer_v2::ModelTypeProcessorImpl::Enable, type_processor_,
 | 
| +      base::Bind(&syncer_v2::SharedModelTypeProcessor::Enable, type_processor_,
 | 
|                   base::Passed(sync_context_proxy_->Clone())));
 | 
|    current_state_ = ENABLED;
 | 
|  }
 | 
| @@ -94,9 +94,9 @@ void NonBlockingDataTypeController::SendEnableSignal() {
 | 
|  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::ModelTypeProcessorImpl::Disable,
 | 
| -                                    type_processor_));
 | 
| +  task_runner_->PostTask(
 | 
| +      FROM_HERE, base::Bind(&syncer_v2::SharedModelTypeProcessor::Disable,
 | 
| +                            type_processor_));
 | 
|    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::ModelTypeProcessorImpl::Disconnect,
 | 
| +      FROM_HERE, base::Bind(&syncer_v2::SharedModelTypeProcessor::Disconnect,
 | 
|                              type_processor_));
 | 
|    current_state_ = DISCONNECTED;
 | 
|  }
 | 
| 
 |