Refactor net::BackoffEntry to not require subclassing

chrome/browser/captive_portal/captive_portal_service_unittest.cc

 // 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.
 
 #include "chrome/browser/captive_portal/captive_portal_service.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "base/run_loop.h"
+#include "base/test/simple_test_tick_clock.h"
 #include "base/test/test_timeouts.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/captive_portal/captive_portal_testing_utils.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_source.h"
@@ skipping 72 matching lines @@
         old_captive_portal_testing_state_);
   }
 
   // |enable_service| is whether or not the captive portal service itself
   // should be disabled.  This is different from enabling the captive portal
   // detection preference.
   void Initialize(CaptivePortalService::TestingState testing_state) {
     CaptivePortalService::set_state_for_testing(testing_state);
 
     profile_.reset(new TestingProfile());
-    service_.reset(new CaptivePortalService(profile_.get()));
-    service_->set_time_ticks_for_testing(base::TimeTicks::Now());
+    tick_clock_.reset(new base::SimpleTestTickClock());
+    tick_clock_->Advance(base::TimeTicks::Now() - tick_clock_->NowTicks());
+    service_.reset(new CaptivePortalService(profile_.get(), tick_clock_.get()));
 
     // Use no delays for most tests.
     set_initial_backoff_no_portal(base::TimeDelta());
     set_initial_backoff_portal(base::TimeDelta());
 
     set_detector(&service_->captive_portal_detector_);
     SetTime(base::Time::Now());
 
     // Disable jitter, so can check exact values.
     set_jitter_factor(0.0);
@@ skipping 103 matching lines @@
     RunTest(expected_result, net_error, status_code, 200, NULL);
     RunTest(expected_result, net_error, status_code, 400, NULL);
     RunTest(expected_result, net_error, status_code, 800, NULL);
     RunTest(expected_result, net_error, status_code, 1600, NULL);
     RunTest(expected_result, net_error, status_code, 1600, NULL);
   }
 
   // Changes test time for the service and service's captive portal
   // detector.
   void AdvanceTime(const base::TimeDelta& delta) {
-    service()->advance_time_ticks_for_testing(delta);
+    tick_clock_->Advance(delta);
     CaptivePortalDetectorTestBase::AdvanceTime(delta);
   }
 
   bool TimerRunning() {
     return service()->TimerRunning();
   }
 
   base::TimeDelta GetTimeUntilNextRequest() {
     return service()->backoff_entry_->GetTimeUntilRelease();
   }
@@ skipping 34 matching lines @@
 
  private:
   // Stores the initial CaptivePortalService::TestingState so it can be restored
   // after the test.
   const CaptivePortalService::TestingState old_captive_portal_testing_state_;
 
   content::TestBrowserThreadBundle thread_bundle_;
 
   // Note that the construction order of these matters.
   scoped_ptr<TestingProfile> profile_;
+  scoped_ptr<base::SimpleTestTickClock> tick_clock_;
   scoped_ptr<CaptivePortalService> service_;
 };
 
 // Verify that an observer doesn't get messages from the wrong profile.
 TEST_F(CaptivePortalServiceTest, CaptivePortalTwoProfiles) {
   Initialize(CaptivePortalService::SKIP_OS_CHECK_FOR_TESTING);
   TestingProfile profile2;
   scoped_ptr<CaptivePortalService> service2(
       new CaptivePortalService(&profile2));
   CaptivePortalObserver observer2(&profile2, service2.get());
@@ skipping 221 matching lines @@
       base::Time::FromString("Tue, 17 Apr 2012 18:02:00 GMT", &start_time));
   SetTime(start_time);
 
   RunTest(captive_portal::RESULT_NO_RESPONSE,
           net::OK,
           503,
           0,
           "HTTP/1.1 503 OK\nRetry-After: Tue, 17 Apr 2012 18:02:51 GMT\n\n");
   EXPECT_EQ(base::TimeDelta::FromSeconds(51), GetTimeUntilNextRequest());
 }