move some files from content/public/browser to components/download/public/core
These files are moved:
download_danger_type.h
download_save_info.h
download_save_info.cc
download_source.h
We are gradually moving all download related files from content/ to components/download.
This allows us to make download a standlone component,
and finally making it a service under services/download
BUG=803135
Change-Id: Id5be2a98beabd8bbd8be000a0fd1a36d633c6f7b
Reviewed-on: https://chromium-review.googlesource.com/891686
Commit-Queue: Min Qin <[email protected]>
Reviewed-by: David Trainor <[email protected]>
Reviewed-by: Scott Violet <[email protected]>
Reviewed-by: John Abd-El-Malek <[email protected]>
Reviewed-by: Sergey Volk <[email protected]>
Reviewed-by: Bo <[email protected]>
Reviewed-by: Robert Sesek <[email protected]>
Cr-Commit-Position: refs/heads/master@{#533119}diff --git a/chrome/browser/download/download_query_unittest.cc b/chrome/browser/download/download_query_unittest.cc
index 9c0a1821..9560e79 100644
--- a/chrome/browser/download/download_query_unittest.cc
+++ b/chrome/browser/download/download_query_unittest.cc
@@ -462,20 +462,20 @@
TEST_F(DownloadQueryTest, DownloadQueryTest_FilterDangerAccepted) {
CreateMocks(2);
- EXPECT_CALL(mock(0), GetDangerType()).WillRepeatedly(Return(
- content::DOWNLOAD_DANGER_TYPE_USER_VALIDATED));
- EXPECT_CALL(mock(1), GetDangerType()).WillRepeatedly(Return(
- content::DOWNLOAD_DANGER_TYPE_DANGEROUS_FILE));
+ EXPECT_CALL(mock(0), GetDangerType())
+ .WillRepeatedly(Return(download::DOWNLOAD_DANGER_TYPE_USER_VALIDATED));
+ EXPECT_CALL(mock(1), GetDangerType())
+ .WillRepeatedly(Return(download::DOWNLOAD_DANGER_TYPE_DANGEROUS_FILE));
AddFilter(DownloadQuery::FILTER_DANGER_ACCEPTED, true);
ExpectStandardFilterResults();
}
TEST_F(DownloadQueryTest, DownloadQueryTest_SortDangerAccepted) {
CreateMocks(2);
- EXPECT_CALL(mock(0), GetDangerType()).WillRepeatedly(Return(
- content::DOWNLOAD_DANGER_TYPE_USER_VALIDATED));
- EXPECT_CALL(mock(1), GetDangerType()).WillRepeatedly(Return(
- content::DOWNLOAD_DANGER_TYPE_DANGEROUS_FILE));
+ EXPECT_CALL(mock(0), GetDangerType())
+ .WillRepeatedly(Return(download::DOWNLOAD_DANGER_TYPE_USER_VALIDATED));
+ EXPECT_CALL(mock(1), GetDangerType())
+ .WillRepeatedly(Return(download::DOWNLOAD_DANGER_TYPE_DANGEROUS_FILE));
query()->AddSorter(DownloadQuery::SORT_DANGER_ACCEPTED,
DownloadQuery::ASCENDING);
ExpectSortInverted();
@@ -739,20 +739,20 @@
TEST_F(DownloadQueryTest, DownloadQueryTest_FilterDanger) {
CreateMocks(2);
- EXPECT_CALL(mock(0), GetDangerType()).WillRepeatedly(Return(
- content::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS));
- EXPECT_CALL(mock(1), GetDangerType()).WillRepeatedly(Return(
- content::DOWNLOAD_DANGER_TYPE_DANGEROUS_FILE));
- query()->AddFilter(content::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS);
+ EXPECT_CALL(mock(0), GetDangerType())
+ .WillRepeatedly(Return(download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS));
+ EXPECT_CALL(mock(1), GetDangerType())
+ .WillRepeatedly(Return(download::DOWNLOAD_DANGER_TYPE_DANGEROUS_FILE));
+ query()->AddFilter(download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS);
ExpectStandardFilterResults();
}
TEST_F(DownloadQueryTest, DownloadQueryTest_SortDanger) {
CreateMocks(2);
- EXPECT_CALL(mock(0), GetDangerType()).WillRepeatedly(Return(
- content::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS));
- EXPECT_CALL(mock(1), GetDangerType()).WillRepeatedly(Return(
- content::DOWNLOAD_DANGER_TYPE_DANGEROUS_FILE));
+ EXPECT_CALL(mock(0), GetDangerType())
+ .WillRepeatedly(Return(download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS));
+ EXPECT_CALL(mock(1), GetDangerType())
+ .WillRepeatedly(Return(download::DOWNLOAD_DANGER_TYPE_DANGEROUS_FILE));
query()->AddSorter(DownloadQuery::SORT_DANGER, DownloadQuery::DESCENDING);
ExpectSortInverted();
}
