Index: chrome/browser/download/download_history_unittest.cc |
diff --git a/chrome/browser/download/download_history_unittest.cc b/chrome/browser/download/download_history_unittest.cc |
index 66276599557d31e3f998e548a94eb965231e1977..d9df525928ebf772b9e691c4f1402cf882e4b58c 100644 |
--- a/chrome/browser/download/download_history_unittest.cc |
+++ b/chrome/browser/download/download_history_unittest.cc |
@@ -235,7 +235,7 @@ class DownloadHistoryTest : public testing::Test { |
history::ToContentDownloadState(row.state), |
history::ToContentDownloadDangerType(row.danger_type), |
history::ToContentDownloadInterruptReason(row.interrupt_reason), |
- row.opened, |
+ row.opened, row.last_access_time, |
history::ToContentReceivedSlices(row.download_slice_info)); |
EXPECT_CALL(manager(), MockCreateDownloadItem(adapter)) |
.WillOnce(DoAll( |
@@ -347,37 +347,38 @@ class DownloadHistoryTest : public testing::Test { |
(base::Time::Now() - base::TimeDelta::FromMinutes(1)), "Etag", |
"abc", 100, 100, state, |
content::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS, |
- content::DOWNLOAD_INTERRUPT_REASON_NONE, false, std::string(), |
- std::string(), std::vector<content::DownloadItem::ReceivedSlice>(), |
- info); |
- } |
- |
- void InitItem(const std::string& guid, |
- uint32_t id, |
- const base::FilePath& current_path, |
- const base::FilePath& target_path, |
- const std::vector<GURL>& url_chain, |
- const GURL& referrer, |
- const GURL& site_url, |
- const GURL& tab_url, |
- const GURL& tab_referrer_url, |
- const std::string& mime_type, |
- const std::string& original_mime_type, |
- const base::Time& start_time, |
- const base::Time& end_time, |
- const std::string& etag, |
- const std::string& last_modified, |
- int64_t received_bytes, |
- int64_t total_bytes, |
- content::DownloadItem::DownloadState state, |
- content::DownloadDangerType danger_type, |
- content::DownloadInterruptReason interrupt_reason, |
- bool opened, |
- const std::string& by_extension_id, |
- const std::string& by_extension_name, |
- const std::vector<content::DownloadItem::ReceivedSlice>& |
- received_slices, |
- history::DownloadRow* info) { |
+ content::DOWNLOAD_INTERRUPT_REASON_NONE, false, base::Time::Now(), |
+ std::string(), std::string(), |
+ std::vector<content::DownloadItem::ReceivedSlice>(), info); |
+ } |
+ |
+ void InitItem( |
+ const std::string& guid, |
+ uint32_t id, |
+ const base::FilePath& current_path, |
+ const base::FilePath& target_path, |
+ const std::vector<GURL>& url_chain, |
+ const GURL& referrer, |
+ const GURL& site_url, |
+ const GURL& tab_url, |
+ const GURL& tab_referrer_url, |
+ const std::string& mime_type, |
+ const std::string& original_mime_type, |
+ base::Time start_time, |
+ base::Time end_time, |
+ const std::string& etag, |
+ const std::string& last_modified, |
+ int64_t received_bytes, |
+ int64_t total_bytes, |
+ content::DownloadItem::DownloadState state, |
+ content::DownloadDangerType danger_type, |
+ content::DownloadInterruptReason interrupt_reason, |
+ bool opened, |
+ base::Time last_access_time, |
+ const std::string& by_extension_id, |
+ const std::string& by_extension_name, |
+ const std::vector<content::DownloadItem::ReceivedSlice>& received_slices, |
+ history::DownloadRow* info) { |
DCHECK_CURRENTLY_ON(content::BrowserThread::UI); |
size_t index = items_.size(); |
@@ -405,6 +406,7 @@ class DownloadHistoryTest : public testing::Test { |
info->id = history::ToHistoryDownloadId(id); |
info->guid = guid; |
info->opened = opened; |
+ info->last_access_time = last_access_time; |
info->by_ext_id = by_extension_id; |
info->by_ext_name = by_extension_name; |
@@ -447,6 +449,8 @@ class DownloadHistoryTest : public testing::Test { |
EXPECT_CALL(item(index), GetLastReason()) |
.WillRepeatedly(Return(interrupt_reason)); |
EXPECT_CALL(item(index), GetOpened()).WillRepeatedly(Return(opened)); |
+ EXPECT_CALL(item(index), GetLastAccessTime()) |
+ .WillRepeatedly(Return(last_access_time)); |
EXPECT_CALL(item(index), GetTargetDisposition()) |
.WillRepeatedly( |
Return(content::DownloadItem::TARGET_DISPOSITION_OVERWRITE)); |