USS SyncContextProxy / data type activation refactoring

chrome/browser/sync/glue/sync_backend_host_impl.cc

Index: chrome/browser/sync/glue/sync_backend_host_impl.cc
diff --git a/chrome/browser/sync/glue/sync_backend_host_impl.cc b/chrome/browser/sync/glue/sync_backend_host_impl.cc
index 920a25f21df4c8a41c356e0db0df33249d38ddaa..21700e5eece13ee3d7a0361695326f25e12914a7 100644
--- a/chrome/browser/sync/glue/sync_backend_host_impl.cc
+++ b/chrome/browser/sync/glue/sync_backend_host_impl.cc
@@ -452,16 +452,28 @@ void SyncBackendHostImpl::EnableEncryptEverything() {
       base::Bind(&SyncBackendHostCore::DoEnableEncryptEverything, core_.get()));
 }
 
-void SyncBackendHostImpl::ActivateDataType(
-    syncer::ModelType type, syncer::ModelSafeGroup group,
+void SyncBackendHostImpl::ActivateDirectoryDataType(
+    syncer::ModelType type,
+    syncer::ModelSafeGroup group,
     sync_driver::ChangeProcessor* change_processor) {
   registrar_->ActivateDataType(type, group, change_processor, GetUserShare());
 }
 
-void SyncBackendHostImpl::DeactivateDataType(syncer::ModelType type) {
+void SyncBackendHostImpl::DeactivateDirectoryDataType(syncer::ModelType type) {
   registrar_->DeactivateDataType(type);
 }
 
+void SyncBackendHostImpl::ActivateNonBlockingDataType(
+    syncer::ModelType type,
+    scoped_ptr<syncer_v2::ActivationContext> activation_context) {
+  sync_context_proxy_->ConnectTypeToSync(type, activation_context.Pass());
+}
+
+void SyncBackendHostImpl::DeactivateNonBlockingDataType(
+    syncer::ModelType type) {
+  sync_context_proxy_->Disconnect(type);
+}
+
 syncer::UserShare* SyncBackendHostImpl::GetUserShare() const {
   return core_->sync_manager()->GetUserShare();
 }