| Index: chrome/browser/sync/glue/frontend_data_type_controller.cc
|
| diff --git a/chrome/browser/sync/glue/frontend_data_type_controller.cc b/chrome/browser/sync/glue/frontend_data_type_controller.cc
|
| index 6d997873011f481afcc0ca5f600e42864086f2aa..aac04d8ab41f7610449cc83bff0b3b517f520637 100644
|
| --- a/chrome/browser/sync/glue/frontend_data_type_controller.cc
|
| +++ b/chrome/browser/sync/glue/frontend_data_type_controller.cc
|
| @@ -101,7 +101,8 @@ bool FrontendDataTypeController::Associate() {
|
| return false;
|
| }
|
|
|
| - sync_service_->ActivateDataType(this, change_processor_.get());
|
| + sync_service_->ActivateDataType(type(), model_safe_group(),
|
| + change_processor_.get());
|
| state_ = RUNNING;
|
| FinishStart(!sync_has_nodes ? OK_FIRST_RUN : OK, FROM_HERE);
|
| return true;
|
| @@ -151,8 +152,7 @@ void FrontendDataTypeController::Stop() {
|
|
|
| CleanUpState();
|
|
|
| - if (change_processor_.get())
|
| - sync_service_->DeactivateDataType(this, change_processor_.get());
|
| + sync_service_->DeactivateDataType(type());
|
|
|
| if (model_associator()) {
|
| SyncError error;
|
|
|