Fix the root cause of flakiness in SafeBrowsingProtocolManagerTest.TestGetHashBackOffTimes

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 28 matching lines @@
     return reinterpret_cast<size_t>(fetcher);
   }
 };
 }
 #endif
 
 class SafeBrowsingProtocolManager : public URLFetcher::Delegate {
   // Testing friends:
   FRIEND_TEST(SafeBrowsingProtocolManagerTest, TestBackOffTimes);
   FRIEND_TEST(SafeBrowsingProtocolManagerTest, TestChunkStrings);
-  FRIEND_TEST(SafeBrowsingProtocolManagerTest,
-              DISABLED_TestGetHashBackOffTimes);
+  FRIEND_TEST(SafeBrowsingProtocolManagerTest, TestGetHashBackOffTimes);
 
  public:
   SafeBrowsingProtocolManager(SafeBrowsingService* sb_service,
                               MessageLoop* notify_loop,
                               const std::string& client_key,
                               const std::string& wrapped_key);
   ~SafeBrowsingProtocolManager();
 
   // Set up the update schedule and internal state for making periodic requests
   // of the SafeBrowsing service.
@@ skipping 78 matching lines @@
   static std::string FormatList(const SBListChunkRanges& list, bool use_mac);
 
   // Run the protocol parser on received data and update the SafeBrowsingService
   // with the new content. Returns 'true' on successful parse, 'false' on error.
   bool HandleServiceResponse(const GURL& url, const char* data, int length);
 
   // 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();
+  // Update internal state for each GetHash response error, assuming that the
+  // current time is |now|.
+  void HandleGetHashError(const base::Time& now);
 
   // Helper function for update completion.
   void UpdateFinished(bool success);
 
  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
@@ skipping 70 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_