Download code cleanup:

chrome/browser/download/download_file.cc

 // Copyright (c) 2010 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 "build/build_config.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/download/download_manager.h"
@@ skipping 16 matching lines @@
       child_id_(info->child_id),
       request_id_(info->request_id),
       full_path_(info->save_info.file_path),
       path_renamed_(false),
       dont_sleep_(true) {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE));
 }
 
 DownloadFile::~DownloadFile() {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE));
+  if (in_progress())
+    Cancel();
   Close();
 }
 
 bool DownloadFile::Initialize() {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE));
   if (!full_path_.empty() ||
       download_util::CreateTemporaryFileForDownload(&full_path_))
     return Open();
   return false;
 }
@@ skipping 145 matching lines @@
 
 void DownloadFile::CancelDownloadRequest(ResourceDispatcherHost* rdh) {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE));
   ChromeThread::PostTask(
       ChromeThread::IO, FROM_HERE,
       NewRunnableFunction(&download_util::CancelDownloadRequest,
                           rdh,
                           child_id_,
                           request_id_));
 }