summaryrefslogtreecommitdiff
path: root/chromium/components/download
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2018-09-27 12:48:26 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2018-09-27 11:11:56 +0000
commitc69fdae9c762b7bdf45016bf8398f6050b7699ba (patch)
tree7f95460374822dbb18bba1f0bad1c09a1427c8a5 /chromium/components/download
parent2a19c63448c84c1805fb1a585c3651318bb86ca7 (diff)
downloadqtwebengine-chromium-c69fdae9c762b7bdf45016bf8398f6050b7699ba.tar.gz
BASELINE: Update Chromium to 69.0.3497.113
Change-Id: I4fb3f077682cc7eda51e9046981dcd40e0183cd6 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'chromium/components/download')
-rw-r--r--chromium/components/download/internal/common/in_progress_download_manager.cc9
1 files changed, 6 insertions, 3 deletions
diff --git a/chromium/components/download/internal/common/in_progress_download_manager.cc b/chromium/components/download/internal/common/in_progress_download_manager.cc
index ca5a426dfe3..1629727467f 100644
--- a/chromium/components/download/internal/common/in_progress_download_manager.cc
+++ b/chromium/components/download/internal/common/in_progress_download_manager.cc
@@ -336,14 +336,17 @@ bool InProgressDownloadManager::ShouldOpenDownload(
base::Optional<DownloadEntry> InProgressDownloadManager::GetInProgressEntry(
DownloadItemImpl* download) {
- if (!download || !download_metadata_cache_ || !download_db_cache_)
+ if (!download)
return base::Optional<DownloadEntry>();
if (download_metadata_cache_)
return download_metadata_cache_->RetrieveEntry(download->GetGuid());
- return CreateDownloadEntryFromDownloadDBEntry(
- download_db_cache_->RetrieveEntry(download->GetGuid()));
+ if (download_db_cache_) {
+ return CreateDownloadEntryFromDownloadDBEntry(
+ download_db_cache_->RetrieveEntry(download->GetGuid()));
+ }
+ return base::Optional<DownloadEntry>();
}
void InProgressDownloadManager::ReportBytesWasted(DownloadItemImpl* download) {