Index: content/browser/download/download_item_impl_unittest.cc |
diff --git a/content/browser/download/download_item_impl_unittest.cc b/content/browser/download/download_item_impl_unittest.cc |
index 0fdd467958fc31d0f2ec39a299996f5c76bf80ab..7ba6c2a52e548893c3d7e7fd4d9eff81ec71ddca 100644 |
--- a/content/browser/download/download_item_impl_unittest.cc |
+++ b/content/browser/download/download_item_impl_unittest.cc |
@@ -6,11 +6,13 @@ |
#include <stdint.h> |
+#include <deque> |
#include <iterator> |
#include <map> |
#include <memory> |
#include <queue> |
#include <utility> |
+#include <vector> |
#include "base/callback.h" |
#include "base/feature_list.h" |
@@ -469,8 +471,7 @@ TEST_F(DownloadItemTest, NotificationAfterInterrupted) { |
EXPECT_CALL(*download_file, Cancel()); |
TestDownloadItemObserver observer(item); |
- EXPECT_CALL(*mock_delegate(), MockResumeInterruptedDownload(_,_)) |
- .Times(0); |
+ EXPECT_CALL(*mock_delegate(), MockResumeInterruptedDownload(_, _)).Times(0); |
item->DestinationObserverAsWeakPtr()->DestinationError( |
DOWNLOAD_INTERRUPT_REASON_FILE_FAILED, 0, |
@@ -509,7 +510,7 @@ TEST_F(DownloadItemTest, NotificationAfterOnContentCheckCompleted) { |
safe_item->OnAllDataSaved(0, std::unique_ptr<crypto::SecureHash>()); |
EXPECT_TRUE(safe_observer.CheckAndResetDownloadUpdated()); |
- safe_item->OnContentCheckCompleted(DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS); |
+ safe_item->OnContentCheckCompleted(DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS, false); |
EXPECT_TRUE(safe_observer.CheckAndResetDownloadUpdated()); |
CleanupItem(safe_item, download_file, DownloadItem::IN_PROGRESS); |
@@ -521,7 +522,8 @@ TEST_F(DownloadItemTest, NotificationAfterOnContentCheckCompleted) { |
unsafeurl_item->OnAllDataSaved(0, std::unique_ptr<crypto::SecureHash>()); |
EXPECT_TRUE(unsafeurl_observer.CheckAndResetDownloadUpdated()); |
- unsafeurl_item->OnContentCheckCompleted(DOWNLOAD_DANGER_TYPE_DANGEROUS_URL); |
+ unsafeurl_item->OnContentCheckCompleted(DOWNLOAD_DANGER_TYPE_DANGEROUS_URL, |
+ false); |
EXPECT_TRUE(unsafeurl_observer.CheckAndResetDownloadUpdated()); |
EXPECT_CALL(*mock_delegate(), ShouldCompleteDownload(_, _)) |
@@ -538,7 +540,8 @@ TEST_F(DownloadItemTest, NotificationAfterOnContentCheckCompleted) { |
unsafefile_item->OnAllDataSaved(0, std::unique_ptr<crypto::SecureHash>()); |
EXPECT_TRUE(unsafefile_observer.CheckAndResetDownloadUpdated()); |
- unsafefile_item->OnContentCheckCompleted(DOWNLOAD_DANGER_TYPE_DANGEROUS_FILE); |
+ unsafefile_item->OnContentCheckCompleted(DOWNLOAD_DANGER_TYPE_DANGEROUS_FILE, |
+ false); |
EXPECT_TRUE(unsafefile_observer.CheckAndResetDownloadUpdated()); |
EXPECT_CALL(*mock_delegate(), ShouldCompleteDownload(_, _)) |
@@ -1523,8 +1526,8 @@ TEST_F(DownloadItemTest, CompleteDelegate_SetDanger) { |
copy_delegate_callback = delegate_callback; |
delegate_callback.Reset(); |
EXPECT_FALSE(item->IsDangerous()); |
- item->OnContentCheckCompleted( |
- content::DOWNLOAD_DANGER_TYPE_DANGEROUS_FILE); |
+ item->OnContentCheckCompleted(content::DOWNLOAD_DANGER_TYPE_DANGEROUS_FILE, |
+ false); |
EXPECT_EQ(DownloadItem::IN_PROGRESS, item->GetState()); |
copy_delegate_callback.Run(); |
ASSERT_TRUE(delegate_callback.is_null()); |