Refactor net::BackoffEntry to not require subclassing

chrome/browser/chromeos/net/network_portal_detector_impl.cc

 // Copyright (c) 2013 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/chromeos/net/network_portal_detector_impl.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 380 matching lines @@
 }
 
 int NetworkPortalDetectorImpl::NoResponseResultCount() {
   return no_response_result_count_;
 }
 
 base::TimeTicks NetworkPortalDetectorImpl::AttemptStartTime() {
   return attempt_start_time_;
 }
 
-base::TimeTicks NetworkPortalDetectorImpl::GetCurrentTimeTicks() {
+base::TimeTicks NetworkPortalDetectorImpl::NowTicks() {
   if (time_ticks_for_testing_.is_null())
     return base::TimeTicks::Now();
   return time_ticks_for_testing_;
 }
 
 
 ////////////////////////////////////////////////////////////////////////////////
 // NetworkPortalDetectorImpl, private:
 
 void NetworkPortalDetectorImpl::StartDetection() {
   DCHECK(is_idle());
 
   ResetStrategyAndCounters();
-  detection_start_time_ = GetCurrentTimeTicks();
+  detection_start_time_ = NowTicks();
   ScheduleAttempt(base::TimeDelta());
 }
 
 void NetworkPortalDetectorImpl::StopDetection() {
   attempt_task_.Cancel();
   attempt_timeout_.Cancel();
   captive_portal_detector_->Cancel();
   state_ = STATE_IDLE;
   ResetStrategyAndCounters();
 }
@@ skipping 17 matching lines @@
   attempt_task_.Reset(base::Bind(&NetworkPortalDetectorImpl::StartAttempt,
                                  weak_factory_.GetWeakPtr()));
   base::MessageLoop::current()->PostDelayedTask(
       FROM_HERE, attempt_task_.callback(), next_attempt_delay_);
 }
 
 void NetworkPortalDetectorImpl::StartAttempt() {
   DCHECK(is_portal_check_pending());
 
   state_ = STATE_CHECKING_FOR_PORTAL;
-  attempt_start_time_ = GetCurrentTimeTicks();
+  attempt_start_time_ = NowTicks();
 
   captive_portal_detector_->DetectCaptivePortal(
       test_url_,
       base::Bind(&NetworkPortalDetectorImpl::OnAttemptCompleted,
                  weak_factory_.GetWeakPtr()));
   attempt_timeout_.Reset(
       base::Bind(&NetworkPortalDetectorImpl::OnAttemptTimeout,
                  weak_factory_.GetWeakPtr()));
 
   base::MessageLoop::current()->PostDelayedTask(
@@ skipping 40 matching lines @@
   if (!attempt_completed_report_.Equals(attempt_completed_report)) {
     attempt_completed_report_ = attempt_completed_report;
     attempt_completed_report_.Report();
   }
 
   state_ = STATE_IDLE;
   attempt_timeout_.Cancel();
 
   CaptivePortalState state;
   state.response_code = response_code;
-  state.time = GetCurrentTimeTicks();
+  state.time = NowTicks();
   switch (result) {
     case captive_portal::RESULT_NO_RESPONSE:
       if (state.response_code == net::HTTP_PROXY_AUTHENTICATION_REQUIRED) {
         state.status = CAPTIVE_PORTAL_STATUS_PROXY_AUTH_REQUIRED;
       } else if (network && network->is_captive_portal()) {
         // Take into account shill's detection results.
         state.status = CAPTIVE_PORTAL_STATUS_PORTAL;
       } else {
         state.status = CAPTIVE_PORTAL_STATUS_OFFLINE;
       }
@@ skipping 91 matching lines @@
 }
 
 void NetworkPortalDetectorImpl::RecordDetectionStats(
     const NetworkState* network,
     CaptivePortalStatus status) {
   // Don't record stats for offline state.
   if (!network)
     return;
 
   if (!detection_start_time_.is_null())
-    RecordDetectionDuration(GetCurrentTimeTicks() - detection_start_time_);
+    RecordDetectionDuration(NowTicks() - detection_start_time_);
   RecordDetectionResult(status);
 
   switch (status) {
     case NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_UNKNOWN:
       NOTREACHED();
       break;
     case NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_OFFLINE:
       if (network->IsConnectedState())
         RecordDiscrepancyWithShill(network, status);
       break;
@@ skipping 16 matching lines @@
 }
 
 void NetworkPortalDetectorImpl::ResetStrategyAndCounters() {
   last_detection_result_ = CAPTIVE_PORTAL_STATUS_UNKNOWN;
   same_detection_result_count_ = 0;
   no_response_result_count_ = 0;
   strategy_->Reset();
 }
 
 }  // namespace chromeos