Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(109)

Unified Diff: content/browser/download/download_manager_impl_unittest.cc

Issue 10263019: DownloadManagerDelegate::ShouldCompleteDownload(callback) (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: merge Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/download/download_manager_impl.cc ('k') | content/browser/download/save_package.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/download/download_manager_impl_unittest.cc
diff --git a/content/browser/download/download_manager_impl_unittest.cc b/content/browser/download/download_manager_impl_unittest.cc
index 221692e4d9e20aef492e75d21b3e5fa19bd9d882..2f3bbe8e7be9937ede2b42ea0d67175503088a61 100644
--- a/content/browser/download/download_manager_impl_unittest.cc
+++ b/content/browser/download/download_manager_impl_unittest.cc
@@ -177,12 +177,15 @@ class TestDownloadManagerDelegate : public content::DownloadManagerDelegate {
mark_content_dangerous_ = dangerous;
}
- virtual bool ShouldCompleteDownload(DownloadItem* item) {
+ virtual bool ShouldCompleteDownload(
+ DownloadItem* item,
+ const base::Closure& complete_callback) {
if (mark_content_dangerous_) {
+ CHECK(!complete_callback.is_null());
BrowserThread::PostTask(
BrowserThread::UI, FROM_HERE,
base::Bind(&TestDownloadManagerDelegate::MarkContentDangerous,
- base::Unretained(this), item->GetId()));
+ base::Unretained(this), item->GetId(), complete_callback));
mark_content_dangerous_ = false;
return false;
} else {
@@ -191,12 +194,14 @@ class TestDownloadManagerDelegate : public content::DownloadManagerDelegate {
}
private:
- void MarkContentDangerous(int32 download_id) {
+ void MarkContentDangerous(
+ int32 download_id,
+ const base::Closure& complete_callback) {
DownloadItem* item = download_manager_->GetActiveDownloadItem(download_id);
if (!item)
return;
item->SetDangerType(content::DOWNLOAD_DANGER_TYPE_DANGEROUS_CONTENT);
- item->MaybeCompleteDownload();
+ complete_callback.Run();
}
FilePath expected_suggested_path_;
@@ -204,6 +209,8 @@ class TestDownloadManagerDelegate : public content::DownloadManagerDelegate {
bool mark_content_dangerous_;
bool prompt_user_for_save_location_;
DownloadManager* download_manager_;
+
+ DISALLOW_COPY_AND_ASSIGN(TestDownloadManagerDelegate);
};
} // namespace
« no previous file with comments | « content/browser/download/download_manager_impl.cc ('k') | content/browser/download/save_package.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698