Change SafeBrowsingProtocolManager::GetFullHash signature.

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.
 // The SafeBrowsingProtocolManager handles formatting and making requests of,
 // and handling responses from, Google's SafeBrowsing servers. This class uses
@@ skipping 43 matching lines @@
       const std::string& client_name,
       net::URLRequestContextGetter* request_context_getter,
       const std::string& url_prefix,
       bool disable_auto_update) = 0;
  private:
   DISALLOW_COPY_AND_ASSIGN(SBProtocolManagerFactory);
 };
 
 class SafeBrowsingProtocolManager : public net::URLFetcherDelegate {
  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.
+  typedef base::Callback<void(const std::vector<SBFullHashResult>&,
+                              bool)> 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 service.
   static SafeBrowsingProtocolManager* Create(
       SafeBrowsingService* sb_service,
       const std::string& client_name,
       net::URLRequestContextGetter* request_context_getter,
       const std::string& url_prefix,
       bool disable_auto_update);
 
   // Sets up the update schedule and internal state for making periodic requests
   // of the SafeBrowsing service.
   virtual void Initialize();
 
   // net::URLFetcherDelegate interface.
   virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
 
-  // API used by the SafeBrowsingService for issuing queries. When the results
-  // are available, SafeBrowsingService::HandleGetHashResults is called.
-  virtual void GetFullHash(SafeBrowsingService::SafeBrowsingCheck* check,
-                           const std::vector<SBPrefix>& prefixes);
+  // Retrieve the full hash for a set of prefixes, and invoke the callback
+  // argument when the results are retrieved. The callback may be invoked
+  // synchronously.
+  virtual void GetFullHash(const std::vector<SBPrefix>& prefixes,
+                           FullHashCallback callback,
+                           bool is_download);
 
   // Forces the start of next update after |interval| time.
   void ForceScheduleNextUpdate(base::TimeDelta interval);
 
   // Scheduled update callback.
   void GetNextUpdate();
 
   // Called by the SafeBrowsingService when our request for a list of all chunks
   // for each list is done.  If database_error is true, that means the protocol
   // manager shouldn't fetch updates since they can't be written to disk.  It
@@ skipping 167 matching lines @@
   void HandleGetHashError(const base::Time& now);
 
   // Helper function for update completion.
   void UpdateFinished(bool success);
 
   // A callback that runs if we timeout waiting for a response to an update
   // request. We use this to properly set our update state.
   void UpdateResponseTimeout();
 
  private:
+  // Map of GetHash requests to parameters which created it.
+  struct FullHashDetails {
+    FullHashDetails();
+    FullHashDetails(FullHashCallback callback, bool is_download);
+    ~FullHashDetails();

[mattm, 2012/10/29 23:57:09]

Maybe put a blank line between the methods and the data?

[cbentzel, 2012/10/30 11:34:03]

Done.

+    FullHashCallback callback;
+    bool is_download;
+  };
+  typedef base::hash_map<const net::URLFetcher*, FullHashDetails> HashRequests;
+
   // The factory that controls the creation of SafeBrowsingProtocolManager.
   // This is used by tests.
   static SBProtocolManagerFactory* factory_;
 
   // Main SafeBrowsing interface object.
   SafeBrowsingService* sb_service_;
 
   // Current active request (in case we need to cancel) for updates or chunks
   // from the SafeBrowsing service. We can only have one of these outstanding
   // at any given time unlike GetHash requests, which are tracked separately.
@@ skipping 17 matching lines @@
   std::string list_name_;
 
   // For managing the next earliest time to query the SafeBrowsing servers for
   // updates.
   base::TimeDelta next_update_interval_;
   base::OneShotTimer<SafeBrowsingProtocolManager> update_timer_;
 
   // All chunk requests that need to be made.
   std::deque<ChunkUrl> chunk_request_urls_;
 
-  // Map of GetHash requests.
-  typedef base::hash_map<const net::URLFetcher*,
-                         SafeBrowsingService::SafeBrowsingCheck*> HashRequests;
   HashRequests hash_requests_;
 
   // The next scheduled update has special behavior for the first 2 requests.
   enum UpdateRequestState {
     FIRST_REQUEST = 0,
     SECOND_REQUEST,
     NORMAL_REQUEST
   };
   UpdateRequestState update_state_;
 
@@ skipping 36 matching lines @@
   std::string url_prefix_;
 
   // When true, protocol manager will not start an update unless
   // ForceScheduleNextUpdate() is called. This is set for testing purpose.
   bool disable_auto_update_;
 
   DISALLOW_COPY_AND_ASSIGN(SafeBrowsingProtocolManager);
 };
 
 #endif  // CHROME_BROWSER_SAFE_BROWSING_PROTOCOL_MANAGER_H_