Refactor net::BackoffEntry to not require subclassing

chrome/browser/captive_portal/captive_portal_service.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_CAPTIVE_PORTAL_CAPTIVE_PORTAL_SERVICE_H_
 #define CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_SERVICE_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_member.h"
 #include "base/threading/non_thread_safe.h"
+#include "base/time/tick_clock.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "components/captive_portal/captive_portal_detector.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "net/base/backoff_entry.h"
 #include "url/gurl.h"
 
 class Profile;
 
 // Service that checks for captive portals when queried, and sends a
@@ skipping 19 matching lines @@
     // The result of the second most recent captive portal check.
     captive_portal::CaptivePortalResult previous_result;
     // The result of the most recent captive portal check.
     captive_portal::CaptivePortalResult result;
     // Landing url of the captive portal check ping. If behind a captive portal,
     // this points to the login page.
     GURL landing_url;
   };
 
   explicit CaptivePortalService(Profile* profile);
+  CaptivePortalService(Profile* profile, base::TickClock* clock_for_testing);
   ~CaptivePortalService() override;
 
   // Triggers a check for a captive portal.  If there's already a check in
   // progress, does nothing.  Throttles the rate at which requests are sent.
   // Always sends the result notification asynchronously.
   void DetectCaptivePortal();
 
   // Returns the URL used for captive portal testing.  When a captive portal is
   // detected, this URL will take us to the captive portal landing page.
   const GURL& test_url() const { return test_url_; }
@@ skipping 11 matching lines @@
   // tests.  Should be called before the service is created.
   static void set_state_for_testing(TestingState testing_state) {
     testing_state_ = testing_state;
   }
   static TestingState get_state_for_testing() { return testing_state_; }
 
  private:
   friend class CaptivePortalServiceTest;
   friend class CaptivePortalBrowserTest;
 
-  // Subclass of BackoffEntry that uses the CaptivePortalService's
-  // GetCurrentTime function, for unit testing.
-  class RecheckBackoffEntry;
-
   enum State {
     // No check is running or pending.
     STATE_IDLE,
     // The timer to check for a captive portal is running.
     STATE_TIMER_RUNNING,
     // There's an outstanding HTTP request to check for a captive portal.
     STATE_CHECKING_FOR_PORTAL,
   };
 
   // Contains all the information about the minimum time allowed between two
@@ skipping 35 matching lines @@
   void ResetBackoffEntry(captive_portal::CaptivePortalResult result);
 
   // Updates |enabled_| based on command line flags and Profile preferences,
   // and sets |state_| to STATE_NONE if it's false.
   // TODO(mmenke): Figure out on which platforms, if any, should not use
   //               automatic captive portal detection.  Currently it's enabled
   //               on all platforms, though this code is not compiled on
   //               Android, since it lacks the Browser class.
   void UpdateEnabledState();
 
-  // Returns the current TimeTicks.
   base::TimeTicks GetCurrentTimeTicks() const;
 
   bool DetectionInProgress() const;
 
   // Returns true if the timer to try and detect a captive portal is running.
   bool TimerRunning() const;
 
   State state() const { return state_; }
 
   RecheckPolicy& recheck_policy() { return recheck_policy_; }
 
   void set_test_url(const GURL& test_url) { test_url_ = test_url; }
 
-  // Sets current test time ticks. Used by unit tests.
-  void set_time_ticks_for_testing(const base::TimeTicks& time_ticks) {
-    time_ticks_for_testing_ = time_ticks;
-  }
-
-  // Advances current test time ticks. Used by unit tests.
-  void advance_time_ticks_for_testing(const base::TimeDelta& delta) {
-    time_ticks_for_testing_ += delta;
-  }
-
   // The profile that owns this CaptivePortalService.
   Profile* profile_;
 
   State state_;
 
   // Detector for checking active network for a portal state.
   captive_portal::CaptivePortalDetector captive_portal_detector_;
 
   // True if the service is enabled.  When not enabled, all checks will return
   // RESULT_INTERNET_CONNECTED.
@@ skipping 25 matching lines @@
 
   // The pref member for whether navigation errors should be resolved with a web
   // service.  Actually called "alternate_error_pages", since it's also used for
   // the Link Doctor.
   BooleanPrefMember resolve_errors_with_web_service_;
 
   base::OneShotTimer<CaptivePortalService> check_captive_portal_timer_;
 
   static TestingState testing_state_;
 
-  // Test time ticks used by unit tests.
-  base::TimeTicks time_ticks_for_testing_;
+  // Test tick clock used by unit tests.
+  base::TickClock* tick_clock_for_testing_;  // Not owned.
 
   DISALLOW_COPY_AND_ASSIGN(CaptivePortalService);
 };
 
 #endif  // CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_SERVICE_H_