Switch MetricsReportingScheduler to using an actual timer object

chrome/browser/metrics/metrics_reporting_scheduler.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/metrics/metrics_reporting_scheduler.h"
 
 #include "base/compiler_specific.h"
 #include "chrome/browser/metrics/metrics_service.h"
 
 using base::Time;
@@ skipping 15 matching lines @@
 // The following is the multiplier we use to expand that inter-log duration.
 static const double kBackoffMultiplier = 1.1;
 
 // The maximum backoff multiplier.
 static const int kMaxBackoffMultiplier = 10;
 
 
 MetricsReportingScheduler::MetricsReportingScheduler(
     const base::Closure& upload_callback)
     : upload_callback_(upload_callback),
-      ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)),
       upload_interval_(TimeDelta::FromSeconds(kInitialUploadIntervalSeconds)),
       running_(false),
-      timer_pending_(false),
       callback_pending_(false) {
 }
 
 MetricsReportingScheduler::~MetricsReportingScheduler() {}
 
 void MetricsReportingScheduler::Start() {
   running_ = true;
   ScheduleNextCallback();
 }
 
 void MetricsReportingScheduler::Stop() {
   running_ = false;
+  if (upload_timer_.IsRunning())
+    upload_timer_.Stop();
 }
 
 void MetricsReportingScheduler::UploadFinished(bool server_is_healthy,
                                                bool more_logs_remaining) {
   DCHECK(callback_pending_);
   callback_pending_ = false;
   // If the server is having issues, back off. Otherwise, reset to default
   // (unless there are more logs to send, in which case the next upload should
   // happen sooner).
   if (!server_is_healthy) {
     BackOffUploadInterval();
   } else if (more_logs_remaining) {
     upload_interval_ = TimeDelta::FromSeconds(kUnsentLogsIntervalSeconds);
   } else {
     upload_interval_ = TimeDelta::FromSeconds(kStandardUploadIntervalSeconds);
   }
 
   if (running_)
     ScheduleNextCallback();
 }
 
 void MetricsReportingScheduler::UploadCancelled() {
   DCHECK(callback_pending_);
   callback_pending_ = false;
   if (running_)
     ScheduleNextCallback();
 }
 
 void MetricsReportingScheduler::TriggerUpload() {
-  timer_pending_ = false;
   callback_pending_ = true;
   upload_callback_.Run();
 }
 
 void MetricsReportingScheduler::ScheduleNextCallback() {
   DCHECK(running_);
-  if (timer_pending_ || callback_pending_)
+  if (upload_timer_.IsRunning() || callback_pending_)
     return;
 
-  timer_pending_ = true;
-
-  MessageLoop::current()->PostDelayedTask(
-      FROM_HERE,
-      base::Bind(&MetricsReportingScheduler::TriggerUpload,
-                 weak_ptr_factory_.GetWeakPtr()),
-      upload_interval_);
+  upload_timer_.Start(FROM_HERE, upload_interval_, this,
+                      &MetricsReportingScheduler::TriggerUpload);
 }
 
 void MetricsReportingScheduler::BackOffUploadInterval() {
   DCHECK(kBackoffMultiplier > 1.0);
   upload_interval_ = TimeDelta::FromMicroseconds(
       static_cast<int64>(kBackoffMultiplier *
                          upload_interval_.InMicroseconds()));
 
   TimeDelta max_interval = kMaxBackoffMultiplier *
       TimeDelta::FromSeconds(kStandardUploadIntervalSeconds);
   if (upload_interval_ > max_interval || upload_interval_.InSeconds() < 0) {
     upload_interval_ = max_interval;
   }
 }