| Index: chrome/browser/safe_browsing/safe_browsing_store_unittest_helper.cc
|
| diff --git a/chrome/browser/safe_browsing/safe_browsing_store_unittest_helper.cc b/chrome/browser/safe_browsing/safe_browsing_store_unittest_helper.cc
|
| index ce47b93222883785941899cd4bd2a035eb76f864..6578a7727c573180ec60d76b4cbd3fe1470d8bff 100644
|
| --- a/chrome/browser/safe_browsing/safe_browsing_store_unittest_helper.cc
|
| +++ b/chrome/browser/safe_browsing/safe_browsing_store_unittest_helper.cc
|
| @@ -43,12 +43,10 @@ void SafeBrowsingStoreTestEmpty(SafeBrowsingStore* store) {
|
| EXPECT_FALSE(store->CheckSubChunk(-1));
|
|
|
| std::vector<SBAddFullHash> pending_adds;
|
| - std::set<SBPrefix> prefix_misses;
|
| SBAddPrefixes add_prefixes_result;
|
| std::vector<SBAddFullHash> add_full_hashes_result;
|
|
|
| EXPECT_TRUE(store->FinishUpdate(pending_adds,
|
| - prefix_misses,
|
| &add_prefixes_result,
|
| &add_full_hashes_result));
|
| EXPECT_TRUE(add_prefixes_result.empty());
|
| @@ -88,12 +86,10 @@ void SafeBrowsingStoreTestStorePrefix(SafeBrowsingStore* store) {
|
| EXPECT_EQ(kSubChunk1, chunks[0]);
|
|
|
| std::vector<SBAddFullHash> pending_adds;
|
| - std::set<SBPrefix> prefix_misses;
|
| SBAddPrefixes add_prefixes_result;
|
| std::vector<SBAddFullHash> add_full_hashes_result;
|
|
|
| EXPECT_TRUE(store->FinishUpdate(pending_adds,
|
| - prefix_misses,
|
| &add_prefixes_result,
|
| &add_full_hashes_result));
|
|
|
| @@ -127,7 +123,6 @@ void SafeBrowsingStoreTestStorePrefix(SafeBrowsingStore* store) {
|
| EXPECT_TRUE(store->CheckSubChunk(kSubChunk1));
|
|
|
| EXPECT_TRUE(store->FinishUpdate(pending_adds,
|
| - prefix_misses,
|
| &add_prefixes_result,
|
| &add_full_hashes_result));
|
|
|
| @@ -161,12 +156,10 @@ void SafeBrowsingStoreTestSubKnockout(SafeBrowsingStore* store) {
|
| EXPECT_TRUE(store->FinishChunk());
|
|
|
| std::vector<SBAddFullHash> pending_adds;
|
| - std::set<SBPrefix> prefix_misses;
|
| SBAddPrefixes add_prefixes_result;
|
| std::vector<SBAddFullHash> add_full_hashes_result;
|
|
|
| EXPECT_TRUE(store->FinishUpdate(pending_adds,
|
| - prefix_misses,
|
| &add_prefixes_result,
|
| &add_full_hashes_result));
|
|
|
| @@ -187,7 +180,6 @@ void SafeBrowsingStoreTestSubKnockout(SafeBrowsingStore* store) {
|
| EXPECT_TRUE(store->FinishChunk());
|
|
|
| EXPECT_TRUE(store->FinishUpdate(pending_adds,
|
| - prefix_misses,
|
| &add_prefixes_result,
|
| &add_full_hashes_result));
|
| EXPECT_EQ(1U, add_prefixes_result.size());
|
| @@ -206,7 +198,6 @@ void SafeBrowsingStoreTestSubKnockout(SafeBrowsingStore* store) {
|
| EXPECT_TRUE(store->FinishChunk());
|
|
|
| EXPECT_TRUE(store->FinishUpdate(pending_adds,
|
| - prefix_misses,
|
| &add_prefixes_result,
|
| &add_full_hashes_result));
|
| ASSERT_EQ(2U, add_prefixes_result.size());
|
| @@ -265,12 +256,10 @@ void SafeBrowsingStoreTestDeleteChunks(SafeBrowsingStore* store) {
|
| EXPECT_TRUE(store->CheckSubChunk(kSubChunk2));
|
|
|
| std::vector<SBAddFullHash> pending_adds;
|
| - std::set<SBPrefix> prefix_misses;
|
| SBAddPrefixes add_prefixes_result;
|
| std::vector<SBAddFullHash> add_full_hashes_result;
|
|
|
| EXPECT_TRUE(store->FinishUpdate(pending_adds,
|
| - prefix_misses,
|
| &add_prefixes_result,
|
| &add_full_hashes_result));
|
|
|
| @@ -296,7 +285,6 @@ void SafeBrowsingStoreTestDeleteChunks(SafeBrowsingStore* store) {
|
| add_prefixes_result.clear();
|
| add_full_hashes_result.clear();
|
| EXPECT_TRUE(store->FinishUpdate(pending_adds,
|
| - prefix_misses,
|
| &add_prefixes_result,
|
| &add_full_hashes_result));
|
|
|
| @@ -309,7 +297,6 @@ void SafeBrowsingStoreTestDeleteChunks(SafeBrowsingStore* store) {
|
| add_prefixes_result.clear();
|
| add_full_hashes_result.clear();
|
| EXPECT_TRUE(store->FinishUpdate(pending_adds,
|
| - prefix_misses,
|
| &add_prefixes_result,
|
| &add_full_hashes_result));
|
| EXPECT_TRUE(add_prefixes_result.empty());
|
| @@ -335,12 +322,10 @@ void SafeBrowsingStoreTestDelete(SafeBrowsingStore* store,
|
| EXPECT_TRUE(store->FinishChunk());
|
|
|
| std::vector<SBAddFullHash> pending_adds;
|
| - std::set<SBPrefix> prefix_misses;
|
| SBAddPrefixes add_prefixes_result;
|
| std::vector<SBAddFullHash> add_full_hashes_result;
|
|
|
| EXPECT_TRUE(store->FinishUpdate(pending_adds,
|
| - prefix_misses,
|
| &add_prefixes_result,
|
| &add_full_hashes_result));
|
|
|
|
|