Chromium Code Reviews| Index: chrome/browser/safe_browsing/safe_browsing_database_unittest.cc |
| diff --git a/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc b/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc |
| index 33328129d7c1fbe1dd5ac64e051feb115b6d6be7..4cf32a8c761ea680ac2333b38e084297c805ae67 100644 |
| --- a/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc |
| +++ b/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc |
| @@ -27,12 +27,12 @@ |
| using base::Time; |
| using base::TimeDelta; |
| -namespace { |
| +namespace safe_browsing { |
| const TimeDelta kCacheLifetime = TimeDelta::FromMinutes(45); |
| SBPrefix SBPrefixForString(const std::string& str) { |
| - return safe_browsing::SBFullHashForString(str).prefix; |
| + return SBFullHashForString(str).prefix; |
| } |
| // Construct a full hash which has the given prefix, with the given |
| @@ -61,11 +61,12 @@ std::string HashedIpPrefix(const std::string& ip_prefix, size_t prefix_size) { |
| // Helper to build a chunk. Caller takes ownership. |
| SBChunkData* BuildChunk(int chunk_number, |
| - safe_browsing::ChunkData::ChunkType chunk_type, |
| - safe_browsing::ChunkData::PrefixType prefix_type, |
| - const void* data, size_t data_size, |
| + ChunkData::ChunkType chunk_type, |
| + ChunkData::PrefixType prefix_type, |
| + const void* data, |
| + size_t data_size, |
| const std::vector<int>& add_chunk_numbers) { |
| - scoped_ptr<safe_browsing::ChunkData> raw_data(new safe_browsing::ChunkData); |
| + scoped_ptr<ChunkData> raw_data(new ChunkData); |
| raw_data->set_chunk_number(chunk_number); |
| raw_data->set_chunk_type(chunk_type); |
| raw_data->set_prefix_type(prefix_type); |
| @@ -80,10 +81,8 @@ SBChunkData* BuildChunk(int chunk_number, |
| // Create add chunk with a single prefix. |
| SBChunkData* AddChunkPrefix(int chunk_number, SBPrefix prefix) { |
| - return BuildChunk(chunk_number, safe_browsing::ChunkData::ADD, |
| - safe_browsing::ChunkData::PREFIX_4B, |
| - &prefix, sizeof(prefix), |
| - std::vector<int>()); |
| + return BuildChunk(chunk_number, ChunkData::ADD, ChunkData::PREFIX_4B, &prefix, |
| + sizeof(prefix), std::vector<int>()); |
| } |
| // Create add chunk with a single prefix generated from |value|. |
| @@ -100,10 +99,8 @@ SBChunkData* AddChunkPrefix2Value(int chunk_number, |
| SBPrefixForString(value1), |
| SBPrefixForString(value2), |
| }; |
| - return BuildChunk(chunk_number, safe_browsing::ChunkData::ADD, |
| - safe_browsing::ChunkData::PREFIX_4B, |
| - &prefixes[0], sizeof(prefixes), |
| - std::vector<int>()); |
| + return BuildChunk(chunk_number, ChunkData::ADD, ChunkData::PREFIX_4B, |
| + &prefixes[0], sizeof(prefixes), std::vector<int>()); |
| } |
| // Generate an add chunk with four prefixes. |
| @@ -118,25 +115,21 @@ SBChunkData* AddChunkPrefix4Value(int chunk_number, |
| SBPrefixForString(value3), |
| SBPrefixForString(value4), |
| }; |
| - return BuildChunk(chunk_number, safe_browsing::ChunkData::ADD, |
| - safe_browsing::ChunkData::PREFIX_4B, |
| - &prefixes[0], sizeof(prefixes), |
| - std::vector<int>()); |
| + return BuildChunk(chunk_number, ChunkData::ADD, ChunkData::PREFIX_4B, |
| + &prefixes[0], sizeof(prefixes), std::vector<int>()); |
| } |
| // Generate an add chunk with a full hash. |
| SBChunkData* AddChunkFullHash(int chunk_number, SBFullHash full_hash) { |
| - return BuildChunk(chunk_number, safe_browsing::ChunkData::ADD, |
| - safe_browsing::ChunkData::FULL_32B, |
| - &full_hash, sizeof(full_hash), |
| - std::vector<int>()); |
| + return BuildChunk(chunk_number, ChunkData::ADD, ChunkData::FULL_32B, |
| + &full_hash, sizeof(full_hash), std::vector<int>()); |
| } |
| // Generate an add chunk with a full hash generated from |value|. |
| SBChunkData* AddChunkFullHashValue(int chunk_number, |
| const std::string& value) { |
| return AddChunkFullHash(chunk_number, |
| - safe_browsing::SBFullHashForString(value)); |
| + SBFullHashForString(value)); |
| } |
| // Generate an add chunk with two full hashes. |
| @@ -144,13 +137,11 @@ SBChunkData* AddChunkFullHash2Value(int chunk_number, |
| const std::string& value1, |
| const std::string& value2) { |
| const SBFullHash full_hashes[2] = { |
| - safe_browsing::SBFullHashForString(value1), |
| - safe_browsing::SBFullHashForString(value2), |
| + SBFullHashForString(value1), |
| + SBFullHashForString(value2), |
| }; |
| - return BuildChunk(chunk_number, safe_browsing::ChunkData::ADD, |
| - safe_browsing::ChunkData::FULL_32B, |
| - &full_hashes[0], sizeof(full_hashes), |
| - std::vector<int>()); |
| + return BuildChunk(chunk_number, ChunkData::ADD, ChunkData::FULL_32B, |
| + &full_hashes[0], sizeof(full_hashes), std::vector<int>()); |
| } |
| // Generate a sub chunk with a prefix generated from |value|. |
| @@ -158,10 +149,8 @@ SBChunkData* SubChunkPrefixValue(int chunk_number, |
| const std::string& value, |
| int add_chunk_number) { |
| const SBPrefix prefix = SBPrefixForString(value); |
| - return BuildChunk(chunk_number, safe_browsing::ChunkData::SUB, |
| - safe_browsing::ChunkData::PREFIX_4B, |
| - &prefix, sizeof(prefix), |
| - std::vector<int>(1, add_chunk_number)); |
| + return BuildChunk(chunk_number, ChunkData::SUB, ChunkData::PREFIX_4B, &prefix, |
| + sizeof(prefix), std::vector<int>(1, add_chunk_number)); |
| } |
| // Generate a sub chunk with two prefixes. |
| @@ -177,18 +166,15 @@ SBChunkData* SubChunkPrefix2Value(int chunk_number, |
| std::vector<int> add_chunk_numbers; |
| add_chunk_numbers.push_back(add_chunk_number1); |
| add_chunk_numbers.push_back(add_chunk_number2); |
| - return BuildChunk(chunk_number, safe_browsing::ChunkData::SUB, |
| - safe_browsing::ChunkData::PREFIX_4B, |
| - &prefixes[0], sizeof(prefixes), |
| - add_chunk_numbers); |
| + return BuildChunk(chunk_number, ChunkData::SUB, ChunkData::PREFIX_4B, |
| + &prefixes[0], sizeof(prefixes), add_chunk_numbers); |
| } |
| // Generate a sub chunk with a full hash. |
| SBChunkData* SubChunkFullHash(int chunk_number, |
| SBFullHash full_hash, |
| int add_chunk_number) { |
| - return BuildChunk(chunk_number, safe_browsing::ChunkData::SUB, |
| - safe_browsing::ChunkData::FULL_32B, |
| + return BuildChunk(chunk_number, ChunkData::SUB, ChunkData::FULL_32B, |
| &full_hash, sizeof(full_hash), |
| std::vector<int>(1, add_chunk_number)); |
| } |
| @@ -198,7 +184,7 @@ SBChunkData* SubChunkFullHashValue(int chunk_number, |
| const std::string& value, |
| int add_chunk_number) { |
| return SubChunkFullHash(chunk_number, |
| - safe_browsing::SBFullHashForString(value), |
| + SBFullHashForString(value), |
| add_chunk_number); |
| } |
| @@ -210,10 +196,8 @@ SBChunkData* AddChunkHashedIpValue(int chunk_number, |
| EXPECT_EQ(sizeof(SBFullHash), full_hash_str.size()); |
| SBFullHash full_hash; |
| std::memcpy(&(full_hash.full_hash), full_hash_str.data(), sizeof(SBFullHash)); |
| - return BuildChunk(chunk_number, safe_browsing::ChunkData::ADD, |
| - safe_browsing::ChunkData::FULL_32B, |
| - &full_hash, sizeof(full_hash), |
| - std::vector<int>()); |
| + return BuildChunk(chunk_number, ChunkData::ADD, ChunkData::FULL_32B, |
| + &full_hash, sizeof(full_hash), std::vector<int>()); |
| } |
| // Prevent DCHECK from killing tests. |
| @@ -249,8 +233,6 @@ class ScopedLogMessageIgnorer { |
| } |
| }; |
| -} // namespace |
|
mattm
2015/11/11 01:10:16
Keep the anon namespace inside the new namespace.
vakh (old account. dont use)
2015/11/11 18:59:53
Done.
|
| - |
| class SafeBrowsingDatabaseTest : public PlatformTest { |
| public: |
| SafeBrowsingDatabaseTest() : task_runner_(new base::TestSimpleTaskRunner) {} |
| @@ -352,12 +334,12 @@ TEST_F(SafeBrowsingDatabaseTest, BrowseListsInfo) { |
| chunks.push_back(AddChunkPrefixValue(3, "www.whatever.com/malware.html")); |
| ASSERT_TRUE(database_->UpdateStarted(&lists)); |
| - database_->InsertChunks(safe_browsing::kMalwareList, chunks.get()); |
| + database_->InsertChunks(kMalwareList, chunks.get()); |
| database_->UpdateFinished(true); |
| GetListsInfo(&lists); |
| ASSERT_LE(1U, lists.size()); |
| - EXPECT_EQ(safe_browsing::kMalwareList, lists[0].name); |
| + EXPECT_EQ(kMalwareList, lists[0].name); |
| EXPECT_EQ("1-3", lists[0].adds); |
| EXPECT_TRUE(lists[0].subs.empty()); |
| @@ -366,19 +348,19 @@ TEST_F(SafeBrowsingDatabaseTest, BrowseListsInfo) { |
| chunks.push_back(SubChunkPrefixValue(7, "www.subbed.com/noteveil1.html", 19)); |
| ASSERT_TRUE(database_->UpdateStarted(&lists)); |
| - database_->InsertChunks(safe_browsing::kMalwareList, chunks.get()); |
| + database_->InsertChunks(kMalwareList, chunks.get()); |
| database_->UpdateFinished(true); |
| GetListsInfo(&lists); |
| ASSERT_LE(1U, lists.size()); |
| - EXPECT_EQ(safe_browsing::kMalwareList, lists[0].name); |
| + EXPECT_EQ(kMalwareList, lists[0].name); |
| EXPECT_EQ("1-3", lists[0].adds); |
| EXPECT_EQ("7", lists[0].subs); |
| if (lists.size() == 2) { |
| // Old style database won't have the second entry since it creates the lists |
| // when it receives an update containing that list. The filter-based |
| // database has these values hard coded. |
| - EXPECT_EQ(safe_browsing::kPhishingList, lists[1].name); |
| + EXPECT_EQ(kPhishingList, lists[1].name); |
| EXPECT_TRUE(lists[1].adds.empty()); |
| EXPECT_TRUE(lists[1].subs.empty()); |
| } |
| @@ -392,15 +374,15 @@ TEST_F(SafeBrowsingDatabaseTest, BrowseListsInfo) { |
| SubChunkPrefixValue(201, "www.phishy2.com/notevil1.html", 1999)); |
| ASSERT_TRUE(database_->UpdateStarted(&lists)); |
| - database_->InsertChunks(safe_browsing::kPhishingList, chunks.get()); |
| + database_->InsertChunks(kPhishingList, chunks.get()); |
| database_->UpdateFinished(true); |
| GetListsInfo(&lists); |
| ASSERT_LE(2U, lists.size()); |
| - EXPECT_EQ(safe_browsing::kMalwareList, lists[0].name); |
| + EXPECT_EQ(kMalwareList, lists[0].name); |
| EXPECT_EQ("1-3", lists[0].adds); |
| EXPECT_EQ("7", lists[0].subs); |
| - EXPECT_EQ(safe_browsing::kPhishingList, lists[1].name); |
| + EXPECT_EQ(kPhishingList, lists[1].name); |
| EXPECT_EQ("47", lists[1].adds); |
| EXPECT_EQ("200-201", lists[1].subs); |
| } |
| @@ -413,73 +395,73 @@ TEST_F(SafeBrowsingDatabaseTest, ListNames) { |
| // Insert malware, phish, binurl and bindownload add chunks. |
| chunks.push_back(AddChunkPrefixValue(1, "www.evil.com/malware.html")); |
| - database_->InsertChunks(safe_browsing::kMalwareList, chunks.get()); |
| + database_->InsertChunks(kMalwareList, chunks.get()); |
| chunks.clear(); |
| chunks.push_back(AddChunkPrefixValue(2, "www.foo.com/malware.html")); |
| - database_->InsertChunks(safe_browsing::kPhishingList, chunks.get()); |
| + database_->InsertChunks(kPhishingList, chunks.get()); |
| chunks.clear(); |
| chunks.push_back(AddChunkPrefixValue(3, "www.whatever.com/download.html")); |
| - database_->InsertChunks(safe_browsing::kBinUrlList, chunks.get()); |
| + database_->InsertChunks(kBinUrlList, chunks.get()); |
| chunks.clear(); |
| chunks.push_back(AddChunkFullHashValue(5, "www.forwhitelist.com/a.html")); |
| - database_->InsertChunks(safe_browsing::kCsdWhiteList, chunks.get()); |
| + database_->InsertChunks(kCsdWhiteList, chunks.get()); |
| chunks.clear(); |
| chunks.push_back(AddChunkFullHashValue(6, "www.download.com/")); |
| - database_->InsertChunks(safe_browsing::kDownloadWhiteList, chunks.get()); |
| + database_->InsertChunks(kDownloadWhiteList, chunks.get()); |
| chunks.clear(); |
| chunks.push_back(AddChunkFullHashValue(7, "www.inclusion.com/")); |
| - database_->InsertChunks(safe_browsing::kInclusionWhitelist, |
| + database_->InsertChunks(kInclusionWhitelist, |
| chunks.get()); |
| chunks.clear(); |
| chunks.push_back(AddChunkFullHashValue(8, |
| "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" |
| "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa")); |
| - database_->InsertChunks(safe_browsing::kExtensionBlacklist, |
| + database_->InsertChunks(kExtensionBlacklist, |
| chunks.get()); |
| chunks.clear(); |
| chunks.push_back(AddChunkHashedIpValue(10, "::ffff:192.168.1.0", 120)); |
| - database_->InsertChunks(safe_browsing::kIPBlacklist, chunks.get()); |
| + database_->InsertChunks(kIPBlacklist, chunks.get()); |
| chunks.clear(); |
| chunks.push_back(AddChunkPrefixValue(11, "www.unwanted.com/software.html")); |
| - database_->InsertChunks(safe_browsing::kUnwantedUrlList, chunks.get()); |
| + database_->InsertChunks(kUnwantedUrlList, chunks.get()); |
| database_->UpdateFinished(true); |
| GetListsInfo(&lists); |
| ASSERT_EQ(9U, lists.size()); |
| - EXPECT_EQ(safe_browsing::kMalwareList, lists[0].name); |
| + EXPECT_EQ(kMalwareList, lists[0].name); |
| EXPECT_EQ("1", lists[0].adds); |
| EXPECT_TRUE(lists[0].subs.empty()); |
| - EXPECT_EQ(safe_browsing::kPhishingList, lists[1].name); |
| + EXPECT_EQ(kPhishingList, lists[1].name); |
| EXPECT_EQ("2", lists[1].adds); |
| EXPECT_TRUE(lists[1].subs.empty()); |
| - EXPECT_EQ(safe_browsing::kBinUrlList, lists[2].name); |
| + EXPECT_EQ(kBinUrlList, lists[2].name); |
| EXPECT_EQ("3", lists[2].adds); |
| EXPECT_TRUE(lists[2].subs.empty()); |
| - EXPECT_EQ(safe_browsing::kCsdWhiteList, lists[3].name); |
| + EXPECT_EQ(kCsdWhiteList, lists[3].name); |
| EXPECT_EQ("5", lists[3].adds); |
| EXPECT_TRUE(lists[3].subs.empty()); |
| - EXPECT_EQ(safe_browsing::kDownloadWhiteList, lists[4].name); |
| + EXPECT_EQ(kDownloadWhiteList, lists[4].name); |
| EXPECT_EQ("6", lists[4].adds); |
| EXPECT_TRUE(lists[4].subs.empty()); |
| - EXPECT_EQ(safe_browsing::kInclusionWhitelist, lists[5].name); |
| + EXPECT_EQ(kInclusionWhitelist, lists[5].name); |
| EXPECT_EQ("7", lists[5].adds); |
| EXPECT_TRUE(lists[5].subs.empty()); |
| - EXPECT_EQ(safe_browsing::kExtensionBlacklist, lists[6].name); |
| + EXPECT_EQ(kExtensionBlacklist, lists[6].name); |
| EXPECT_EQ("8", lists[6].adds); |
| EXPECT_TRUE(lists[6].subs.empty()); |
| - EXPECT_EQ(safe_browsing::kIPBlacklist, lists[7].name); |
| + EXPECT_EQ(kIPBlacklist, lists[7].name); |
| EXPECT_EQ("10", lists[7].adds); |
| EXPECT_TRUE(lists[7].subs.empty()); |
| - EXPECT_EQ(safe_browsing::kUnwantedUrlList, lists[8].name); |
| + EXPECT_EQ(kUnwantedUrlList, lists[8].name); |
| EXPECT_EQ("11", lists[8].adds); |
| EXPECT_TRUE(lists[8].subs.empty()); |
| @@ -497,13 +479,11 @@ TEST_F(SafeBrowsingDatabaseTest, BrowseAndUnwantedDatabasesAndPrefixSets) { |
| const char* test_list_name; |
| size_t expected_list_index; |
| TestListContainsBadUrl test_list_contains_bad_url; |
| - } const kTestCases[] { |
| - { safe_browsing::kMalwareList, 0U, |
| - &SafeBrowsingDatabase::ContainsBrowseUrl }, |
| - { safe_browsing::kPhishingList, 1U, |
| - &SafeBrowsingDatabase::ContainsBrowseUrl }, |
| - { safe_browsing::kUnwantedUrlList, 8U, |
| - &SafeBrowsingDatabase::ContainsUnwantedSoftwareUrl }, |
| + } const kTestCases[]{ |
| + {kMalwareList, 0U, &SafeBrowsingDatabase::ContainsBrowseUrl}, |
| + {kPhishingList, 1U, &SafeBrowsingDatabase::ContainsBrowseUrl}, |
| + {kUnwantedUrlList, 8U, |
| + &SafeBrowsingDatabase::ContainsUnwantedSoftwareUrl}, |
| }; |
| for (const auto& test_case : kTestCases) { |
| @@ -758,31 +738,29 @@ TEST_F(SafeBrowsingDatabaseTest, ZeroSizeChunk) { |
| "www.random.com/random2.html")); |
| ASSERT_TRUE(database_->UpdateStarted(&lists)); |
| - database_->InsertChunks(safe_browsing::kMalwareList, chunks.get()); |
| + database_->InsertChunks(kMalwareList, chunks.get()); |
| database_->UpdateFinished(true); |
| // Add an empty ADD and SUB chunk. |
| GetListsInfo(&lists); |
| ASSERT_LE(1U, lists.size()); |
| - EXPECT_EQ(safe_browsing::kMalwareList, lists[0].name); |
| + EXPECT_EQ(kMalwareList, lists[0].name); |
| EXPECT_EQ("1,10", lists[0].adds); |
| EXPECT_TRUE(lists[0].subs.empty()); |
| chunks.clear(); |
| - chunks.push_back(BuildChunk(19, safe_browsing::ChunkData::ADD, |
| - safe_browsing::ChunkData::PREFIX_4B, |
| - NULL, 0, std::vector<int>())); |
| - chunks.push_back(BuildChunk(7, safe_browsing::ChunkData::SUB, |
| - safe_browsing::ChunkData::PREFIX_4B, |
| - NULL, 0, std::vector<int>())); |
| + chunks.push_back(BuildChunk(19, ChunkData::ADD, ChunkData::PREFIX_4B, NULL, 0, |
| + std::vector<int>())); |
| + chunks.push_back(BuildChunk(7, ChunkData::SUB, ChunkData::PREFIX_4B, NULL, 0, |
| + std::vector<int>())); |
| ASSERT_TRUE(database_->UpdateStarted(&lists)); |
| - database_->InsertChunks(safe_browsing::kMalwareList, chunks.get()); |
| + database_->InsertChunks(kMalwareList, chunks.get()); |
| database_->UpdateFinished(true); |
| GetListsInfo(&lists); |
| ASSERT_LE(1U, lists.size()); |
| - EXPECT_EQ(safe_browsing::kMalwareList, lists[0].name); |
| + EXPECT_EQ(kMalwareList, lists[0].name); |
| EXPECT_EQ("1,10,19", lists[0].adds); |
| EXPECT_EQ("7", lists[0].subs); |
| @@ -790,13 +768,12 @@ TEST_F(SafeBrowsingDatabaseTest, ZeroSizeChunk) { |
| // result in the chunk range being reduced in size. |
| chunks.clear(); |
| chunks.push_back(AddChunkPrefixValue(20, "www.notempty.com/full1.html")); |
| - chunks.push_back(BuildChunk(21, safe_browsing::ChunkData::ADD, |
| - safe_browsing::ChunkData::PREFIX_4B, |
| - NULL, 0, std::vector<int>())); |
| + chunks.push_back(BuildChunk(21, ChunkData::ADD, ChunkData::PREFIX_4B, NULL, 0, |
| + std::vector<int>())); |
| chunks.push_back(AddChunkPrefixValue(22, "www.notempty.com/full2.html")); |
| ASSERT_TRUE(database_->UpdateStarted(&lists)); |
| - database_->InsertChunks(safe_browsing::kMalwareList, chunks.get()); |
| + database_->InsertChunks(kMalwareList, chunks.get()); |
| database_->UpdateFinished(true); |
| std::vector<SBPrefix> prefix_hits; |
| @@ -808,28 +785,28 @@ TEST_F(SafeBrowsingDatabaseTest, ZeroSizeChunk) { |
| GetListsInfo(&lists); |
| ASSERT_LE(1U, lists.size()); |
| - EXPECT_EQ(safe_browsing::kMalwareList, lists[0].name); |
| + EXPECT_EQ(kMalwareList, lists[0].name); |
| EXPECT_EQ("1,10,19-22", lists[0].adds); |
| EXPECT_EQ("7", lists[0].subs); |
| // Handle AddDel and SubDel commands for empty chunks. |
| ASSERT_TRUE(database_->UpdateStarted(&lists)); |
| - AddDelChunk(safe_browsing::kMalwareList, 21); |
| + AddDelChunk(kMalwareList, 21); |
| database_->UpdateFinished(true); |
| GetListsInfo(&lists); |
| ASSERT_LE(1U, lists.size()); |
| - EXPECT_EQ(safe_browsing::kMalwareList, lists[0].name); |
| + EXPECT_EQ(kMalwareList, lists[0].name); |
| EXPECT_EQ("1,10,19-20,22", lists[0].adds); |
| EXPECT_EQ("7", lists[0].subs); |
| ASSERT_TRUE(database_->UpdateStarted(&lists)); |
| - SubDelChunk(safe_browsing::kMalwareList, 7); |
| + SubDelChunk(kMalwareList, 7); |
| database_->UpdateFinished(true); |
| GetListsInfo(&lists); |
| ASSERT_LE(1U, lists.size()); |
| - EXPECT_EQ(safe_browsing::kMalwareList, lists[0].name); |
| + EXPECT_EQ(kMalwareList, lists[0].name); |
| EXPECT_EQ("1,10,19-20,22", lists[0].adds); |
| EXPECT_TRUE(lists[0].subs.empty()); |
| } |
| @@ -844,7 +821,7 @@ void SafeBrowsingDatabaseTest::PopulateDatabaseForCacheTest() { |
| std::vector<SBListChunkRanges> lists; |
| ASSERT_TRUE(database_->UpdateStarted(&lists)); |
| - database_->InsertChunks(safe_browsing::kMalwareList, chunks.get()); |
| + database_->InsertChunks(kMalwareList, chunks.get()); |
| database_->UpdateFinished(true); |
| // Cache should be cleared after updating. |
| @@ -852,19 +829,19 @@ void SafeBrowsingDatabaseTest::PopulateDatabaseForCacheTest() { |
| database_->GetUnsynchronizedPrefixGetHashCacheForTesting()->empty()); |
| SBFullHashResult full_hash; |
| - full_hash.list_id = safe_browsing::MALWARE; |
| + full_hash.list_id = MALWARE; |
| std::vector<SBFullHashResult> results; |
| std::vector<SBPrefix> prefixes; |
| // Add a fullhash result for each prefix. |
| full_hash.hash = |
| - safe_browsing::SBFullHashForString("www.evil.com/phishing.html"); |
| + SBFullHashForString("www.evil.com/phishing.html"); |
| results.push_back(full_hash); |
| prefixes.push_back(full_hash.hash.prefix); |
| full_hash.hash = |
| - safe_browsing::SBFullHashForString("www.evil.com/malware.html"); |
| + SBFullHashForString("www.evil.com/malware.html"); |
| results.push_back(full_hash); |
| prefixes.push_back(full_hash.hash.prefix); |
| @@ -885,9 +862,9 @@ TEST_F(SafeBrowsingDatabaseTest, HashCaching) { |
| GURL("http://www.evil.com/phishing.html"), &prefix_hits, &cache_hits)); |
| EXPECT_TRUE(prefix_hits.empty()); |
| ASSERT_EQ(1U, cache_hits.size()); |
| - EXPECT_TRUE(safe_browsing::SBFullHashEqual( |
| + EXPECT_TRUE(SBFullHashEqual( |
| cache_hits[0].hash, |
| - safe_browsing::SBFullHashForString("www.evil.com/phishing.html"))); |
| + SBFullHashForString("www.evil.com/phishing.html"))); |
| prefix_hits.clear(); |
| cache_hits.clear(); |
| @@ -897,9 +874,9 @@ TEST_F(SafeBrowsingDatabaseTest, HashCaching) { |
| GURL("http://www.evil.com/malware.html"), &prefix_hits, &cache_hits)); |
| EXPECT_TRUE(prefix_hits.empty()); |
| ASSERT_EQ(1U, cache_hits.size()); |
| - EXPECT_TRUE(safe_browsing::SBFullHashEqual( |
| + EXPECT_TRUE(SBFullHashEqual( |
| cache_hits[0].hash, |
| - safe_browsing::SBFullHashForString("www.evil.com/malware.html"))); |
| + SBFullHashForString("www.evil.com/malware.html"))); |
| prefix_hits.clear(); |
| cache_hits.clear(); |
| @@ -910,7 +887,7 @@ TEST_F(SafeBrowsingDatabaseTest, HashCaching) { |
| std::vector<SBListChunkRanges> lists; |
| ASSERT_TRUE(database_->UpdateStarted(&lists)); |
| - database_->InsertChunks(safe_browsing::kMalwareList, chunks.get()); |
| + database_->InsertChunks(kMalwareList, chunks.get()); |
| database_->UpdateFinished(true); |
| // This prefix should still be there, but cached fullhash should be gone. |
| @@ -930,7 +907,7 @@ TEST_F(SafeBrowsingDatabaseTest, HashCaching) { |
| // Test that an AddDel for the original chunk removes the last cached entry. |
| ASSERT_TRUE(database_->UpdateStarted(&lists)); |
| - AddDelChunk(safe_browsing::kMalwareList, 1); |
| + AddDelChunk(kMalwareList, 1); |
| database_->UpdateFinished(true); |
| EXPECT_FALSE(database_->ContainsBrowseUrl( |
| GURL("http://www.evil.com/malware.html"), &prefix_hits, &cache_hits)); |
| @@ -972,7 +949,7 @@ TEST_F(SafeBrowsingDatabaseTest, HashCaching) { |
| // Since PopulateDatabaseForCacheTest() doesn't handle adding duplicate |
| // chunks. |
| ASSERT_TRUE(database_->UpdateStarted(&lists)); |
| - AddDelChunk(safe_browsing::kMalwareList, 1); |
| + AddDelChunk(kMalwareList, 1); |
| database_->UpdateFinished(true); |
| // Cache should be cleared after updating. |
| @@ -1021,7 +998,7 @@ TEST_F(SafeBrowsingDatabaseTest, HashCaching) { |
| "www.fullevil.com/bad1.html", |
| "www.fullevil.com/bad2.html")); |
| ASSERT_TRUE(database_->UpdateStarted(&lists)); |
| - database_->InsertChunks(safe_browsing::kMalwareList, chunks.get()); |
| + database_->InsertChunks(kMalwareList, chunks.get()); |
| database_->UpdateFinished(true); |
| EXPECT_TRUE(database_->ContainsBrowseUrl( |
| @@ -1046,7 +1023,7 @@ TEST_F(SafeBrowsingDatabaseTest, HashCaching) { |
| "www.fullevil.com/bad1.html", |
| 20)); |
| ASSERT_TRUE(database_->UpdateStarted(&lists)); |
| - database_->InsertChunks(safe_browsing::kMalwareList, chunks.get()); |
| + database_->InsertChunks(kMalwareList, chunks.get()); |
| database_->UpdateFinished(true); |
| EXPECT_FALSE(database_->ContainsBrowseUrl( |
| @@ -1063,7 +1040,7 @@ TEST_F(SafeBrowsingDatabaseTest, HashCaching) { |
| // Now test an AddDel for the remaining full add. |
| ASSERT_TRUE(database_->UpdateStarted(&lists)); |
| - AddDelChunk(safe_browsing::kMalwareList, 20); |
| + AddDelChunk(kMalwareList, 20); |
| database_->UpdateFinished(true); |
| EXPECT_FALSE(database_->ContainsBrowseUrl( |
| @@ -1081,7 +1058,7 @@ TEST_F(SafeBrowsingDatabaseTest, HashCaching) { |
| { |
| ScopedVector<SBChunkData> chunks; |
| chunks.push_back(AddChunkPrefixValue(21, kExampleCollision)); |
| - database_->InsertChunks(safe_browsing::kMalwareList, chunks.get()); |
| + database_->InsertChunks(kMalwareList, chunks.get()); |
| } |
| database_->UpdateFinished(true); |
| @@ -1096,8 +1073,8 @@ TEST_F(SafeBrowsingDatabaseTest, HashCaching) { |
| // Cache gethash response for |kExampleCollision|. |
| { |
| SBFullHashResult result; |
| - result.hash = safe_browsing::SBFullHashForString(kExampleCollision); |
| - result.list_id = safe_browsing::MALWARE; |
| + result.hash = SBFullHashForString(kExampleCollision); |
| + result.list_id = MALWARE; |
| database_->CacheHashResults(std::vector<SBPrefix>(1, result.hash.prefix), |
| std::vector<SBFullHashResult>(1, result), |
| kCacheLifetime); |
| @@ -1150,7 +1127,7 @@ TEST_F(SafeBrowsingDatabaseTest, DISABLED_FileCorruptionHandling) { |
| // Start an update. The insert will fail due to corruption. |
| ASSERT_TRUE(database_->UpdateStarted(&lists)); |
| - database_->InsertChunks(safe_browsing::kMalwareList, chunks.get()); |
| + database_->InsertChunks(kMalwareList, chunks.get()); |
| database_->UpdateFinished(true); |
| // Database file still exists until the corruption handler has run. |
| @@ -1166,7 +1143,7 @@ TEST_F(SafeBrowsingDatabaseTest, DISABLED_FileCorruptionHandling) { |
| // Run the update again successfully. |
| ASSERT_TRUE(database_->UpdateStarted(&lists)); |
| - database_->InsertChunks(safe_browsing::kMalwareList, chunks.get()); |
| + database_->InsertChunks(kMalwareList, chunks.get()); |
| database_->UpdateFinished(true); |
| EXPECT_TRUE(base::PathExists(database_filename_)); |
| @@ -1184,7 +1161,7 @@ TEST_F(SafeBrowsingDatabaseTest, ContainsDownloadUrlPrefixes) { |
| std::vector<SBListChunkRanges> lists; |
| ASSERT_TRUE(database_->UpdateStarted(&lists)); |
| - database_->InsertChunks(safe_browsing::kBinUrlList, chunks.get()); |
| + database_->InsertChunks(kBinUrlList, chunks.get()); |
| database_->UpdateFinished(true); |
| std::vector<SBPrefix> prefix_hits; |
| @@ -1281,13 +1258,13 @@ TEST_F(SafeBrowsingDatabaseTest, Whitelists) { |
| // for strings. |
| TestListContainsWhitelistedString test_list_contains_whitelisted_string; |
| } const kTestCases[]{ |
| - {safe_browsing::kCsdWhiteList, |
| + {kCsdWhiteList, |
| &SafeBrowsingDatabase::ContainsCsdWhitelistedUrl, |
| nullptr}, |
| - {safe_browsing::kDownloadWhiteList, |
| + {kDownloadWhiteList, |
| &SafeBrowsingDatabase::ContainsDownloadWhitelistedUrl, |
| &SafeBrowsingDatabase::ContainsDownloadWhitelistedString}, |
| - {safe_browsing::kInclusionWhitelist, |
| + {kInclusionWhitelist, |
| &SafeBrowsingDatabase::ContainsInclusionWhitelistedUrl, |
| nullptr}, |
| }; |
| @@ -1422,7 +1399,7 @@ TEST_F(SafeBrowsingDatabaseTest, Whitelists) { |
| GURL(std::string("http://www.google.com/")))); |
| // The malware kill switch is for the CSD whitelist only. |
| - if (test_case.test_list_name == safe_browsing::kCsdWhiteList) { |
| + if (test_case.test_list_name == kCsdWhiteList) { |
| // The CSD whitelist killswitch is not present. |
| EXPECT_FALSE(database_->IsCsdWhitelistKillSwitchOn()); |
| @@ -1432,7 +1409,7 @@ TEST_F(SafeBrowsingDatabaseTest, Whitelists) { |
| 15, "sb-ssl.google.com/safebrowsing/csd/killswitch_malware")); |
| ASSERT_TRUE(database_->UpdateStarted(&lists)); |
| - database_->InsertChunks(safe_browsing::kCsdWhiteList, chunks.get()); |
| + database_->InsertChunks(kCsdWhiteList, chunks.get()); |
| database_->UpdateFinished(true); |
| EXPECT_TRUE(database_->IsMalwareIPMatchKillSwitchOn()); |
| @@ -1451,7 +1428,7 @@ TEST_F(SafeBrowsingDatabaseTest, Whitelists) { |
| database_->UpdateFinished(true); |
| // Test CSD whitelist specific methods. |
| - if (test_case.test_list_name == safe_browsing::kCsdWhiteList) { |
| + if (test_case.test_list_name == kCsdWhiteList) { |
| // The CSD whitelist killswitch is present. |
| EXPECT_TRUE(database_->IsCsdWhitelistKillSwitchOn()); |
| EXPECT_TRUE(database_->IsMalwareIPMatchKillSwitchOn()); |
| @@ -1481,7 +1458,7 @@ TEST_F(SafeBrowsingDatabaseTest, Whitelists) { |
| lists.clear(); |
| chunks.push_back(SubChunkFullHashValue( |
| 1, "sb-ssl.google.com/safebrowsing/csd/killswitch", 5)); |
| - if (test_case.test_list_name == safe_browsing::kCsdWhiteList) { |
| + if (test_case.test_list_name == kCsdWhiteList) { |
| chunks.push_back(SubChunkFullHashValue( |
| 10, "sb-ssl.google.com/safebrowsing/csd/killswitch_malware", 15)); |
| } |
| @@ -1490,7 +1467,7 @@ TEST_F(SafeBrowsingDatabaseTest, Whitelists) { |
| database_->InsertChunks(test_case.test_list_name, chunks.get()); |
| database_->UpdateFinished(true); |
| - if (test_case.test_list_name == safe_browsing::kCsdWhiteList) { |
| + if (test_case.test_list_name == kCsdWhiteList) { |
| EXPECT_FALSE(database_->IsMalwareIPMatchKillSwitchOn()); |
| EXPECT_FALSE(database_->IsCsdWhitelistKillSwitchOn()); |
| } |
| @@ -1533,12 +1510,12 @@ TEST_F(SafeBrowsingDatabaseTest, SameHostEntriesOkay) { |
| // Insert the testing chunks into database. |
| std::vector<SBListChunkRanges> lists; |
| ASSERT_TRUE(database_->UpdateStarted(&lists)); |
| - database_->InsertChunks(safe_browsing::kMalwareList, chunks.get()); |
| + database_->InsertChunks(kMalwareList, chunks.get()); |
| database_->UpdateFinished(true); |
| GetListsInfo(&lists); |
| ASSERT_LE(1U, lists.size()); |
| - EXPECT_EQ(safe_browsing::kMalwareList, lists[0].name); |
| + EXPECT_EQ(kMalwareList, lists[0].name); |
| EXPECT_EQ("1", lists[0].adds); |
| EXPECT_TRUE(lists[0].subs.empty()); |
| @@ -1549,15 +1526,15 @@ TEST_F(SafeBrowsingDatabaseTest, SameHostEntriesOkay) { |
| "www.evil.com/phishing2.html")); |
| ASSERT_TRUE(database_->UpdateStarted(&lists)); |
| - database_->InsertChunks(safe_browsing::kPhishingList, chunks.get()); |
| + database_->InsertChunks(kPhishingList, chunks.get()); |
| database_->UpdateFinished(true); |
| GetListsInfo(&lists); |
| ASSERT_LE(2U, lists.size()); |
| - EXPECT_EQ(safe_browsing::kMalwareList, lists[0].name); |
| + EXPECT_EQ(kMalwareList, lists[0].name); |
| EXPECT_EQ("1", lists[0].adds); |
| EXPECT_TRUE(lists[0].subs.empty()); |
| - EXPECT_EQ(safe_browsing::kPhishingList, lists[1].name); |
| + EXPECT_EQ(kPhishingList, lists[1].name); |
| EXPECT_EQ("47", lists[1].adds); |
| EXPECT_TRUE(lists[1].subs.empty()); |
| @@ -1578,14 +1555,14 @@ TEST_F(SafeBrowsingDatabaseTest, SameHostEntriesOkay) { |
| chunks.clear(); |
| chunks.push_back(SubChunkPrefixValue(4, "www.evil.com/malware1.html", 1)); |
| ASSERT_TRUE(database_->UpdateStarted(&lists)); |
| - database_->InsertChunks(safe_browsing::kMalwareList, chunks.get()); |
| + database_->InsertChunks(kMalwareList, chunks.get()); |
| database_->UpdateFinished(true); |
| // Remove the prefix that added last. |
| chunks.clear(); |
| chunks.push_back(SubChunkPrefixValue(5, "www.evil.com/phishing2.html", 47)); |
| ASSERT_TRUE(database_->UpdateStarted(&lists)); |
| - database_->InsertChunks(safe_browsing::kPhishingList, chunks.get()); |
| + database_->InsertChunks(kPhishingList, chunks.get()); |
| database_->UpdateFinished(true); |
| // Verify that the database contains urls expected. |
| @@ -1611,7 +1588,7 @@ TEST_F(SafeBrowsingDatabaseTest, EmptyUpdate) { |
| std::vector<SBListChunkRanges> lists; |
| ASSERT_TRUE(database_->UpdateStarted(&lists)); |
| chunks.push_back(AddChunkPrefixValue(1, "www.evil.com/malware.html")); |
| - database_->InsertChunks(safe_browsing::kMalwareList, chunks.get()); |
| + database_->InsertChunks(kMalwareList, chunks.get()); |
| database_->UpdateFinished(true); |
| // Get an older time to reset the lastmod time for detecting whether |
| @@ -1628,7 +1605,7 @@ TEST_F(SafeBrowsingDatabaseTest, EmptyUpdate) { |
| ASSERT_TRUE(base::GetFileInfo(filename, &before_info)); |
| ASSERT_TRUE(database_->UpdateStarted(&lists)); |
| chunks.push_back(AddChunkPrefixValue(2, "www.foo.com/malware.html")); |
| - database_->InsertChunks(safe_browsing::kMalwareList, chunks.get()); |
| + database_->InsertChunks(kMalwareList, chunks.get()); |
| database_->UpdateFinished(true); |
| ASSERT_TRUE(base::GetFileInfo(filename, &after_info)); |
| EXPECT_LT(before_info.last_modified, after_info.last_modified); |
| @@ -1637,7 +1614,7 @@ TEST_F(SafeBrowsingDatabaseTest, EmptyUpdate) { |
| ASSERT_TRUE(base::TouchFile(filename, old_last_modified, old_last_modified)); |
| ASSERT_TRUE(base::GetFileInfo(filename, &before_info)); |
| ASSERT_TRUE(database_->UpdateStarted(&lists)); |
| - AddDelChunk(safe_browsing::kMalwareList, 2); |
| + AddDelChunk(kMalwareList, 2); |
| database_->UpdateFinished(true); |
| ASSERT_TRUE(base::GetFileInfo(filename, &after_info)); |
| EXPECT_LT(before_info.last_modified, after_info.last_modified); |
| @@ -1663,7 +1640,7 @@ TEST_F(SafeBrowsingDatabaseTest, FilterFile) { |
| ScopedVector<SBChunkData> chunks; |
| chunks.push_back(AddChunkPrefixValue(1, "www.evil.com/malware.html")); |
| - database_->InsertChunks(safe_browsing::kMalwareList, chunks.get()); |
| + database_->InsertChunks(kMalwareList, chunks.get()); |
| database_->UpdateFinished(true); |
| } |
| @@ -1713,7 +1690,7 @@ TEST_F(SafeBrowsingDatabaseTest, CachedFullMiss) { |
| std::vector<SBListChunkRanges> lists; |
| ASSERT_TRUE(database_->UpdateStarted(&lists)); |
| - database_->InsertChunks(safe_browsing::kMalwareList, chunks.get()); |
| + database_->InsertChunks(kMalwareList, chunks.get()); |
| database_->UpdateFinished(true); |
| { |
| @@ -1768,7 +1745,7 @@ TEST_F(SafeBrowsingDatabaseTest, CachedPrefixHitFullMiss) { |
| std::vector<SBListChunkRanges> lists; |
| ASSERT_TRUE(database_->UpdateStarted(&lists)); |
| - database_->InsertChunks(safe_browsing::kMalwareList, chunks.get()); |
| + database_->InsertChunks(kMalwareList, chunks.get()); |
| database_->UpdateFinished(true); |
| { |
| @@ -1812,7 +1789,7 @@ TEST_F(SafeBrowsingDatabaseTest, CachedPrefixHitFullMiss) { |
| std::vector<SBFullHashResult> cache_results; |
| SBFullHashResult full_hash_result; |
| - full_hash_result.list_id = safe_browsing::MALWARE; |
| + full_hash_result.list_id = MALWARE; |
| full_hash_result.hash = kFullHash1_1; |
| cache_results.push_back(full_hash_result); |
| @@ -1832,7 +1809,7 @@ TEST_F(SafeBrowsingDatabaseTest, CachedPrefixHitFullMiss) { |
| full_hashes, &prefix_hits, &cache_hits)); |
| EXPECT_TRUE(prefix_hits.empty()); |
| ASSERT_EQ(1U, cache_hits.size()); |
| - EXPECT_TRUE(safe_browsing::SBFullHashEqual( |
| + EXPECT_TRUE(SBFullHashEqual( |
| kFullHash1_1, cache_hits[0].hash)); |
| // Adding kFullHash2_1 will see the existing cache hit plus the prefix hit |
| @@ -1845,7 +1822,7 @@ TEST_F(SafeBrowsingDatabaseTest, CachedPrefixHitFullMiss) { |
| ASSERT_EQ(1U, prefix_hits.size()); |
| EXPECT_EQ(kPrefix2, prefix_hits[0]); |
| ASSERT_EQ(1U, cache_hits.size()); |
| - EXPECT_TRUE(safe_browsing::SBFullHashEqual( |
| + EXPECT_TRUE(SBFullHashEqual( |
| kFullHash1_1, cache_hits[0].hash)); |
| // kFullHash1_3 also gets a cache hit. |
| @@ -1857,9 +1834,9 @@ TEST_F(SafeBrowsingDatabaseTest, CachedPrefixHitFullMiss) { |
| ASSERT_EQ(1U, prefix_hits.size()); |
| EXPECT_EQ(kPrefix2, prefix_hits[0]); |
| ASSERT_EQ(2U, cache_hits.size()); |
| - EXPECT_TRUE(safe_browsing::SBFullHashEqual( |
| + EXPECT_TRUE(SBFullHashEqual( |
| kFullHash1_1, cache_hits[0].hash)); |
| - EXPECT_TRUE(safe_browsing::SBFullHashEqual( |
| + EXPECT_TRUE(SBFullHashEqual( |
| kFullHash1_3, cache_hits[1].hash)); |
| } |
| @@ -1872,7 +1849,7 @@ TEST_F(SafeBrowsingDatabaseTest, CachedPrefixHitFullMiss) { |
| full_hashes, &prefix_hits, &cache_hits)); |
| EXPECT_TRUE(prefix_hits.empty()); |
| ASSERT_EQ(1U, cache_hits.size()); |
| - EXPECT_TRUE(safe_browsing::SBFullHashEqual( |
| + EXPECT_TRUE(SBFullHashEqual( |
| kFullHash1_3, cache_hits[0].hash)); |
| } |
| @@ -1913,7 +1890,7 @@ TEST_F(SafeBrowsingDatabaseTest, BrowseFullHashMatching) { |
| std::vector<SBListChunkRanges> lists; |
| ASSERT_TRUE(database_->UpdateStarted(&lists)); |
| - database_->InsertChunks(safe_browsing::kMalwareList, chunks.get()); |
| + database_->InsertChunks(kMalwareList, chunks.get()); |
| database_->UpdateFinished(true); |
| { |
| @@ -1948,7 +1925,7 @@ TEST_F(SafeBrowsingDatabaseTest, BrowseFullHashMatching) { |
| { |
| // Cache a gethash result for kFullHash1_2. |
| SBFullHashResult full_hash_result; |
| - full_hash_result.list_id = safe_browsing::MALWARE; |
| + full_hash_result.list_id = MALWARE; |
| full_hash_result.hash = kFullHash1_2; |
| std::vector<SBPrefix> prefixes(1, kPrefix1); |
| @@ -1982,7 +1959,7 @@ TEST_F(SafeBrowsingDatabaseTest, BrowseFullHashMatching) { |
| full_hashes, &prefix_hits, &cache_hits)); |
| EXPECT_TRUE(prefix_hits.empty()); |
| ASSERT_EQ(1U, cache_hits.size()); |
| - EXPECT_TRUE(safe_browsing::SBFullHashEqual( |
| + EXPECT_TRUE(SBFullHashEqual( |
| kFullHash1_2, cache_hits[0].hash)); |
| } |
| @@ -1991,7 +1968,7 @@ TEST_F(SafeBrowsingDatabaseTest, BrowseFullHashMatching) { |
| chunks.push_back(SubChunkFullHash(11, kFullHash1_1, 1)); |
| ASSERT_TRUE(database_->UpdateStarted(&lists)); |
| - database_->InsertChunks(safe_browsing::kMalwareList, chunks.get()); |
| + database_->InsertChunks(kMalwareList, chunks.get()); |
| database_->UpdateFinished(true); |
| // Cache should be cleared after updating. |
| @@ -2029,7 +2006,7 @@ TEST_F(SafeBrowsingDatabaseTest, BrowseFullHashMatching) { |
| chunks.push_back(SubChunkFullHash(12, kFullHash1_2, 2)); |
| ASSERT_TRUE(database_->UpdateStarted(&lists)); |
| - database_->InsertChunks(safe_browsing::kMalwareList, chunks.get()); |
| + database_->InsertChunks(kMalwareList, chunks.get()); |
| database_->UpdateFinished(true); |
| // Cache should be cleared after updating. |
| @@ -2061,7 +2038,7 @@ TEST_F(SafeBrowsingDatabaseTest, BrowseFullHashAndPrefixMatching) { |
| std::vector<SBListChunkRanges> lists; |
| ASSERT_TRUE(database_->UpdateStarted(&lists)); |
| - database_->InsertChunks(safe_browsing::kMalwareList, chunks.get()); |
| + database_->InsertChunks(kMalwareList, chunks.get()); |
| database_->UpdateFinished(true); |
| { |
| @@ -2078,7 +2055,7 @@ TEST_F(SafeBrowsingDatabaseTest, BrowseFullHashAndPrefixMatching) { |
| chunks.push_back(AddChunkPrefix(2, kPrefix1)); |
| ASSERT_TRUE(database_->UpdateStarted(&lists)); |
| - database_->InsertChunks(safe_browsing::kMalwareList, chunks.get()); |
| + database_->InsertChunks(kMalwareList, chunks.get()); |
| database_->UpdateFinished(true); |
| { |
| @@ -2098,7 +2075,7 @@ TEST_F(SafeBrowsingDatabaseTest, BrowseFullHashAndPrefixMatching) { |
| chunks.push_back(SubChunkFullHash(11, kFullHash1_1, 1)); |
| ASSERT_TRUE(database_->UpdateStarted(&lists)); |
| - database_->InsertChunks(safe_browsing::kMalwareList, chunks.get()); |
| + database_->InsertChunks(kMalwareList, chunks.get()); |
| database_->UpdateFinished(true); |
| { |
| @@ -2138,7 +2115,7 @@ TEST_F(SafeBrowsingDatabaseTest, MalwareIpBlacklist) { |
| // IPv4 prefix match for ::ffff:192.1.128.0/113. |
| chunks.push_back(AddChunkHashedIpValue(6, "::ffff:192.1.128.0", 113)); |
| - database_->InsertChunks(safe_browsing::kIPBlacklist, chunks.get()); |
| + database_->InsertChunks(kIPBlacklist, chunks.get()); |
| database_->UpdateFinished(true); |
| EXPECT_FALSE(database_->ContainsMalwareIP("192.168.0.255")); |
| @@ -2188,7 +2165,7 @@ TEST_F(SafeBrowsingDatabaseTest, ContainsBrowseURL) { |
| { |
| ScopedVector<SBChunkData> chunks; |
| chunks.push_back(AddChunkPrefixValue(1, "www.evil.com/")); |
| - database_->InsertChunks(safe_browsing::kMalwareList, chunks.get()); |
| + database_->InsertChunks(kMalwareList, chunks.get()); |
| } |
| // Add a specific fullhash. |
| @@ -2196,7 +2173,7 @@ TEST_F(SafeBrowsingDatabaseTest, ContainsBrowseURL) { |
| { |
| ScopedVector<SBChunkData> chunks; |
| chunks.push_back(AddChunkFullHashValue(2, kWhateverMalware)); |
| - database_->InsertChunks(safe_browsing::kMalwareList, chunks.get()); |
| + database_->InsertChunks(kMalwareList, chunks.get()); |
| } |
| // Add a fullhash which has a prefix collision for a known url. |
| @@ -2208,7 +2185,7 @@ TEST_F(SafeBrowsingDatabaseTest, ContainsBrowseURL) { |
| { |
| ScopedVector<SBChunkData> chunks; |
| chunks.push_back(AddChunkFullHashValue(3, kExampleCollision)); |
| - database_->InsertChunks(safe_browsing::kMalwareList, chunks.get()); |
| + database_->InsertChunks(kMalwareList, chunks.get()); |
| } |
| database_->UpdateFinished(true); |
| @@ -2249,3 +2226,5 @@ TEST_F(SafeBrowsingDatabaseTest, ContainsBrowseURL) { |
| EXPECT_FALSE(database_->ContainsBrowseUrl( |
| GURL(std::string("http://") + kExampleFine), &prefix_hits, &cache_hits)); |
| } |
| + |
| +} // namespace safe_browsing |