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

chrome/browser/safe_browsing/safe_browsing_util.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.
 //
 // Utilities for the SafeBrowsing code.
 
 #ifndef CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_UTIL_H_
 #define CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_UTIL_H_
 
 #include <cstring>
 #include <deque>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/strings/string_piece.h"
+#include "base/time/time.h"
 #include "chrome/browser/safe_browsing/chunk_range.h"
 
 class GURL;
 
 class SBEntry;
 
 // A truncated hash's type.
 typedef uint32 SBPrefix;
 
 // Container for holding a chunk URL and the list it belongs to.
 struct ChunkUrl {
   std::string url;
   std::string list_name;
 };
 
 // A full hash.
 union SBFullHash {
   char full_hash[32];
   SBPrefix prefix;
 };
 
 inline bool SBFullHashEqual(const SBFullHash& a, const SBFullHash& b) {
   return !memcmp(a.full_hash, b.full_hash, sizeof(a.full_hash));
 }
 
+inline bool SBFullHashLess(const SBFullHash& a, const SBFullHash& b) {
+  return memcmp(a.full_hash, b.full_hash, sizeof(a.full_hash)) < 0;
+}
+
 // Generate full hash for the given string.
 SBFullHash SBFullHashForString(const base::StringPiece& str);
 
 // Container for information about a specific host in an add/sub chunk.
 struct SBChunkHost {
   SBPrefix host;
   SBEntry* entry;
 };
 
 // Container for an add/sub chunk.
@@ skipping 46 matching lines @@
  private:
   std::vector<SBChunk> chunks_;
 
   DISALLOW_COPY_AND_ASSIGN(SBChunkList);
 };
 
 // Used when we get a gethash response.
 struct SBFullHashResult {
   SBFullHash hash;
   std::string list_name;
-  int add_chunk_id;
+};
+
+struct SBCachedFullHashResult {
+  SBCachedFullHashResult();
+  explicit SBCachedFullHashResult(const base::Time& in_expire_after);
+  ~SBCachedFullHashResult();
+
+  base::Time expire_after;
+  std::vector<SBFullHashResult> full_hashes;
 };
 
 // Contains information about a list in the database.
 struct SBListChunkRanges {
   explicit SBListChunkRanges(const std::string& n);
 
   std::string name;  // The list name.
   std::string adds;  // The ranges for add chunks.
   std::string subs;  // The ranges for sub chunks.
 };
@@ skipping 241 matching lines @@
 GURL GeneratePhishingReportUrl(const std::string& report_page,
                                const std::string& url_to_report,
                                bool is_client_side_detection);
 
 SBFullHash StringToSBFullHash(const std::string& hash_in);
 std::string SBFullHashToString(const SBFullHash& hash_out);
 
 }  // namespace safe_browsing_util
 
 #endif  // CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_UTIL_H_