Fix DeviceStatusCollectorTest.MaxStoredPeriods.

chrome/browser/policy/device_status_collector.cc

Index: chrome/browser/policy/device_status_collector.cc
diff --git a/chrome/browser/policy/device_status_collector.cc b/chrome/browser/policy/device_status_collector.cc
index 0cac6ad4e11837f4e709ce4f4973aeeba48ed45a..c53f8708c23ee2882141c7a44a8aa6e4e9473fed 100644
--- a/chrome/browser/policy/device_status_collector.cc
+++ b/chrome/browser/policy/device_status_collector.cc
@@ -93,7 +93,18 @@ DeviceStatusCollector::DeviceStatusCollector(
       report_version_info_(false),
       report_activity_times_(false),
       report_boot_mode_(false),
-      report_location_(false) {
+      report_location_(false) {}
+
+DeviceStatusCollector::~DeviceStatusCollector() {
+  cros_settings_->RemoveSettingsObserver(chromeos::kReportDeviceVersionInfo,
+                                         this);
+  cros_settings_->RemoveSettingsObserver(chromeos::kReportDeviceActivityTimes,
+                                         this);
+  cros_settings_->RemoveSettingsObserver(chromeos::kReportDeviceBootMode, this);
+  cros_settings_->RemoveSettingsObserver(chromeos::kReportDeviceLocation, this);
+}
+
+void DeviceStatusCollector::Init() {
   if (!location_update_requester_)
     location_update_requester_ = &content::RequestLocationUpdate;
   idle_poll_timer_.Start(FROM_HERE,
@@ -144,15 +155,6 @@ DeviceStatusCollector::DeviceStatusCollector(
                                          base::Unretained(this)));
 }
 
-DeviceStatusCollector::~DeviceStatusCollector() {
-  cros_settings_->RemoveSettingsObserver(chromeos::kReportDeviceVersionInfo,
-                                         this);
-  cros_settings_->RemoveSettingsObserver(chromeos::kReportDeviceActivityTimes,
-                                         this);
-  cros_settings_->RemoveSettingsObserver(chromeos::kReportDeviceBootMode, this);
-  cros_settings_->RemoveSettingsObserver(chromeos::kReportDeviceLocation, this);
-}
-
 // static
 void DeviceStatusCollector::RegisterPrefs(PrefService* local_state) {
   local_state->RegisterDictionaryPref(prefs::kDeviceActivityTimes,
@@ -392,7 +394,7 @@ void DeviceStatusCollector::ScheduleGeolocationUpdateRequest() {
     return;
 
   if (position_.Validate()) {
-    TimeDelta elapsed = Time::Now() - position_.timestamp;
+    TimeDelta elapsed = GetCurrentTime() - position_.timestamp;
     TimeDelta interval =
         TimeDelta::FromSeconds(kGeolocationPollIntervalSeconds);
     if (elapsed > interval) {