| Index: chrome/browser/extensions/api/alarms/alarm_manager.cc
|
| diff --git a/chrome/browser/extensions/api/alarms/alarm_manager.cc b/chrome/browser/extensions/api/alarms/alarm_manager.cc
|
| index cb8883bcea23304d01256cb0016193ea548a7b8b..aa483ee9363e160ee2011a141b2f97e8ac6f8d22 100644
|
| --- a/chrome/browser/extensions/api/alarms/alarm_manager.cc
|
| +++ b/chrome/browser/extensions/api/alarms/alarm_manager.cc
|
| @@ -336,7 +336,7 @@ void AlarmManager::ScheduleNextPoll() {
|
| next_poll = soonest_alarm_time;
|
|
|
| // Schedule the poll.
|
| - next_poll_time_ = next_poll;
|
| + test_next_poll_time_ = next_poll;
|
| base::TimeDelta delay = std::max(base::TimeDelta::FromSeconds(0),
|
| next_poll - clock_->Now());
|
| timer_.Start(FROM_HERE,
|
| @@ -362,7 +362,7 @@ void AlarmManager::PollAlarms() {
|
| for (size_t i = cur_extension->second.size(); i > 0; --i) {
|
| AlarmList::iterator cur_alarm = cur_extension->second.begin() + i - 1;
|
| if (base::Time::FromJsTime(cur_alarm->js_alarm->scheduled_time) <=
|
| - next_poll_time_) {
|
| + last_poll_time_) {
|
| OnAlarm(make_pair(cur_extension, cur_alarm));
|
| }
|
| }
|
|
|