USS SyncContextProxy / data type activation refactoring

chrome/browser/sync/glue/sync_backend_host_mock.h

Index: chrome/browser/sync/glue/sync_backend_host_mock.h
diff --git a/chrome/browser/sync/glue/sync_backend_host_mock.h b/chrome/browser/sync/glue/sync_backend_host_mock.h
index 6293134dbb9b66b94e4464622656cf8ce5b58276..e84997929527d55732a0034cd4126e9a4b912356 100644
--- a/chrome/browser/sync/glue/sync_backend_host_mock.h
+++ b/chrome/browser/sync/glue/sync_backend_host_mock.h
@@ -67,11 +67,16 @@ class SyncBackendHostMock : public SyncBackendHost {
 
   void EnableEncryptEverything() override;
 
-  void ActivateDataType(
+  void ActivateDirectoryDataType(
       syncer::ModelType type,
       syncer::ModelSafeGroup group,
       sync_driver::ChangeProcessor* change_processor) override;
-  void DeactivateDataType(syncer::ModelType type) override;
+  void DeactivateDirectoryDataType(syncer::ModelType type) override;
+
+  void ActivateNonBlockingDataType(
+      syncer::ModelType type,
+      scoped_ptr<syncer_v2::ActivationContext>) override;
+  void DeactivateNonBlockingDataType(syncer::ModelType type) override;
 
   syncer::UserShare* GetUserShare() const override;