Merge 22814 - Fix for an "update in progress" DCHECK....

chrome/browser/safe_browsing/protocol_manager.h

 // Copyright (c) 2006-2008 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 134 matching lines @@
   // If the SafeBrowsing service wants us to re-key, we clear our key state and
   // issue the request.
   void HandleReKey();
 
   // Update internal state for each GetHash response error.
   void HandleGetHashError();
 
   // 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:
   // 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.
   scoped_ptr<URLFetcher> request_;
 
   // The kind of request that is currently in progress.
@@ skipping 66 matching lines @@
   // Track the size of each update (in bytes).
   int update_size_;
 
   // Track outstanding malware report fetchers for clean up.
   std::set<const URLFetcher*> malware_reports_;
 
   DISALLOW_COPY_AND_ASSIGN(SafeBrowsingProtocolManager);
 };
 
 #endif  // CHROME_BROWSER_SAFE_BROWSING_PROTOCOL_MANAGER_H_