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

chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc

Index: chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc
diff --git a/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc b/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc
index 283d9ddefa286475e41e95a6f4fe1b12bd295311..582ee6c865c8a312489f068c5a3eafa02b5383dc 100644
--- a/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc
@@ -59,7 +59,7 @@ namespace {
 void InvokeFullHashCallback(
     SafeBrowsingProtocolManager::FullHashCallback callback,
     const std::vector<SBFullHashResult>& result) {
-  callback.Run(result, true);
+  callback.Run(result, base::TimeDelta::FromMinutes(45));
 }
 
 }  // namespace
@@ -84,22 +84,23 @@ class TestSafeBrowsingDatabase :  public SafeBrowsingDatabase {
   // can synchronously determine that the URL is safe, CheckUrl returns true,
   // otherwise it returns false.
   virtual bool ContainsBrowseUrl(const GURL& url,
-                                 std::string* matching_list,
                                  std::vector<SBPrefix>* prefix_hits,
-                                 std::vector<SBFullHashResult>* full_hits,
-                                 base::Time last_update) OVERRIDE {
+                                 std::vector<SBFullHashResult>* cache_hits)
+      OVERRIDE {
+    cache_hits->clear();
     std::vector<GURL> urls(1, url);
     return ContainsUrl(safe_browsing_util::kMalwareList,
                        safe_browsing_util::kPhishingList,
-                       urls, prefix_hits, full_hits);
+                       urls,
+                       prefix_hits);
   }
   virtual bool ContainsDownloadUrl(
       const std::vector<GURL>& urls,
       std::vector<SBPrefix>* prefix_hits) OVERRIDE {
-    std::vector<SBFullHashResult> full_hits;
     bool found = ContainsUrl(safe_browsing_util::kBinUrlList,
                              safe_browsing_util::kBinUrlList,
-                             urls, prefix_hits, &full_hits);
+                             urls,
+                             prefix_hits);
     if (!found)
       return false;
     DCHECK_LE(1U, prefix_hits->size());
@@ -142,7 +143,9 @@ class TestSafeBrowsingDatabase :  public SafeBrowsingDatabase {
     ADD_FAILURE() << "Not implemented.";
   }
   virtual void CacheHashResults(const std::vector<SBPrefix>& prefixes,
-      const std::vector<SBFullHashResult>& full_hits) OVERRIDE {
+                                const std::vector<SBFullHashResult>& full_hits,
+                                const base::TimeDelta& cache_lifetime)
+      OVERRIDE {
     // Do nothing for the cache.
   }
   virtual bool IsMalwareIPMatchKillSwitchOn() OVERRIDE {
@@ -152,11 +155,9 @@ class TestSafeBrowsingDatabase :  public SafeBrowsingDatabase {
   // Fill up the database with test URL.
   void AddUrl(const GURL& url,
               const std::string& list_name,
-              const std::vector<SBPrefix>& prefix_hits,
-              const std::vector<SBFullHashResult>& full_hits) {
+              const std::vector<SBPrefix>& prefix_hits) {
     badurls_[url.spec()].list_name = list_name;
     badurls_[url.spec()].prefix_hits = prefix_hits;
-    badurls_[url.spec()].full_hits = full_hits;
   }
 
   // Fill up the database with test hash digest.
@@ -168,14 +169,12 @@ class TestSafeBrowsingDatabase :  public SafeBrowsingDatabase {
   struct Hits {
     std::string list_name;
     std::vector<SBPrefix> prefix_hits;
-    std::vector<SBFullHashResult> full_hits;
   };
 
   bool ContainsUrl(const std::string& list_name0,
                    const std::string& list_name1,
                    const std::vector<GURL>& urls,
-                   std::vector<SBPrefix>* prefix_hits,
-                   std::vector<SBFullHashResult>* full_hits) {
+                   std::vector<SBPrefix>* prefix_hits) {
     bool hit = false;
     for (size_t i = 0; i < urls.size(); ++i) {
       const GURL& url = urls[i];
@@ -190,9 +189,6 @@ class TestSafeBrowsingDatabase :  public SafeBrowsingDatabase {
         prefix_hits->insert(prefix_hits->end(),
                             badurls_it->second.prefix_hits.begin(),
                             badurls_it->second.prefix_hits.end());
-        full_hits->insert(full_hits->end(),
-                          badurls_it->second.full_hits.begin(),
-                          badurls_it->second.full_hits.end());
         hit = true;
       }
 
@@ -341,7 +337,6 @@ class SafeBrowsingServiceTest : public InProcessBrowserTest {
     safe_browsing_util::CanonicalizeUrl(url, &host, &path, NULL);
     full_hash->hash = SBFullHashForString(host + path);
     full_hash->list_name = list_name;
-    full_hash->add_chunk_id = add_chunk_id;
   }
 
   static void GenDigestFullhashResult(const std::string& full_digest,
@@ -350,7 +345,6 @@ class SafeBrowsingServiceTest : public InProcessBrowserTest {
                                       SBFullHashResult* full_hash) {
     full_hash->hash = safe_browsing_util::StringToSBFullHash(full_digest);
     full_hash->list_name = list_name;
-    full_hash->add_chunk_id = add_chunk_id;
   }
 
   virtual void SetUp() {
@@ -391,7 +385,7 @@ class SafeBrowsingServiceTest : public InProcessBrowserTest {
     // full hash is hit in database's local cache.
     std::vector<SBFullHashResult> empty_full_hits;
     TestSafeBrowsingDatabase* db = db_factory_.GetDb();
-    db->AddUrl(url, full_hash.list_name, prefix_hits, empty_full_hits);
+    db->AddUrl(url, full_hash.list_name, prefix_hits);
 
     TestProtocolManager* pm = pm_factory_.GetProtocolManager();
     pm->SetGetFullHashResponse(full_hash);