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

chrome/browser/safe_browsing/safe_browsing_store_unittest.cc

Index: chrome/browser/safe_browsing/safe_browsing_store_unittest.cc
diff --git a/chrome/browser/safe_browsing/safe_browsing_store_unittest.cc b/chrome/browser/safe_browsing/safe_browsing_store_unittest.cc
index 420ed1c7fc680786223cd0511ac4dd26387b6e5a..0b535963b1ac6ad3bd7c40fecc6171ee87c8b131 100644
--- a/chrome/browser/safe_browsing/safe_browsing_store_unittest.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_store_unittest.cc
@@ -36,29 +36,27 @@ TEST(SafeBrowsingStoreTest, SBAddPrefixHashLess) {
   onetwo.full_hash[sizeof(SBPrefix)] = 2;
   two.prefix = 2;
 
-  const base::Time now = base::Time::Now();
-
   // prefix dominates.
-  EXPECT_TRUE(SBAddPrefixHashLess(SBAddFullHash(11, now, one),
-                                  SBAddFullHash(10, now, two)));
-  EXPECT_FALSE(SBAddPrefixHashLess(SBAddFullHash(11, now, two),
-                                   SBAddFullHash(10, now, one)));
+  EXPECT_TRUE(SBAddPrefixHashLess(SBAddFullHash(11, one),
+                                  SBAddFullHash(10, two)));
+  EXPECT_FALSE(SBAddPrefixHashLess(SBAddFullHash(11, two),
+                                   SBAddFullHash(10, one)));
 
   // After prefix, add_id.
-  EXPECT_TRUE(SBAddPrefixHashLess(SBAddFullHash(10, now, one),
-                                  SBAddFullHash(11, now, onetwo)));
-  EXPECT_FALSE(SBAddPrefixHashLess(SBAddFullHash(11, now, one),
-                                   SBAddFullHash(10, now, onetwo)));
+  EXPECT_TRUE(SBAddPrefixHashLess(SBAddFullHash(10, one),
+                                  SBAddFullHash(11, onetwo)));
+  EXPECT_FALSE(SBAddPrefixHashLess(SBAddFullHash(11, one),
+                                   SBAddFullHash(10, onetwo)));
 
   // After add_id, full hash.
-  EXPECT_TRUE(SBAddPrefixHashLess(SBAddFullHash(10, now, one),
-                                  SBAddFullHash(10, now, onetwo)));
-  EXPECT_FALSE(SBAddPrefixHashLess(SBAddFullHash(10, now, onetwo),
-                                   SBAddFullHash(10, now, one)));
+  EXPECT_TRUE(SBAddPrefixHashLess(SBAddFullHash(10, one),
+                                  SBAddFullHash(10, onetwo)));
+  EXPECT_FALSE(SBAddPrefixHashLess(SBAddFullHash(10, onetwo),
+                                   SBAddFullHash(10, one)));
 
   // Equal is not less-than.
-  EXPECT_FALSE(SBAddPrefixHashLess(SBAddFullHash(10, now, one),
-                                   SBAddFullHash(10, now, one)));
+  EXPECT_FALSE(SBAddPrefixHashLess(SBAddFullHash(10, one),
+                                   SBAddFullHash(10, one)));
 }
 
 TEST(SafeBrowsingStoreTest, SBSubPrefixLess) {
@@ -129,7 +127,6 @@ TEST(SafeBrowsingStoreTest, SBProcessSubsEmpty) {
 
 // Test that subs knock out adds.
 TEST(SafeBrowsingStoreTest, SBProcessSubsKnockout) {
-  const base::Time kNow = base::Time::Now();
   const SBFullHash kHash1(SBFullHashForString("one"));
   const SBFullHash kHash2(SBFullHashForString("two"));
   const SBFullHash kHash3(SBFullHashForString("three"));
@@ -157,14 +154,14 @@ TEST(SafeBrowsingStoreTest, SBProcessSubsKnockout) {
   // An add with prefix and a couple hashes, plus a sub for the prefix
   // and a couple sub hashes.  The sub should knock all of them out.
   add_prefixes.push_back(SBAddPrefix(kAddChunk1, kHash1.prefix));
-  add_hashes.push_back(SBAddFullHash(kAddChunk1, kNow, kHash1));
-  add_hashes.push_back(SBAddFullHash(kAddChunk1, kNow, kHash1mod1));
+  add_hashes.push_back(SBAddFullHash(kAddChunk1, kHash1));
+  add_hashes.push_back(SBAddFullHash(kAddChunk1, kHash1mod1));
   sub_prefixes.push_back(SBSubPrefix(kSubChunk1, kAddChunk1, kHash1.prefix));
   sub_hashes.push_back(SBSubFullHash(kSubChunk1, kAddChunk1, kHash1mod2));
   sub_hashes.push_back(SBSubFullHash(kSubChunk1, kAddChunk1, kHash1mod3));
 
   // An add with no corresponding sub.  Both items should be retained.
-  add_hashes.push_back(SBAddFullHash(kAddChunk1, kNow, kHash2));
+  add_hashes.push_back(SBAddFullHash(kAddChunk1, kHash2));
   add_prefixes.push_back(SBAddPrefix(kAddChunk1, kHash2.prefix));
 
   // A sub with no corresponding add.  Both items should be retained.
@@ -174,8 +171,8 @@ TEST(SafeBrowsingStoreTest, SBProcessSubsKnockout) {
   // An add with prefix and a couple hashes, plus a sub for one of the
   // hashes.
   add_prefixes.push_back(SBAddPrefix(kAddChunk1, kHash4.prefix));
-  add_hashes.push_back(SBAddFullHash(kAddChunk1, kNow, kHash4));
-  add_hashes.push_back(SBAddFullHash(kAddChunk1, kNow, kHash4mod));
+  add_hashes.push_back(SBAddFullHash(kAddChunk1, kHash4));
+  add_hashes.push_back(SBAddFullHash(kAddChunk1, kHash4mod));
   sub_hashes.push_back(SBSubFullHash(kSubChunk1, kAddChunk1, kHash4mod));
 
   std::sort(add_prefixes.begin(), add_prefixes.end(),
@@ -221,7 +218,6 @@ TEST(SafeBrowsingStoreTest, SBProcessSubsKnockout) {
 // Test chunk deletions, and ordering of deletions WRT subs knocking
 // out adds.
 TEST(SafeBrowsingStoreTest, SBProcessSubsDeleteChunk) {
-  const base::Time kNow = base::Time::Now();
   const SBFullHash kHash1(SBFullHashForString("one"));
   const SBFullHash kHash2(SBFullHashForString("two"));
   const SBFullHash kHash3(SBFullHashForString("three"));
@@ -244,14 +240,14 @@ TEST(SafeBrowsingStoreTest, SBProcessSubsDeleteChunk) {
   // An add with prefix and a couple hashes, plus a sub for the prefix
   // and a couple sub hashes.  The sub should knock all of them out.
   add_prefixes.push_back(SBAddPrefix(kAddChunk1, kHash1.prefix));
-  add_hashes.push_back(SBAddFullHash(kAddChunk1, kNow, kHash1));
-  add_hashes.push_back(SBAddFullHash(kAddChunk1, kNow, kHash1mod1));
+  add_hashes.push_back(SBAddFullHash(kAddChunk1, kHash1));
+  add_hashes.push_back(SBAddFullHash(kAddChunk1, kHash1mod1));
   sub_prefixes.push_back(SBSubPrefix(kSubChunk1, kAddChunk1, kHash1.prefix));
   sub_hashes.push_back(SBSubFullHash(kSubChunk1, kAddChunk1, kHash1mod2));
   sub_hashes.push_back(SBSubFullHash(kSubChunk1, kAddChunk1, kHash1mod3));
 
   // An add with no corresponding sub.  Both items should be retained.
-  add_hashes.push_back(SBAddFullHash(kAddChunk1, kNow, kHash2));
+  add_hashes.push_back(SBAddFullHash(kAddChunk1, kHash2));
   add_prefixes.push_back(SBAddPrefix(kAddChunk1, kHash2.prefix));
 
   // A sub with no corresponding add.  Both items should be retained.