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

chrome/browser/safe_browsing/safe_browsing_store.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_H_
 #define CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_STORE_H_
 
 #include <set>
 #include <vector>
 
@@ skipping 56 matching lines @@
   SBSubPrefix() : chunk_id(), add_chunk_id(), add_prefix() {}
 
   int32 GetAddChunkId() const { return add_chunk_id; }
   SBPrefix GetAddPrefix() const { return add_prefix; }
 };
 
 typedef std::deque<SBSubPrefix> SBSubPrefixes;
 
 struct SBAddFullHash {
   int32 chunk_id;
-  int32 received;
+  // Received field is not used anymore, but is kept for DB compatability.
+  // TODO(mattm): Remove it next time the DB format is changed.
+  int32 deprecated_received;
   SBFullHash full_hash;
 
-  SBAddFullHash(int32 id, base::Time r, const SBFullHash& h)
-      : chunk_id(id),
-        received(static_cast<int32>(r.ToTimeT())),
-        full_hash(h) {
-  }
+  SBAddFullHash(int32 id, const SBFullHash& h)
+      : chunk_id(id), deprecated_received(), full_hash(h) {}
 
-  // Provided for ReadAddHashes() implementations, which already have
-  // an int32 for the time.
-  SBAddFullHash(int32 id, int32 r, const SBFullHash& h)
-      : chunk_id(id), received(r), full_hash(h) {}
-
-  SBAddFullHash() : chunk_id(), received(), full_hash() {}
+  SBAddFullHash() : chunk_id(), deprecated_received(), full_hash() {}
 
   int32 GetAddChunkId() const { return chunk_id; }
   SBPrefix GetAddPrefix() const { return full_hash.prefix; }
 };
 
 struct SBSubFullHash {
   int32 chunk_id;
   int32 add_chunk_id;
   SBFullHash full_hash;
 
@@ skipping 75 matching lines @@
 
   // Start a chunk of data.  None of the methods through FinishChunk()
   // should be called unless this returns true.
   // TODO(shess): Would it make sense for this to accept |chunk_id|?
   // Possibly not, because of possible confusion between sub_chunk_id
   // and add_chunk_id.
   virtual bool BeginChunk() = 0;
 
   virtual bool WriteAddPrefix(int32 chunk_id, SBPrefix prefix) = 0;
   virtual bool WriteAddHash(int32 chunk_id,
-                            base::Time receive_time,
                             const SBFullHash& full_hash) = 0;
   virtual bool WriteSubPrefix(int32 chunk_id,
                               int32 add_chunk_id, SBPrefix prefix) = 0;
   virtual bool WriteSubHash(int32 chunk_id, int32 add_chunk_id,
                             const SBFullHash& full_hash) = 0;
 
   // Collect the chunk data and preferrably store it on disk to
   // release memory.  Shoul not modify the data in-place.
   virtual bool FinishChunk() = 0;
 
@@ skipping 15 matching lines @@
   // calls the corruption callback and return false.
   // NOTE(shess): When storage was SQLite, there was no guarantee that
   // a structurally sound database actually contained valid data,
   // whereas SafeBrowsingStoreFile checksums the data.  For now, this
   // distinction doesn't matter.
   virtual bool CheckValidity() = 0;
 
   // Pass the collected chunks through SBPRocessSubs() and commit to
   // permanent storage.  The resulting add prefixes and hashes will be
   // stored in |add_prefixes_result| and |add_full_hashes_result|.
-  // |pending_adds| is the set of full hashes which have been received
-  // since the previous update, and is provided as a convenience
-  // (could be written via WriteAddHash(), but that would flush the
-  // chunk to disk).
   virtual bool FinishUpdate(
-      const std::vector<SBAddFullHash>& pending_adds,
       safe_browsing::PrefixSetBuilder* builder,
       std::vector<SBAddFullHash>* add_full_hashes_result) = 0;
 
   // Cancel the update in process and remove any temporary disk
   // storage, leaving the original data unmodified.
   virtual bool CancelUpdate() = 0;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SafeBrowsingStore);
 };
 
 #endif  // CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_STORE_H_