Merge remote-tracking branch 'origin/5.12' into dev

Change-Id: Ib374079ded76e43d4b72f725bbf16fe353ef827e

4 files changed, 28 insertions, 10 deletions

diff --git a/src/core/download_manager_delegate_qt.cpp b/src/core/download_manager_delegate_qt.cpp
index abf4a2a95..948a62047 100644
--- a/src/core/download_manager_delegate_qt.cpp
+++ b/src/core/download_manager_delegate_qt.cpp
@@ -82,35 +82,45 @@ void DownloadManagerDelegateQt::GetNextId(const content::DownloadIdCallback& cal
     callback.Run(++m_currentId);
 }
 
+download::DownloadItem *DownloadManagerDelegateQt::findDownloadById(quint32 downloadId)
+{
+    content::DownloadManager* dlm = content::BrowserContext::GetDownloadManager(m_profileAdapter->profile());
+    return dlm->GetDownload(downloadId);
+}
+
 void DownloadManagerDelegateQt::cancelDownload(const content::DownloadTargetCallback& callback)
 {
-    callback.Run(base::FilePath(), download::DownloadItem::TARGET_DISPOSITION_PROMPT, download::DownloadDangerType::DOWNLOAD_DANGER_TYPE_MAYBE_DANGEROUS_CONTENT, base::FilePath(), download::DownloadInterruptReason::DOWNLOAD_INTERRUPT_REASON_USER_CANCELED);
+    callback.Run(base::FilePath(),
+                 download::DownloadItem::TARGET_DISPOSITION_PROMPT,
+                 download::DownloadDangerType::DOWNLOAD_DANGER_TYPE_MAYBE_DANGEROUS_CONTENT,
+                 base::FilePath(),
+                 download::DownloadInterruptReason::DOWNLOAD_INTERRUPT_REASON_USER_CANCELED);
 }
 
 void DownloadManagerDelegateQt::cancelDownload(quint32 downloadId)
 {
-    content::DownloadManager* dlm = content::BrowserContext::GetDownloadManager(m_profileAdapter->profile());
-    download::DownloadItem *download = dlm->GetDownload(downloadId);
-    if (download)
+    if (download::DownloadItem *download = findDownloadById(downloadId))
         download->Cancel(/* user_cancel */ true);
 }
 
 void DownloadManagerDelegateQt::pauseDownload(quint32 downloadId)
 {
-    content::DownloadManager* dlm = content::BrowserContext::GetDownloadManager(m_profileAdapter->profile());
-    download::DownloadItem *download = dlm->GetDownload(downloadId);
-    if (download)
+    if (download::DownloadItem *download = findDownloadById(downloadId))
         download->Pause();
 }
 
 void DownloadManagerDelegateQt::resumeDownload(quint32 downloadId)
 {
-    content::DownloadManager* dlm = content::BrowserContext::GetDownloadManager(m_profileAdapter->profile());
-    download::DownloadItem *download = dlm->GetDownload(downloadId);
-    if (download)
+    if (download::DownloadItem *download = findDownloadById(downloadId))
         download->Resume();
 }
 
+void DownloadManagerDelegateQt::removeDownload(quint32 downloadId)
+{
+    if (download::DownloadItem *download = findDownloadById(downloadId))
+        download->Remove();
+}
+
 bool DownloadManagerDelegateQt::DetermineDownloadTarget(download::DownloadItem* item,
                                                         const content::DownloadTargetCallback& callback)
 {
diff --git a/src/core/download_manager_delegate_qt.h b/src/core/download_manager_delegate_qt.h
index fa5bd12ec..db965b12d 100644
--- a/src/core/download_manager_delegate_qt.h
+++ b/src/core/download_manager_delegate_qt.h
@@ -90,6 +90,7 @@ public:
     void cancelDownload(quint32 downloadId);
     void pauseDownload(quint32 downloadId);
     void resumeDownload(quint32 downloadId);
+    void removeDownload(quint32 downloadId);
 
     void markNextDownloadAsUserRequested() { m_nextDownloadIsUserRequested = true; }
 
@@ -99,6 +100,7 @@ public:
 
 private:
     void cancelDownload(const content::DownloadTargetCallback& callback);
+    download::DownloadItem *findDownloadById(quint32 downloadId);
     void savePackageDownloadCreated(download::DownloadItem *download);
     ProfileAdapter *m_profileAdapter;
 
diff --git a/src/core/profile_adapter.cpp b/src/core/profile_adapter.cpp
index 0375c8852..cee783118 100644
--- a/src/core/profile_adapter.cpp
+++ b/src/core/profile_adapter.cpp
@@ -209,6 +209,11 @@ void ProfileAdapter::resumeDownload(quint32 downloadId)
     downloadManagerDelegate()->resumeDownload(downloadId);
 }
 
+void ProfileAdapter::removeDownload(quint32 downloadId)
+{
+    downloadManagerDelegate()->removeDownload(downloadId);
+}
+
 ProfileAdapter *ProfileAdapter::createDefaultProfileAdapter()
 {
     return WebEngineContext::current()->createDefaultProfileAdapter();
diff --git a/src/core/profile_adapter.h b/src/core/profile_adapter.h
index 40633e802..9849d2788 100644
--- a/src/core/profile_adapter.h
+++ b/src/core/profile_adapter.h
@@ -100,6 +100,7 @@ public:
     void cancelDownload(quint32 downloadId);
     void pauseDownload(quint32 downloadId);
     void resumeDownload(quint32 downloadId);
+    void removeDownload(quint32 downloadId);
 
     ProfileQt *profile();