Fix DeviceStatusCollectorTest.MaxStoredPeriods.

chrome/browser/policy/device_status_collector.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/policy/device_status_collector.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/location.h"
 #include "base/logging.h"
@@ skipping 251 matching lines @@
     return;
 
   Time now = GetCurrentTime();
 
   if (state == IDLE_STATE_ACTIVE) {
     // If it's been too long since the last report, or if the activity is
     // negative (which can happen when the clock changes), assume a single
     // interval of activity.
     int active_seconds = (now - last_idle_check_).InSeconds();
     if (active_seconds < 0 ||
-        active_seconds >= static_cast<int>((2 * kIdlePollIntervalSeconds)))
+        active_seconds >= static_cast<int>((2 * kIdlePollIntervalSeconds))) {
       AddActivePeriod(now - TimeDelta::FromSeconds(kIdlePollIntervalSeconds),
                       now);
-    else
+    } else {
       AddActivePeriod(last_idle_check_, now);
+    }
 
     PruneStoredActivityPeriods(now);
   }
   last_idle_check_ = now;
 }
 
 void DeviceStatusCollector::GetActivityTimes(
     em::DeviceStatusReportRequest* request) {
   DictionaryPrefUpdate update(local_state_, prefs::kDeviceActivityTimes);
   base::DictionaryValue* activity_times = update.Get();
@@ skipping 96 matching lines @@
     UpdateReportingSettings();
   else
     NOTREACHED();
 }
 
 void DeviceStatusCollector::ScheduleGeolocationUpdateRequest() {
   if (geolocation_update_timer_.IsRunning() || geolocation_update_in_progress_)
     return;
 
   if (position_.Validate()) {
-    TimeDelta elapsed = Time::Now() - position_.timestamp;
+    TimeDelta elapsed = GetCurrentTime() - position_.timestamp;
     TimeDelta interval =
         TimeDelta::FromSeconds(kGeolocationPollIntervalSeconds);
     if (elapsed > interval) {
       geolocation_update_in_progress_ = true;
       location_update_requester_(base::Bind(
           &DeviceStatusCollector::ReceiveGeolocationUpdate,
           weak_factory_.GetWeakPtr()));
     } else {
       geolocation_update_timer_.Start(
           FROM_HERE,
@@ skipping 30 matching lines @@
     location.SetDouble(kSpeed, position.speed);
     location.SetString(kTimestamp,
         base::Int64ToString(position.timestamp.ToInternalValue()));
     local_state_->Set(prefs::kDeviceLocation, location);
   }
 
   ScheduleGeolocationUpdateRequest();
 }
 
 }  // namespace policy