Move full hash caching logic to v4_get_hash_protocol_manager

components/safe_browsing_db/v4_local_database_manager.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.
 
 // This file should not be build on Android but is currently getting built.
 // TODO(vakh): Fix that: http://crbug.com/621647
 
 #include "components/safe_browsing_db/v4_local_database_manager.h"
 
 #include <vector>
@@ skipping 116 matching lines @@
   return true;
 }
 
 bool V4LocalDatabaseManager::IsCsdWhitelistKillSwitchOn() {
   // TODO(vakh): Implement this skeleton.
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   return true;
 }
 
 bool V4LocalDatabaseManager::CheckBrowseUrl(const GURL& url, Client* client) {
-  // TODO(vakh): Implement this skeleton.
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   if (!enabled_ || !CanCheckUrl(url)) {
     return true;
   }
 
   if (v4_database_) {
     base::hash_set<FullHash> full_hashes;
     V4ProtocolManagerUtil::UrlToFullHashes(url, &full_hashes);
 
     base::hash_set<UpdateListIdentifier> stores_to_look(
         {GetUrlMalwareId(), GetUrlSocEngId()});
     base::hash_set<HashPrefix> matched_hash_prefixes;
     base::hash_set<UpdateListIdentifier> matched_stores;
-    MatchedHashPrefixMap matched_hash_prefix_map;
+    StoreAndHashPrefixes matched_store_and_full_hashes;
+    FullHashToStoreAndHashPrefixesMap full_hash_to_store_and_hash_prefixes;
     for (const auto& full_hash : full_hashes) {
+      matched_store_and_full_hashes.clear();
       v4_database_->GetStoresMatchingFullHash(full_hash, stores_to_look,
-                                              &matched_hash_prefix_map);
-      for (const auto& matched_pair : matched_hash_prefix_map) {
-        matched_stores.insert(matched_pair.first);
-        matched_hash_prefixes.insert(matched_pair.second);
+                                              &matched_store_and_full_hashes);
+      if (!matched_store_and_full_hashes.empty()) {
+        full_hash_to_store_and_hash_prefixes[full_hash] =
+            matched_store_and_full_hashes;
       }
     }
 
-    DCHECK_EQ(matched_stores.empty(), matched_hash_prefixes.empty());
-
-    // TODO(vakh): Return false and fetch full hashes for the matching hash
-    // prefixes.
-    return matched_hash_prefixes.empty();
+    if (full_hash_to_store_and_hash_prefixes.empty()) {
+      return true;
+    } else {
+      // TODO(vakh): Pass more information to the callback for it to be able to
+      // do something meaningful.
+      v4_get_hash_protocol_manager_->GetFullHashes(
+          full_hash_to_store_and_hash_prefixes,
+          base::Bind(&V4LocalDatabaseManager::OnFullHashResponse,
+                     base::Unretained(this)));
+      return false;
+    }
   } else {
     // TODO(vakh): Queue the check and process it when the database becomes
     // ready.
     return false;
   }
 }
 
+void V4LocalDatabaseManager::OnFullHashResponse(
+    const std::vector<FullHashInfo>& full_hash_infos) {
+  // TODO(vakh): Implement this skeleton.
+}
+
 void V4LocalDatabaseManager::CancelCheck(Client* client) {
   // TODO(vakh): Implement this skeleton.
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   DCHECK(enabled_);
 }
 
 void V4LocalDatabaseManager::StartOnIOThread(
     net::URLRequestContextGetter* request_context_getter,
     const V4ProtocolConfig& config) {
   SafeBrowsingDatabaseManager::StartOnIOThread(request_context_getter, config);
@@ skipping 86 matching lines @@
 }
 
 void V4LocalDatabaseManager::DatabaseUpdated() {
   if (enabled_) {
     v4_update_protocol_manager_->ScheduleNextUpdate(
         v4_database_->GetStoreStateMap());
   }
 }
 
 }  // namespace safe_browsing