Delta from the first fix.

chrome/browser/extensions/api/alarms/alarms_api_unittest.cc

Index: chrome/browser/extensions/api/alarms/alarms_api_unittest.cc
diff --git a/chrome/browser/extensions/api/alarms/alarms_api_unittest.cc b/chrome/browser/extensions/api/alarms/alarms_api_unittest.cc
index 9ec10d44dbf5257f6dbe95094dbdcb2ad509a1eb..6c13b86d6d791007371c5ed84661adce8f8084b1 100644
--- a/chrome/browser/extensions/api/alarms/alarms_api_unittest.cc
+++ b/chrome/browser/extensions/api/alarms/alarms_api_unittest.cc
@@ -413,6 +413,7 @@ void ExtensionAlarmsTestClearGetAllAlarms1Callback(
 
   // Now wait for the alarms to fire, and ensure the cancelled alarms don't
   // fire.
+  test->test_clock_->Advance(base::TimeDelta::FromMilliseconds(60));
   RunScheduleNextPoll(test->alarm_manager_);
   base::MessageLoop::current()->Run();
 
@@ -479,7 +480,7 @@ class ExtensionAlarmsSchedulingTest : public ExtensionAlarmsTest {
     CHECK(alarm);
     const base::Time scheduled_time =
         base::Time::FromJsTime(alarm->js_alarm->scheduled_time);
-    EXPECT_EQ(scheduled_time, alarm_manager_->next_poll_time_);
+    EXPECT_EQ(scheduled_time, alarm_manager_->test_next_poll_time_);
   }
 
   static void RemoveAlarmCallback (bool success) { EXPECT_TRUE(success); }
@@ -538,7 +539,7 @@ TEST_F(ExtensionAlarmsSchedulingTest, PollScheduling) {
     alarm_manager_->AddAlarmImpl(extension_->id(), alarm);
     base::MessageLoop::current()->Run();
     EXPECT_EQ(alarm_manager_->last_poll_time_ + base::TimeDelta::FromMinutes(3),
-              alarm_manager_->next_poll_time_);
+              alarm_manager_->test_next_poll_time_);
     RemoveAllAlarms();
   }
   {
@@ -557,7 +558,7 @@ TEST_F(ExtensionAlarmsSchedulingTest, PollScheduling) {
     alarm_manager_->AddAlarmImpl(extension_->id(), alarm3);
     base::MessageLoop::current()->Run();
     EXPECT_EQ(alarm_manager_->last_poll_time_ + base::TimeDelta::FromMinutes(4),
-              alarm_manager_->next_poll_time_);
+              alarm_manager_->test_next_poll_time_);
     RemoveAllAlarms();
   }
 }
@@ -571,7 +572,7 @@ TEST_F(ExtensionAlarmsSchedulingTest, ReleasedExtensionPollsInfrequently) {
 
   // On startup (when there's no "last poll"), we let alarms fire as
   // soon as they're scheduled.
-  EXPECT_DOUBLE_EQ(300010, alarm_manager_->next_poll_time_.ToJsTime());
+  EXPECT_DOUBLE_EQ(300010, alarm_manager_->test_next_poll_time_.ToJsTime());
 
   alarm_manager_->last_poll_time_ = base::Time::FromJsTime(290000);
   // In released extensions, we set the granularity to at least 5
@@ -580,13 +581,14 @@ TEST_F(ExtensionAlarmsSchedulingTest, ReleasedExtensionPollsInfrequently) {
   alarm_manager_->ScheduleNextPoll();
   EXPECT_DOUBLE_EQ((alarm_manager_->last_poll_time_ +
                     base::TimeDelta::FromMinutes(1)).ToJsTime(),
-                   alarm_manager_->next_poll_time_.ToJsTime());
+                   alarm_manager_->test_next_poll_time_.ToJsTime());
 }
 
 TEST_F(ExtensionAlarmsSchedulingTest, TimerRunning) {
   EXPECT_FALSE(alarm_manager_->timer_.IsRunning());
   CreateAlarm("[\"a\", {\"delayInMinutes\": 0.001}]");
   EXPECT_TRUE(alarm_manager_->timer_.IsRunning());
+  test_clock_->Advance(base::TimeDelta::FromMilliseconds(60));
   base::MessageLoop::current()->Run();
   EXPECT_FALSE(alarm_manager_->timer_.IsRunning());
   CreateAlarm("[\"bb\", {\"delayInMinutes\": 10}]");