Revert "Revert 42551 "Add a "download" step into the DataTypeManager""

This is just reverting a previous revert, no code changes.  This change was originally reverted due to valgrid issues that have been fixed elsewhere.

Review URL: http://codereview.chromium.org/1528010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43222 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 14 insertions, 2 deletions

diff --git a/chrome/browser/sync/glue/sync_backend_host.cc b/chrome/browser/sync/glue/sync_backend_host.cc
index ae3519d..e5326b7 100644
--- a/chrome/browser/sync/glue/sync_backend_host.cc
+++ b/chrome/browser/sync/glue/sync_backend_host.cc
@@ -5,6 +5,7 @@
 #include "build/build_config.h"
 #include "base/file_util.h"
 #include "base/file_version_info.h"
+#include "base/task.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/profile.h"
@@ -156,6 +157,17 @@ void SyncBackendHost::Shutdown(bool sync_disabled) {
   core_ = NULL;  // Releases reference to core_.
 }
 
+void SyncBackendHost::ConfigureDataTypes(
+    const std::set<syncable::ModelType>& types,
+    CancelableTask* ready_task) {
+  // TODO(skrul):
+  //   DCHECK for existing task
+  //   Update routing info to match the requested types.
+  //   Nudge the syncer.
+  ready_task->Run();
+  delete ready_task;
+}
+
 void SyncBackendHost::ActivateDataType(
     DataTypeController* data_type_controller,
     ChangeProcessor* change_processor) {
@@ -172,7 +184,7 @@ void SyncBackendHost::ActivateDataType(
 
   // Add the data type's change processor to the list of change
   // processors so it can receive updates.
-  DCHECK(processors_.count(type) == 0);
+  DCHECK_EQ(processors_.count(type), 0U);
   processors_[type] = change_processor;
 }
 
@@ -183,7 +195,7 @@ void SyncBackendHost::DeactivateDataType(
 
   std::map<syncable::ModelType, ChangeProcessor*>::size_type erased =
       processors_.erase(data_type_controller->type());
-  DCHECK(erased == 1);
+  DCHECK_EQ(erased, 1U);
 
   // TODO(sync): At this point we need to purge the data associated
   // with this data type from the sync db.