Move full hash caching logic to v4_get_hash_protocol_manager

components/safe_browsing_db/database_manager.h

 // Copyright (c) 2012 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.
 //
 // The Safe Browsing service is responsible for downloading anti-phishing and
 // anti-malware tables and checking urls against them.
 
 #ifndef COMPONENTS_SAFE_BROWSING_DB_DATABASE_MANAGER_H_
 #define COMPONENTS_SAFE_BROWSING_DB_DATABASE_MANAGER_H_
 
@@ skipping 226 matching lines @@
   FRIEND_TEST_ALL_PREFIXES(SafeBrowsingDatabaseManagerTest,
                            ResultsAreNotCachedOnNull);
   FRIEND_TEST_ALL_PREFIXES(SafeBrowsingDatabaseManagerTest,
                            GetCachedResults);
   FRIEND_TEST_ALL_PREFIXES(SafeBrowsingDatabaseManagerTest,
                            CachedResultsMerged);
   FRIEND_TEST_ALL_PREFIXES(SafeBrowsingDatabaseManagerTest,
                            CachedResultsAreEvicted);
 
   typedef std::set<SafeBrowsingApiCheck*> ApiCheckSet;
-  typedef std::map<SBPrefix, SBCachedFullHashResult> PrefixToFullHashResultsMap;
-  typedef std::map<SBThreatType, PrefixToFullHashResultsMap>
-      ThreatTypeToResultsMap;
 
   // Called on the IO thread wheh the SafeBrowsingProtocolManager has received
   // the full hash and api results for prefixes of the |url| argument in
   // CheckApiBlacklistUrl.
   virtual void HandleGetHashesWithApisResults(
       SafeBrowsingApiCheck* check,
       const std::vector<SBFullHashResult>& full_hash_results,
       const base::Time& negative_cache_expire);
 
-  // Looks up the cached results for |threat_type|. Fills |prefixes| with the
-  // prefixes that need a request. Fills |cached_results| with the cached
-  // results.
-  void GetFullHashCachedResults(const SBThreatType& threat_type,
-                                const std::vector<SBFullHash>& full_hashes,
-                                base::Time now,
-                                std::vector<SBPrefix>* prefixes,
-                                std::vector<SBFullHashResult>* cached_results);
-
   // Populates |md| with permission api metadata from all results that have a
   // match in |full_hashes|. Returns |true| if any of the results have a match
   // in |full_hashes|.
   bool PopulateApiMetadataResult(const std::vector<SBFullHashResult>& results,
                                  const std::vector<SBFullHash>& full_hashes,
                                  ThreatMetadata* md);
 
   // In-progress checks. This set owns the SafeBrowsingApiCheck pointers and is
   // responsible for deleting them when removing from the set.
   ApiCheckSet api_checks_;
 
-  // A cache of V4 full hash results for api checks.
-  // TODO(kcarattini): Look into moving all caching logic to
-  // V4GetHashProtocolManager.
-  ThreatTypeToResultsMap v4_full_hash_cache_;
-
   // Created and destroyed via StartOnIOThread/StopOnIOThread.
   V4GetHashProtocolManager* v4_get_hash_protocol_manager_;
 
  private:
   // Returns an iterator to the pending API check with the given |client|.
   ApiCheckSet::iterator FindClientApiCheck(Client* client);
 };  // class SafeBrowsingDatabaseManager
 
 }  // namespace safe_browsing
 
 #endif  // COMPONENTS_SAFE_BROWSING_DB_DATABASE_MANAGER_H_