Fix a bug where the minimum granular time for Alarms was not calculated properly.

chrome/browser/extensions/api/alarms/alarms_api_unittest.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.
 
 // This file tests the chrome.alarms extension API.
 
 #include "base/test/simple_test_clock.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/api/alarms/alarm_manager.h"
 #include "chrome/browser/extensions/api/alarms/alarms_api.h"
@@ skipping 557 matching lines @@
       extensions::Manifest::INTERNAL);
   test_clock_->SetNow(base::Time::FromJsTime(300000));
   CreateAlarm("[\"a\", {\"when\": 300010}]");
   CreateAlarm("[\"b\", {\"when\": 340000}]");
 
   // On startup (when there's no "last poll"), we let alarms fire as
   // soon as they're scheduled.
   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
-  // minutes, which makes AddAlarm schedule the next poll after the
+  // In released extensions, we set the granularity to at least 1
+  // minute, which makes AddAlarm schedule the next poll after the
   // extension requested.
   alarm_manager_->ScheduleNextPoll();
   EXPECT_DOUBLE_EQ((alarm_manager_->last_poll_time_ +
                     base::TimeDelta::FromMinutes(1)).ToJsTime(),
-                   alarm_manager_->test_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}]");
   EXPECT_TRUE(alarm_manager_->timer_.IsRunning());
   RemoveAllAlarms();
   EXPECT_FALSE(alarm_manager_->timer_.IsRunning());
 }
 
+TEST_F(ExtensionAlarmsSchedulingTest, MinimumGranularity) {
+  extension_ = utils::CreateEmptyExtensionWithLocation(
+      extensions::Manifest::INTERNAL);
+  test_clock_->SetNow(base::Time::FromJsTime(0));
+  CreateAlarm("[\"a\", {\"periodInMinutes\": 2}]");
+  test_clock_->Advance(base::TimeDelta::FromSeconds(1));
+  CreateAlarm("[\"b\", {\"periodInMinutes\": 2}]");
+  test_clock_->Advance(base::TimeDelta::FromMinutes(2));
+
+  alarm_manager_->last_poll_time_ = base::Time::FromJsTime(2 * 60000);
+  // In released extensions, we set the granularity to at least 1
+  // minute, which makes scheduler set it to 1 minute, rather than
+  // 1 second later (when b is supposed to go off).
+  alarm_manager_->ScheduleNextPoll();
+  EXPECT_DOUBLE_EQ((alarm_manager_->last_poll_time_ +
+                    base::TimeDelta::FromMinutes(1)).ToJsTime(),
+                    alarm_manager_->test_next_poll_time_.ToJsTime());
+}
+
 }  // namespace extensions