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

chrome/browser/safe_browsing/protocol_manager.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_PROTOCOL_MANAGER_H_
 #define CHROME_BROWSER_SAFE_BROWSING_PROTOCOL_MANAGER_H_
 
 // A class that implements Chrome's interface with the SafeBrowsing protocol.
 // See https://developers.google.com/safe-browsing/developers_guide_v2 for
 // protocol details.
@@ skipping 41 matching lines @@
 class SBProtocolManagerFactory;
 class SafeBrowsingProtocolManagerDelegate;
 
 class SafeBrowsingProtocolManager : public net::URLFetcherDelegate,
                                     public base::NonThreadSafe {
  public:
   // FullHashCallback is invoked when GetFullHash completes.
   // Parameters:
   //   - The vector of full hash results. If empty, indicates that there
   //     were no matches, and that the resource is safe.
-  //   - Whether the result can be cached. This may not be the case when
-  //     the result did not come from the SB server, for example.
+  //   - The cache lifetime of the result. A lifetime of 0 indicates the results
+  //     should not be cached.
   typedef base::Callback<void(const std::vector<SBFullHashResult>&,
-                              bool)> FullHashCallback;
+                              const base::TimeDelta&)> FullHashCallback;
 
   virtual ~SafeBrowsingProtocolManager();
 
   // Makes the passed |factory| the factory used to instantiate
   // a SafeBrowsingService. Useful for tests.
   static void RegisterFactory(SBProtocolManagerFactory* factory) {
     factory_ = factory;
   }
 
   // Create an instance of the safe browsing protocol manager.
@@ skipping 59 matching lines @@
 
     // Subset of successful responses for which one or more of the
     // full hashes matched (should lead to an interstitial).
     GET_HASH_FULL_HASH_HIT,
 
     // Subset of successful responses which weren't empty and have no
     // matches.  It means that there was a prefix collision which was
     // cleared up by the full hashes.
     GET_HASH_FULL_HASH_MISS,
 
+    // Subset of successful responses where the response body wasn't parsable.
+    GET_HASH_PARSE_ERROR,
+
+    // Gethash request failed (network error).
+    GET_HASH_NETWORK_ERROR,
+
+    // Gethash request returned HTTP result code other than 200 or 204.
+    GET_HASH_HTTP_ERROR,
+
     // Memory space for histograms is determined by the max.  ALWAYS
     // ADD NEW VALUES BEFORE THIS ONE.
     GET_HASH_RESULT_MAX
   };
 
   // Record a GetHash result. |is_download| indicates if the get
   // hash is triggered by download related lookup.
   static void RecordGetHashResult(bool is_download,
                                   ResultType result_type);
 
@@ skipping 268 matching lines @@
   // call at a later time.
   virtual void AddChunks(const std::string& list, SBChunkList* chunks,
                          AddChunksCallback callback) = 0;
 
   // Delete chunks from the database.
   virtual void DeleteChunks(
       std::vector<SBChunkDelete>* delete_chunks) = 0;
 };
 
 #endif  // CHROME_BROWSER_SAFE_BROWSING_PROTOCOL_MANAGER_H_