Chromium Code Reviews| 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 78d13863470dbba57cd22400172016c75346cd70..a349d7331a8fa5619de34978bb6ab70a4ef541fb 100644 |
| --- a/content/browser/download/download_manager_impl_unittest.cc |
| +++ b/content/browser/download/download_manager_impl_unittest.cc |
| @@ -707,8 +707,16 @@ TEST_F(DownloadManagerTest, RemoveAllDownloads) { |
| // result in them being removed from the DownloadManager list. |
| } |
| -// Confirm that only downloads with same origin are removed. |
| -TEST_F(DownloadManagerTest, RemoveSameOriginDownloads) { |
| +namespace { |
| + |
| +base::Callback<bool(const GURL&)> GetSingleURLFilter(const GURL* url) { |
| + return base::Bind(&GURL::operator==, base::Unretained(url)); |
|
brettw
2016/02/17 20:34:24
Can we remove the unretained and make a copy here?
msramek
2016/02/18 12:48:43
Done.
|
| +} |
| + |
| +} // namespace |
| + |
| +// Confirm that only downloads with the specified URL are removed. |
| +TEST_F(DownloadManagerTest, RemoveDownloadsByURL) { |
| base::Time now(base::Time::Now()); |
| for (uint32_t i = 0; i < 2; ++i) { |
| MockDownloadItemImpl& item(AddItemToManager()); |
| @@ -720,9 +728,10 @@ TEST_F(DownloadManagerTest, RemoveSameOriginDownloads) { |
| EXPECT_CALL(GetMockDownloadItem(0), Remove()); |
| EXPECT_CALL(GetMockDownloadItem(1), Remove()).Times(0); |
| - url::Origin origin_to_clear(download_urls_[0]); |
| - int remove_count = download_manager_->RemoveDownloadsByOriginAndTime( |
| - origin_to_clear, base::Time(), base::Time::Max()); |
| + base::Callback<bool(const GURL&)> url_filter = |
| + GetSingleURLFilter(&download_urls_[0]); |
| + int remove_count = download_manager_->RemoveDownloadsByURLAndTime( |
| + url_filter, base::Time(), base::Time::Max()); |
| EXPECT_EQ(remove_count, 1); |
| } |