USS SyncContextProxy / data type activation refactoring

components/sync_driver/directory_data_type_controller.cc

Index: components/sync_driver/directory_data_type_controller.cc
diff --git a/components/sync_driver/directory_data_type_controller.cc b/components/sync_driver/directory_data_type_controller.cc
index ce67b4f84fd0ab855bb84bab57a69f27a61a637f..456af544ffea2f4055efbacf71812e42d1fb8aa5 100644
--- a/components/sync_driver/directory_data_type_controller.cc
+++ b/components/sync_driver/directory_data_type_controller.cc
@@ -19,13 +19,13 @@ void DirectoryDataTypeController::ActivateDataType(
     BackendDataTypeConfigurer* configurer) {
   // Tell the backend about the change processor for this type so it can
   // begin routing changes to it.
-  configurer->ActivateDataType(type(), model_safe_group(),
-                               GetChangeProcessor());
+  configurer->ActivateDirectoryDataType(type(), model_safe_group(),
+                                        GetChangeProcessor());
 }
 
 void DirectoryDataTypeController::DeactivateDataType(
     BackendDataTypeConfigurer* configurer) {
-  configurer->DeactivateDataType(type());
+  configurer->DeactivateDirectoryDataType(type());
 }
 
 }  // namespace sync_driver