Switch MetricsReportingScheduler to using an actual timer object

chrome/browser/metrics/metrics_reporting_scheduler.h

Index: chrome/browser/metrics/metrics_reporting_scheduler.h
diff --git a/chrome/browser/metrics/metrics_reporting_scheduler.h b/chrome/browser/metrics/metrics_reporting_scheduler.h
index 7040bbb2868e02f370394ec76d579c2f45761e79..5eb89954507170ef00cb0d8e29bc439fa9c4433a 100644
--- a/chrome/browser/metrics/metrics_reporting_scheduler.h
+++ b/chrome/browser/metrics/metrics_reporting_scheduler.h
@@ -10,6 +10,7 @@
 #include "base/callback.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time.h"
+#include "base/timer.h"
 
 // Scheduler task to drive a MetricsService object's uploading.
 class MetricsReportingScheduler {
@@ -46,7 +47,7 @@ class MetricsReportingScheduler {
   // The MetricsService method to call when uploading should happen.
   base::Closure upload_callback_;
 
-  base::WeakPtrFactory<MetricsReportingScheduler> weak_ptr_factory_;
+  base::OneShotTimer<MetricsReportingScheduler> upload_timer_;
 
   // The interval between being told an upload is done and starting the next
   // upload.
@@ -56,10 +57,6 @@ class MetricsReportingScheduler {
   // more recently than Stop).
   bool running_;
 
-  // Indicates that a timer for triggering the next upload has already been
-  // started.
-  bool timer_pending_;
-
   // Indicates that the last triggered upload hasn't resolved yet.
   bool callback_pending_;