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 0bca25ce5dc45d939b8755f3fcf3b24c51bb1d6e..21fc2d53cf9886b7a267266441024cc780d74edf 100644 |
--- a/content/browser/download/download_manager_impl_unittest.cc |
+++ b/content/browser/download/download_manager_impl_unittest.cc |
@@ -105,9 +105,12 @@ class MockDownloadItemImpl : public DownloadItemImpl { |
net::NetLogWithSource()) {} |
virtual ~MockDownloadItemImpl() {} |
- MOCK_METHOD4(OnDownloadTargetDetermined, |
- void(const base::FilePath&, TargetDisposition, |
- DownloadDangerType, const base::FilePath&)); |
+ MOCK_METHOD5(OnDownloadTargetDetermined, |
+ void(const base::FilePath&, |
+ TargetDisposition, |
+ DownloadDangerType, |
+ const base::FilePath&, |
+ DownloadInterruptReason)); |
MOCK_METHOD1(AddObserver, void(DownloadItem::Observer*)); |
MOCK_METHOD1(RemoveObserver, void(DownloadItem::Observer*)); |
MOCK_METHOD0(UpdateObservers, void()); |
@@ -490,10 +493,12 @@ class DownloadManagerTest : public testing::Test { |
DownloadManagerTest() |
: callback_called_(false), |
+ target_disposition_(DownloadItem::TARGET_DISPOSITION_OVERWRITE), |
+ danger_type_(DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS), |
+ interrupt_reason_(DOWNLOAD_INTERRUPT_REASON_NONE), |
ui_thread_(BrowserThread::UI, &message_loop_), |
file_thread_(BrowserThread::FILE, &message_loop_), |
- next_download_id_(0) { |
- } |
+ next_download_id_(0) {} |
// We tear down everything in TearDown(). |
~DownloadManagerTest() override {} |
@@ -596,12 +601,14 @@ class DownloadManagerTest : public testing::Test { |
const base::FilePath& target_path, |
DownloadItem::TargetDisposition disposition, |
DownloadDangerType danger_type, |
- const base::FilePath& intermediate_path) { |
+ const base::FilePath& intermediate_path, |
+ DownloadInterruptReason interrupt_reason) { |
callback_called_ = true; |
target_path_ = target_path; |
target_disposition_ = disposition; |
danger_type_ = danger_type; |
intermediate_path_ = intermediate_path; |
+ interrupt_reason_ = interrupt_reason; |
} |
void DetermineDownloadTarget(DownloadItemImpl* item) { |
@@ -622,6 +629,7 @@ class DownloadManagerTest : public testing::Test { |
DownloadItem::TargetDisposition target_disposition_; |
DownloadDangerType danger_type_; |
base::FilePath intermediate_path_; |
+ DownloadInterruptReason interrupt_reason_; |
std::vector<GURL> download_urls_; |
@@ -695,13 +703,13 @@ TEST_F(DownloadManagerTest, DetermineDownloadTarget_False) { |
.WillOnce(ReturnRef(path)); |
// Confirm that the callback was called with the right values in this case. |
- callback_called_ = false; |
DetermineDownloadTarget(&item); |
EXPECT_TRUE(callback_called_); |
EXPECT_EQ(path, target_path_); |
EXPECT_EQ(DownloadItem::TARGET_DISPOSITION_OVERWRITE, target_disposition_); |
EXPECT_EQ(DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS, danger_type_); |
EXPECT_EQ(path, intermediate_path_); |
+ EXPECT_EQ(DOWNLOAD_INTERRUPT_REASON_NONE, interrupt_reason_); |
} |
// Confirm the DownloadManagerImpl::RemoveAllDownloads() functionality |