[Sync] Refactor data type configuration/activation/deactivation

chrome/browser/sync/glue/non_frontend_data_type_controller.cc

Index: chrome/browser/sync/glue/non_frontend_data_type_controller.cc
diff --git a/chrome/browser/sync/glue/non_frontend_data_type_controller.cc b/chrome/browser/sync/glue/non_frontend_data_type_controller.cc
index 96d6843ea4c712dc0da50848c79dee9647f64d20..11b54ed3a60c7d57b7e5b4f0f77e709e62f2e695 100644
--- a/chrome/browser/sync/glue/non_frontend_data_type_controller.cc
+++ b/chrome/browser/sync/glue/non_frontend_data_type_controller.cc
@@ -113,7 +113,8 @@ void NonFrontendDataTypeController::StartAssociation() {
     return;
   }
 
-  profile_sync_service_->ActivateDataType(this, change_processor_.get());
+  profile_sync_service_->ActivateDataType(type(), model_safe_group(),
+                                          change_processor_.get());
   StartDone(!sync_has_nodes ? OK_FIRST_RUN : OK, RUNNING, FROM_HERE);
 }
 
@@ -199,8 +200,7 @@ void NonFrontendDataTypeController::Stop() {
 
   // Deactivate the change processor on the UI thread. We dont want to listen
   // for any more changes or process them from server.
-  if (change_processor_.get())
-    profile_sync_service_->DeactivateDataType(this, change_processor_.get());
+  profile_sync_service_->DeactivateDataType(type());
 
   if (StopAssociationAsync()) {
     datatype_stopped_.Wait();