Fix an issue found in https://chromiumcodereview.appspot.com/23205008/

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 598 matching lines @@
   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());
 }
 
+TEST_F(ExtensionAlarmsSchedulingTest, DifferentMinimumGranularities) {
+  test_clock_->SetNow(base::Time::FromJsTime(0));
+  // Create an alarm to go off in 12 seconds. This uses the default, unpacked
+  // extension - so there is no minimum granularity.
+  CreateAlarm("[\"a\", {\"periodInMinutes\": 0.2}]");  // 12 seconds.
+
+  // Create a new extension, which is packed, and has a granularity of 1 minute.
+  // CreateAlarm() uses extension_, so keep a ref of the old one around, and
+  // repopulate extension_.
+  scoped_refptr<Extension> extension2(extension_);
+  extension_ =
+      utils::CreateEmptyExtensionWithLocation(extensions::Manifest::INTERNAL);
+
+  CreateAlarm("[\"b\", {\"periodInMinutes\": 2}]");
+
+  alarm_manager_->last_poll_time_ = base::Time::FromJsTime(0);
+  alarm_manager_->ScheduleNextPoll();
+
+  // The next poll time should be 12 seconds from now - the time at which the
+  // first alarm should go off.
+  EXPECT_DOUBLE_EQ((alarm_manager_->last_poll_time_ +
+                    base::TimeDelta::FromSeconds(12)).ToJsTime(),
+                    alarm_manager_->test_next_poll_time_.ToJsTime());
+}
+
 }  // namespace extensions