Cancel a DownloadItem when the file selection dialog is cancelled.

BUG=114196
TEST=see bug for manual test


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@123028 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/content/browser/download/download_manager_impl.cc b/content/browser/download/download_manager_impl.cc
index 24804ce..f9f3dba 100644
--- a/content/browser/download/download_manager_impl.cc
+++ b/content/browser/download/download_manager_impl.cc
@@ -896,12 +896,7 @@
   VLOG(20) << __FUNCTION__ << "()"
            << " download = " << download->DebugString(true);
 
-  // TODO(ahendrickson) -- This currently has no effect, as the download is
-  // not put on the active list until the file selection is complete.  Need
-  // to put it on the active list earlier in the process.
-  RemoveFromActiveList(download);
-
-  download->OffThreadCancel(file_manager_);
+  download->Cancel(true);
 }
 
 // Operations posted to us from the history service ----------------------------