Move full hash caching logic to v4_get_hash_protocol_manager

components/safe_browsing_db/v4_database_unittest.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/bind.h"
 #include "base/debug/leak_annotations.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "base/test/test_simple_task_runner.h"
@@ skipping 362 matching lines @@
   V4Database::Create(task_runner_, database_dirname_, store_file_name_map_,
                      callback_db_ready_);
   created_but_not_called_back_ = true;
   task_runner_->RunPendingTasks();
 
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(true, created_and_called_back_);
 
   base::hash_set<UpdateListIdentifier> stores_to_look(
       {linux_malware_id_, win_malware_id_});
-  MatchedHashPrefixMap matched_hash_prefix_map;
+  StoreAndHashPrefixes store_and_hash_prefixes;
   v4_database_->GetStoresMatchingFullHash("anything", stores_to_look,
-                                          &matched_hash_prefix_map);
-  EXPECT_EQ(2u, matched_hash_prefix_map.size());
-  EXPECT_FALSE(matched_hash_prefix_map[linux_malware_id_].empty());
-  EXPECT_FALSE(matched_hash_prefix_map[win_malware_id_].empty());
+                                          &store_and_hash_prefixes);
+  EXPECT_EQ(2u, store_and_hash_prefixes.size());
+  base::hash_set<UpdateListIdentifier> stores_found;
+  for (const auto& it : store_and_hash_prefixes) {
+    stores_found.insert(it.list_id);
+  }
+  EXPECT_EQ(stores_to_look, stores_found);
 }
 
 // Test to ensure the case that no stores match a given full hash.
 TEST_F(V4DatabaseTest, TestNoStoreMatchesFullHash) {
   bool hash_prefix_matches = false;
   expected_resets_successfully_ = true;
   RegisterFactory(!expected_resets_successfully_, hash_prefix_matches);
 
   V4Database::Create(task_runner_, database_dirname_, store_file_name_map_,
                      callback_db_ready_);
   created_but_not_called_back_ = true;
   task_runner_->RunPendingTasks();
 
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(true, created_and_called_back_);
 
   base::hash_set<UpdateListIdentifier> stores_to_look(
       {linux_malware_id_, win_malware_id_});
-  MatchedHashPrefixMap matched_hash_prefix_map;
+  StoreAndHashPrefixes store_and_hash_prefixes;
   v4_database_->GetStoresMatchingFullHash("anything", stores_to_look,
-                                          &matched_hash_prefix_map);
-  EXPECT_TRUE(matched_hash_prefix_map.empty());
+                                          &store_and_hash_prefixes);
+  EXPECT_TRUE(store_and_hash_prefixes.empty());
 }
 
 // Test to ensure the case that some stores match a given full hash.
 TEST_F(V4DatabaseTest, TestSomeStoresMatchFullHash) {
   // Setup stores to not match the full hash.
   bool hash_prefix_matches = false;
   expected_resets_successfully_ = true;
   RegisterFactory(!expected_resets_successfully_, hash_prefix_matches);
 
   V4Database::Create(task_runner_, database_dirname_, store_file_name_map_,
                      callback_db_ready_);
   created_but_not_called_back_ = true;
   task_runner_->RunPendingTasks();
 
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(true, created_and_called_back_);
 
   // Set the store corresponding to linux_malware_id_ to match the full hash.
   FakeV4Store* store = static_cast<FakeV4Store*>(
-      v4_database_->store_map_->at(linux_malware_id_).get());
+      v4_database_->store_map_->at(win_malware_id_).get());
   store->set_hash_prefix_matches(true);
 
   base::hash_set<UpdateListIdentifier> stores_to_look(
       {linux_malware_id_, win_malware_id_});
-  MatchedHashPrefixMap matched_hash_prefix_map;
+  StoreAndHashPrefixes store_and_hash_prefixes;
   v4_database_->GetStoresMatchingFullHash("anything", stores_to_look,
-                                          &matched_hash_prefix_map);
-  EXPECT_EQ(1u, matched_hash_prefix_map.size());
-  EXPECT_FALSE(matched_hash_prefix_map[linux_malware_id_].empty());
+                                          &store_and_hash_prefixes);
+  EXPECT_EQ(1u, store_and_hash_prefixes.size());
+  EXPECT_EQ(store_and_hash_prefixes.begin()->list_id, win_malware_id_);
+  EXPECT_FALSE(store_and_hash_prefixes.begin()->hash_prefix.empty());
 }
 
 // Test to ensure the case that only some stores are reported to match a given
 // full hash because of stores_to_look.
 TEST_F(V4DatabaseTest, TestSomeStoresMatchFullHashBecauseOfStoresToMatch) {
   // Setup all stores to match the full hash.
   bool hash_prefix_matches = true;
   expected_resets_successfully_ = true;
   RegisterFactory(!expected_resets_successfully_, hash_prefix_matches);
 
   V4Database::Create(task_runner_, database_dirname_, store_file_name_map_,
                      callback_db_ready_);
   created_but_not_called_back_ = true;
   task_runner_->RunPendingTasks();
 
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(true, created_and_called_back_);
 
   base::hash_set<UpdateListIdentifier> stores_to_look({linux_malware_id_});
   // Don't add win_malware_id_ to the stores_to_look.
-  MatchedHashPrefixMap matched_hash_prefix_map;
+  StoreAndHashPrefixes store_and_hash_prefixes;
   v4_database_->GetStoresMatchingFullHash("anything", stores_to_look,
-                                          &matched_hash_prefix_map);
-  EXPECT_EQ(1u, matched_hash_prefix_map.size());
-  EXPECT_FALSE(matched_hash_prefix_map[linux_malware_id_].empty());
+                                          &store_and_hash_prefixes);
+  EXPECT_EQ(1u, store_and_hash_prefixes.size());
+  EXPECT_EQ(store_and_hash_prefixes.begin()->list_id, linux_malware_id_);
+  EXPECT_FALSE(store_and_hash_prefixes.begin()->hash_prefix.empty());
 }
 
 }  // namespace safe_browsing