USS SyncContextProxy / data type activation refactoring

components/sync_driver/backend_data_type_configurer.h

Index: components/sync_driver/backend_data_type_configurer.h
diff --git a/components/sync_driver/backend_data_type_configurer.h b/components/sync_driver/backend_data_type_configurer.h
index dec42bb34df53b162066848483d1719818fc64ea..77ca6150af1f1a6bc678922fe815f243c764b796 100644
--- a/components/sync_driver/backend_data_type_configurer.h
+++ b/components/sync_driver/backend_data_type_configurer.h
@@ -12,6 +12,10 @@
 #include "sync/internal_api/public/configure_reason.h"
 #include "sync/internal_api/public/engine/model_safe_worker.h"
 
+namespace syncer_v2 {
+struct ActivationContext;
+}
+
 namespace sync_driver {
 
 class ChangeProcessor;
@@ -61,16 +65,25 @@ class BackendDataTypeConfigurer {
   static syncer::ModelTypeSet GetDataTypesInState(
       DataTypeConfigState state, const DataTypeConfigStateMap& state_map);
 
-  // Activates change processing for the given data type.  This must
+  // Activates change processing for the given directory data type.  This must
   // be called synchronously with the data type's model association so
   // no changes are dropped between model association and change
   // processor activation.
-  virtual void ActivateDataType(
-      syncer::ModelType type, syncer::ModelSafeGroup group,
-      ChangeProcessor* change_processor) = 0;
+  virtual void ActivateDirectoryDataType(syncer::ModelType type,
+                                         syncer::ModelSafeGroup group,
+                                         ChangeProcessor* change_processor) = 0;
 
   // Deactivates change processing for the given data type.
-  virtual void DeactivateDataType(syncer::ModelType type) = 0;
+  virtual void DeactivateDirectoryDataType(syncer::ModelType type) = 0;
+
+  // Activates change processing for the given non-blocking data type.
+  // This must be called synchronously with the data type's model association.
+  virtual void ActivateNonBlockingDataType(
+      syncer::ModelType type,
+      scoped_ptr<syncer_v2::ActivationContext> activation_context) = 0;
+
+  // Deactivates change processing for the given non-blocking data type.
+  virtual void DeactivateNonBlockingDataType(syncer::ModelType type) = 0;
 
   // Set state of |types| in |state_map| to |state|.
   static void SetDataTypesState(DataTypeConfigState state,