Simplify threading in browser thread by making only ChromeThread deal with di...

chrome/browser/download/download_file.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/download/download_file.h"
 
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
@@ skipping 236 matching lines @@
 void DownloadFileManager::StartDownload(DownloadCreateInfo* info) {
   DCHECK(MessageLoop::current() == file_loop_);
   DCHECK(info);
 
   DownloadFile* download = new DownloadFile(info);
   if (!download->Initialize()) {
     // Couldn't open, cancel the operation. The UI thread does not yet know
     // about this download so we have to clean up 'info'. We need to get back
     // to the IO thread to cancel the network request and CancelDownloadRequest
     // on the UI thread is the safe way to do that.
-    ui_loop_->PostTask(FROM_HERE,
-        NewRunnableFunction(&DownloadManager::CancelDownloadRequest,
+    ChromeThread::PostTask(
+        ChromeThread::IO, FROM_HERE,
+        NewRunnableFunction(&DownloadManager::OnCancelDownloadRequest,
+                            resource_dispatcher_host_,
                             info->child_id,
                             info->request_id));
     delete info;
     delete download;
     return;
   }
 
   DCHECK(LookupDownload(info->download_id) == NULL);
   downloads_[info->download_id] = download;
   info->path = download->full_path();
@@ skipping 109 matching lines @@
 
 // Lookup the DownloadManager for this TabContents' profile and inform it of
 // a new download.
 // TODO(paulg): When implementing download restart via the Downloads tab,
 //              there will be no 'render_process_id' or 'render_view_id'.
 void DownloadFileManager::OnStartDownload(DownloadCreateInfo* info) {
   DCHECK(MessageLoop::current() == ui_loop_);
   DownloadManager* manager = DownloadManagerFromRenderIds(info->child_id,
                                                           info->render_view_id);
   if (!manager) {
-    DownloadManager::CancelDownloadRequest(info->child_id, info->request_id);
+    ChromeThread::PostTask(
+        ChromeThread::IO, FROM_HERE,
+        NewRunnableFunction(&DownloadManager::OnCancelDownloadRequest,
+                            resource_dispatcher_host_,
+                            info->child_id,
+                            info->request_id));
     delete info;
     return;
   }
 
   StartUpdateTimer();
 
   // Add the download manager to our request maps for future updates. We want to
   // be able to cancel all in progress downloads when a DownloadManager is
   // deleted, such as when a profile is closed. We also want to be able to look
   // up the DownloadManager associated with a given request without having to
@@ skipping 201 matching lines @@
     // Error. Between the time the UI thread generated 'full_path' to the time
     // this code runs, something happened that prevents us from renaming.
     DownloadManagerMap::iterator dmit = managers_.find(download->id());
     if (dmit != managers_.end()) {
       DownloadManager* dlm = dmit->second;
       ui_loop_->PostTask(FROM_HERE,
           NewRunnableMethod(dlm,
                             &DownloadManager::DownloadCancelled,
                             id));
     } else {
-      ui_loop_->PostTask(FROM_HERE,
-          NewRunnableFunction(&DownloadManager::CancelDownloadRequest,
-                              download->child_id(),
+      ChromeThread::PostTask(
+        ChromeThread::IO, FROM_HERE,
+        NewRunnableFunction(&DownloadManager::OnCancelDownloadRequest,
+                            resource_dispatcher_host_,
+                            download->child_id(),
                               download->request_id()));

[darin (slow to review), 2009/10/27 00:06:52]

nit: indentation

[jam, 2009/10/27 02:38:18]

Done.

     }
   }
 
   // If the download has completed before we got this final name, we remove it
   // from our in progress map.
   if (!download->in_progress()) {
     downloads_.erase(it);
     delete download;
   }
 
   if (downloads_.empty())
     ui_loop_->PostTask(FROM_HERE, NewRunnableMethod(
         this, &DownloadFileManager::StopUpdateTimer));
 }
 
 // static
 void DownloadFileManager::DeleteFile(const FilePath& path) {
   // Make sure we only delete files.
   if (!file_util::DirectoryExists(path))
     file_util::Delete(path, false);
 }