[Sync] Add RequestCleanupDisabledTypes() method to SyncManager

chrome/browser/sync/glue/data_type_manager_impl.cc

Index: chrome/browser/sync/glue/data_type_manager_impl.cc
diff --git a/chrome/browser/sync/glue/data_type_manager_impl.cc b/chrome/browser/sync/glue/data_type_manager_impl.cc
index 5a7cf23a0a71a781ce606c7d16df96a195b50742..4a957e6651316babf42d6f4465f9217f62299fd0 100644
--- a/chrome/browser/sync/glue/data_type_manager_impl.cc
+++ b/chrome/browser/sync/glue/data_type_manager_impl.cc
@@ -219,7 +219,7 @@ void DataTypeManagerImpl::Restart(sync_api::ConfigureReason reason,
 }
 
 void DataTypeManagerImpl::DownloadReady(bool success) {
-  DCHECK(state_ == DOWNLOAD_PENDING);
+  DCHECK_EQ(state_, DOWNLOAD_PENDING);
 
   if (!success) {
     Abort(UNRECOVERABLE_ERROR, FROM_HERE, needs_start_[0]->type());
@@ -386,7 +386,8 @@ void DataTypeManagerImpl::Stop() {
 }
 
 void DataTypeManagerImpl::FinishStop() {
-  DCHECK(state_== CONFIGURING || state_ == STOPPING || state_ == BLOCKED);
+  DCHECK(state_== CONFIGURING || state_ == STOPPING || state_ == BLOCKED ||
+         state_ == DOWNLOAD_PENDING);
   // Simply call the Stop() method on all running data types.
   for (DataTypeController::TypeMap::const_iterator it = controllers_.begin();
        it != controllers_.end(); ++it) {