Safebrowsing: change gethash caching to match api 2.3 rules, fix some corner cases.

chrome/browser/safe_browsing/safe_browsing_store_file.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.
 
 #ifndef CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_STORE_FILE_H_
 #define CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_STORE_FILE_H_
 
 #include <set>
 #include <vector>
 
@@ skipping 125 matching lines @@
   // Get all add hash prefixes and full-length hashes, respectively, from
   // the store.
   virtual bool GetAddPrefixes(SBAddPrefixes* add_prefixes) OVERRIDE;
   virtual bool GetAddFullHashes(
       std::vector<SBAddFullHash>* add_full_hashes) OVERRIDE;
 
   virtual bool BeginChunk() OVERRIDE;
 
   virtual bool WriteAddPrefix(int32 chunk_id, SBPrefix prefix) OVERRIDE;
   virtual bool WriteAddHash(int32 chunk_id,
-                            base::Time receive_time,
                             const SBFullHash& full_hash) OVERRIDE;
   virtual bool WriteSubPrefix(int32 chunk_id,
                               int32 add_chunk_id, SBPrefix prefix) OVERRIDE;
   virtual bool WriteSubHash(int32 chunk_id, int32 add_chunk_id,
                             const SBFullHash& full_hash) OVERRIDE;
   virtual bool FinishChunk() OVERRIDE;
 
   virtual bool BeginUpdate() OVERRIDE;
-  // Store updates with pending add full hashes in file store and
-  // return |add_prefixes_result| and |add_full_hashes_result|.
+  // Store updates in file store and return |add_full_hashes_result|.

[Scott Hess - ex-Googler, 2014/04/01 22:08:36]

I see I didn't update the comment - should mention that kept prefixes will be
added to builder and kept full hashes to that vector.

[mattm, 2014/04/03 01:38:12]

Done.

   virtual bool FinishUpdate(
-      const std::vector<SBAddFullHash>& pending_adds,
       safe_browsing::PrefixSetBuilder* builder,
       std::vector<SBAddFullHash>* add_full_hashes_result) OVERRIDE;
   virtual bool CancelUpdate() OVERRIDE;
 
   virtual void SetAddChunk(int32 chunk_id) OVERRIDE;
   virtual bool CheckAddChunk(int32 chunk_id) OVERRIDE;
   virtual void GetAddChunks(std::vector<int32>* out) OVERRIDE;
   virtual void SetSubChunk(int32 chunk_id) OVERRIDE;
   virtual bool CheckSubChunk(int32 chunk_id) OVERRIDE;
   virtual void GetSubChunks(std::vector<int32>* out) OVERRIDE;
 
   virtual void DeleteAddChunk(int32 chunk_id) OVERRIDE;
   virtual void DeleteSubChunk(int32 chunk_id) OVERRIDE;
 
   // Verify |file_|'s checksum, calling the corruption callback if it
   // does not check out.  Empty input is considered valid.
   virtual bool CheckValidity() OVERRIDE;
 
   // Returns the name of the temporary file used to buffer data for
   // |filename|.  Exported for unit tests.
   static const base::FilePath TemporaryFileForFilename(
       const base::FilePath& filename) {
     return base::FilePath(filename.value() + FILE_PATH_LITERAL("_new"));
   }
 
   // Delete any on-disk files, including the permanent storage.
   static bool DeleteStore(const base::FilePath& basename);
 
  private:
-  // Update store file with pending full hashes.
-  virtual bool DoUpdate(const std::vector<SBAddFullHash>& pending_adds,
-                        safe_browsing::PrefixSetBuilder* builder,
+  // Update store file and return |add_full_hashes_result|.
+  virtual bool DoUpdate(safe_browsing::PrefixSetBuilder* builder,
                         std::vector<SBAddFullHash>* add_full_hashes_result);
 
   // Enumerate different format-change events for histogramming
   // purposes.  DO NOT CHANGE THE ORDERING OF THESE VALUES.
   // TODO(shess): Remove this once the format change is complete.
   enum FormatEventType {
     // Corruption detected, broken down by file format.
     FORMAT_EVENT_FILE_CORRUPT,
     FORMAT_EVENT_SQLITE_CORRUPT,  // Obsolete
 
@@ skipping 105 matching lines @@
 
   // Tracks whether corruption has already been seen in the current
   // update, so that only one instance is recorded in the stats.
   // TODO(shess): Remove with format-migration support.
   bool corruption_seen_;
 
   DISALLOW_COPY_AND_ASSIGN(SafeBrowsingStoreFile);
 };
 
 #endif  // CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_STORE_FILE_H_