Perform alarm's period limit check while reading alarm info from StateStore.

extensions/browser/api/alarms/alarms_api.cc

Index: extensions/browser/api/alarms/alarms_api.cc
diff --git a/extensions/browser/api/alarms/alarms_api.cc b/extensions/browser/api/alarms/alarms_api.cc
index c6911330d2d53eee427c1c5b79ce2d320b0a5fca..d8c7c2a2f17aacbbc6cd61a7f2a954495e287538 100644
--- a/extensions/browser/api/alarms/alarms_api.cc
+++ b/extensions/browser/api/alarms/alarms_api.cc
@@ -12,6 +12,7 @@
 #include "base/time/default_clock.h"
 #include "base/values.h"
 #include "extensions/browser/api/alarms/alarm_manager.h"
+#include "extensions/browser/api/alarms/alarms_api_constants.h"
 #include "extensions/common/api/alarms.h"
 #include "extensions/common/error_utils.h"
 
@@ -26,8 +27,6 @@ const char kBothRelativeAndAbsoluteTime[] =
     "Cannot set both when and delayInMinutes.";
 const char kNoScheduledTime[] =
     "Must set at least one of when, delayInMinutes, or periodInMinutes.";
-const int kReleaseDelayMinimum = 1;
-const int kDevDelayMinimum = 0;
 
 bool ValidateAlarmCreateInfo(const std::string& alarm_name,
                              const alarms::AlarmCreateInfo& create_info,
@@ -51,9 +50,8 @@ bool ValidateAlarmCreateInfo(const std::string& alarm_name,
   // gets delayed past the boundary).  However, it's still worth warning about
   // relative delays that are shorter than we'll honor.
   if (create_info.delay_in_minutes.get()) {
-    if (*create_info.delay_in_minutes < kReleaseDelayMinimum) {
-      static_assert(kReleaseDelayMinimum == 1,
-                    "warning message must be updated");

[asargent_no_longer_on_chrome, 2016/06/10 00:07:33]

optional: I see you moved these to a single assert in alarms_api_constants.cc.
It seems like that is slightly more likely to lead to someone blindly just
updating the value in the static_assert test without reading the error message
and realizing that it means the strings here need to be updated. My personal
preference would be to leave these as-is, but it isn't that big of a deal either
way. If you want to keep the change as you have it in the CL that's ok. 

[lazyboy, 2016/06/10 20:01:31]

I couldn't use static assert with variable declared/defined in
alarms_api_constants.h/cc
I've moved the warning messages too to alarms_api_constants.

+    if (*create_info.delay_in_minutes <
+        alarms_api_constants::kReleaseDelayMinimum) {
       if (Manifest::IsUnpackedLocation(extension->location()))
         warnings->push_back(ErrorUtils::FormatErrorMessage(
             "Alarm delay is less than minimum of 1 minutes."
@@ -68,9 +66,8 @@ bool ValidateAlarmCreateInfo(const std::string& alarm_name,
     }
   }
   if (create_info.period_in_minutes.get()) {
-    if (*create_info.period_in_minutes < kReleaseDelayMinimum) {
-      static_assert(kReleaseDelayMinimum == 1,
-                    "warning message must be updated");
+    if (*create_info.period_in_minutes <
+        alarms_api_constants::kReleaseDelayMinimum) {
       if (Manifest::IsUnpackedLocation(extension->location()))
         warnings->push_back(ErrorUtils::FormatErrorMessage(
             "Alarm period is less than minimum of 1 minutes."
@@ -118,12 +115,15 @@ bool AlarmsCreateFunction::RunAsync() {
        it != warnings.end(); ++it)
     WriteToConsole(content::CONSOLE_MESSAGE_LEVEL_WARNING, *it);
 
-  Alarm alarm(alarm_name, params->alarm_info,
-              base::TimeDelta::FromMinutes(
-                  Manifest::IsUnpackedLocation(extension()->location())
-                      ? kDevDelayMinimum
-                      : kReleaseDelayMinimum),
-              clock_->Now());
+  const int kSecondsPerMinute = 60;
+  base::TimeDelta granularity =
+      base::TimeDelta::FromSecondsD(
+          (Manifest::IsUnpackedLocation(extension()->location())
+               ? alarms_api_constants::kDevDelayMinimum
+               : alarms_api_constants::kReleaseDelayMinimum)) *
+      kSecondsPerMinute;
+
+  Alarm alarm(alarm_name, params->alarm_info, granularity, clock_->Now());
   AlarmManager::Get(browser_context())
       ->AddAlarm(extension_id(), alarm,
                  base::Bind(&AlarmsCreateFunction::Callback, this));