Move full hash caching logic to v4_get_hash_protocol_manager

components/safe_browsing_db/v4_database.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 <memory>
 
 #include "base/callback.h"
 #include "base/debug/leak_annotations.h"
 #include "base/files/file_util.h"
 #include "base/memory/ptr_util.h"
@@ skipping 153 matching lines @@
       base::MakeUnique<StoreStateMap>();
   for (const auto& store_map_iter : *store_map_) {
     (*store_state_map)[store_map_iter.first] = store_map_iter.second->state();
   }
   return store_state_map;
 }
 
 void V4Database::GetStoresMatchingFullHash(
     const FullHash& full_hash,
     const base::hash_set<UpdateListIdentifier>& stores_to_look,
-    MatchedHashPrefixMap* matched_hash_prefix_map) {
+    StoreAndHashPrefixes* matched_store_and_hash_prefixes) {
+  DCHECK(matched_store_and_hash_prefixes);

[Nathan Parker, 2016/09/09 21:26:20]

nit: You don't need the DCHECK if you're accessing the pointer right away, since
it'll crash immediately anyway.

[vakh (use Gerrit instead), 2016/09/09 23:25:17]

Done.

+  matched_store_and_hash_prefixes->clear();
   for (const UpdateListIdentifier& identifier : stores_to_look) {
     const auto& store_pair = store_map_->find(identifier);
     DCHECK(store_pair != store_map_->end());
     const std::unique_ptr<V4Store>& store = store_pair->second;
     HashPrefix hash_prefix = store->GetMatchingHashPrefix(full_hash);
     if (!hash_prefix.empty()) {
-      (*matched_hash_prefix_map)[identifier] = hash_prefix;
+      matched_store_and_hash_prefixes->push_back(

[Nathan Parker, 2016/09/09 21:26:20]

nit: Does this work:

->emplace_back(identifier, hash_prefix)

That's simpler and may avoid a temporary.

[vakh (use Gerrit instead), 2016/09/09 23:25:17]

Done.

+          StoreAndHashPrefix(identifier, hash_prefix));
     }
   }
 }
 
 }  // namespace safe_browsing