Ask download manager to remove a download if it is overwritten by another

chrome/browser/android/download/chrome_download_manager_overwrite_infobar_delegate.cc

 // Copyright 2015 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/android/download/chrome_download_manager_overwrite_infobar_delegate.h"
 
 #include <memory>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/android/path_utils.h"
 #include "base/files/file_util.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/android/download/download_controller.h"
+#include "chrome/browser/android/download/download_manager_service.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/ui/android/infobars/download_overwrite_infobar.h"
 #include "components/infobars/core/infobar.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
 
 namespace {
 
+void DeleteExistingDownloadFileDone(
+    const base::FilePath& download_path,
+    const DownloadTargetDeterminerDelegate::FileSelectedCallback& callback) {
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+  DownloadManagerService::GetInstance()->RemoveDownloadsForPath(
+      download_path);
+  callback.Run(download_path);
+}
+
 void DeleteExistingDownloadFile(
     const base::FilePath& download_path,
     const DownloadTargetDeterminerDelegate::FileSelectedCallback& callback) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::FILE);
   base::File::Info info;
   if (GetFileInfo(download_path, &info) && !info.is_directory)
     base::DeleteFile(download_path, false);
 
-  content::BrowserThread::PostTask(content::BrowserThread::UI, FROM_HERE,
-                                   base::Bind(callback, download_path));
+  content::BrowserThread::PostTask(
+      content::BrowserThread::UI, FROM_HERE,
+      base::Bind(&DeleteExistingDownloadFileDone, download_path, callback));
 }
 
 void CreateNewFileDone(
     const DownloadTargetDeterminerDelegate::FileSelectedCallback& callback,
     const base::FilePath& target_path, bool verified) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   if (verified)
     callback.Run(target_path);
   else
     callback.Run(base::FilePath());
@@ skipping 38 matching lines @@
       file_selected_callback_(file_selected_callback) {
   download_item_->AddObserver(this);
 }
 
 infobars::InfoBarDelegate::InfoBarIdentifier
 ChromeDownloadManagerOverwriteInfoBarDelegate::GetIdentifier() const {
   return CHROME_DOWNLOAD_MANAGER_OVERWRITE_INFOBAR_DELEGATE;
 }
 
 bool ChromeDownloadManagerOverwriteInfoBarDelegate::OverwriteExistingFile() {
+  if (!download_item_)
+    return true;
+
   content::BrowserThread::PostTask(
       content::BrowserThread::FILE, FROM_HERE,
       base::Bind(&DeleteExistingDownloadFile, suggested_download_path_,
                  file_selected_callback_));
   return true;
 }
 
 bool ChromeDownloadManagerOverwriteInfoBarDelegate::CreateNewFile() {
   if (!download_item_)
     return true;
@@ skipping 26 matching lines @@
 }
 
 void ChromeDownloadManagerOverwriteInfoBarDelegate::InfoBarDismissed() {
   file_selected_callback_.Run(base::FilePath());
   DownloadController::RecordDownloadCancelReason(
       DownloadController::CANCEL_REASON_OVERWRITE_INFOBAR_DISMISSED);
 }
 
 }  // namespace android
 }  // namespace chrome