Revert 58196 - GTTF: Clean up DownloadFileManager...

chrome/browser/download/download_manager.cc

Index: chrome/browser/download/download_manager.cc
===================================================================
--- chrome/browser/download/download_manager.cc	(revision 58717)
+++ chrome/browser/download/download_manager.cc	(working copy)
@@ -74,12 +74,9 @@
 void DownloadManager::Shutdown() {
   DCHECK(shutdown_needed_) << "Shutdown called when not needed.";
 
-  if (file_manager_) {
-    ChromeThread::PostTask(ChromeThread::FILE, FROM_HERE,
-        NewRunnableMethod(file_manager_,
-                          &DownloadFileManager::OnDownloadManagerShutdown,
-                          this));
-  }
+  // Stop receiving download updates
+  if (file_manager_)
+    file_manager_->RemoveDownloadManager(this);
 
   // 'in_progress_' may contain DownloadItems that have not finished the start
   // complete (from the history service) and thus aren't in downloads_.
@@ -665,6 +662,8 @@
                           render_process_id,
                           request_id));
 
+  // Tell the file manager to cancel the download.
+  file_manager_->RemoveDownload(download_id, this);  // On the UI thread
   ChromeThread::PostTask(
       ChromeThread::FILE, FROM_HERE,
       NewRunnableMethod(