Convert ShouldOpenDownload callbacks to OnceCallbacks.
These callbacks are run once, though only if ShouldOpenDownload()
returns false.
Note that some implementations return false but still don't run the
callback, which violates the contract defined in the
DownloadManagerDelegate header. This adds TODOs in those places.
[email protected], [email protected]
TBR=servolk
Bug: 1007763
Change-Id: Iae4e741fe4cc1a6d5c308e7608a4805cc4f17efb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1959542
Commit-Queue: danakj <[email protected]>
Reviewed-by: Avi Drissman <[email protected]>
Reviewed-by: Min Qin <[email protected]>
Cr-Commit-Position: refs/heads/master@{#723558}
diff --git a/content/shell/browser/shell_download_manager_delegate.cc b/content/shell/browser/shell_download_manager_delegate.cc
index 31f5fa2b..0b6a17f 100644
--- a/content/shell/browser/shell_download_manager_delegate.cc
+++ b/content/shell/browser/shell_download_manager_delegate.cc
@@ -98,7 +98,7 @@
bool ShellDownloadManagerDelegate::ShouldOpenDownload(
download::DownloadItem* item,
- const DownloadOpenDelayedCallback& callback) {
+ DownloadOpenDelayedCallback callback) {
return true;
}
diff --git a/content/shell/browser/shell_download_manager_delegate.h b/content/shell/browser/shell_download_manager_delegate.h
index 11b5487f..ca67e9f9 100644
--- a/content/shell/browser/shell_download_manager_delegate.h
+++ b/content/shell/browser/shell_download_manager_delegate.h
@@ -28,7 +28,7 @@
bool DetermineDownloadTarget(download::DownloadItem* download,
DownloadTargetCallback* callback) override;
bool ShouldOpenDownload(download::DownloadItem* item,
- const DownloadOpenDelayedCallback& callback) override;
+ DownloadOpenDelayedCallback callback) override;
void GetNextId(DownloadIdCallback callback) override;
// Inhibits prompting and sets the default download path.
diff --git a/content/shell/browser/web_test/web_test_download_manager_delegate.cc b/content/shell/browser/web_test/web_test_download_manager_delegate.cc
index df31ef5..27eefb4 100644
--- a/content/shell/browser/web_test/web_test_download_manager_delegate.cc
+++ b/content/shell/browser/web_test/web_test_download_manager_delegate.cc
@@ -34,7 +34,7 @@
bool WebTestDownloadManagerDelegate::ShouldOpenDownload(
download::DownloadItem* item,
- const DownloadOpenDelayedCallback& callback) {
+ DownloadOpenDelayedCallback callback) {
if (BlinkTestController::Get() &&
BlinkTestController::Get()->IsMainWindow(
DownloadItemUtils::GetWebContents(item)) &&
diff --git a/content/shell/browser/web_test/web_test_download_manager_delegate.h b/content/shell/browser/web_test/web_test_download_manager_delegate.h
index 033627aa..39ce210 100644
--- a/content/shell/browser/web_test/web_test_download_manager_delegate.h
+++ b/content/shell/browser/web_test/web_test_download_manager_delegate.h
@@ -25,7 +25,7 @@
// ShellDownloadManagerDelegate implementation.
bool ShouldOpenDownload(download::DownloadItem* item,
- const DownloadOpenDelayedCallback& callback) override;
+ DownloadOpenDelayedCallback callback) override;
private:
DISALLOW_COPY_AND_ASSIGN(WebTestDownloadManagerDelegate);
