Index: chrome/browser/policy/device_status_collector_unittest.cc |
diff --git a/chrome/browser/policy/device_status_collector_unittest.cc b/chrome/browser/policy/device_status_collector_unittest.cc |
index a5a4b1da69a07fd8e6231efa4a87cd5c78f0d92a..8a703854b95e69894549016385f750b825fcd98c 100644 |
--- a/chrome/browser/policy/device_status_collector_unittest.cc |
+++ b/chrome/browser/policy/device_status_collector_unittest.cc |
@@ -93,7 +93,7 @@ class TestingDeviceStatusCollector : public policy::DeviceStatusCollector { |
protected: |
virtual void CheckIdleState() OVERRIDE { |
// This should never be called in testing, as it results in a dbus call. |
- NOTREACHED(); |
+ ADD_FAILURE(); |
} |
// Each time this is called, returns a time that is a fixed increment |
@@ -344,6 +344,7 @@ TEST_F(DeviceStatusCollectorTest, MaxStoredPeriods) { |
status_collector_->set_max_stored_past_activity_days(max_days - 1); |
status_collector_->set_max_stored_future_activity_days(1); |
Time baseline = Time::Now().LocalMidnight(); |
Mattias Nissler (ping if slow)
2012/10/25 14:27:19
One thing: Should we convert these tests to starti
Joao da Silva
2012/10/25 15:24:17
That's a good idea. Done.
|
+ status_collector_->SetBaselineTime(baseline); |
// Simulate 12 active periods. |
for (int i = 0; i < static_cast<int>(max_days) + 2; i++) { |