Alarm resolution changed to minutes and minimum delay added.

chrome/browser/extensions/api/alarms/alarms_api.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.
 
 #include "chrome/browser/extensions/api/alarms/alarms_api.h"
 
+#include "base/string_number_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/api/alarms/alarm_manager.h"
+#include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
+#include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/api/experimental.alarms.h"
 #include "chrome/common/extensions/extension_error_utils.h"
 
 namespace alarms = extensions::api::experimental_alarms;
 
 namespace extensions {
 
 namespace {
 
 const char kDefaultAlarmName[] = "";
 const char kAlarmNotFound[] = "No alarm named '*' exists.";
+const char kDelayLessThanMinimum[] = "Delay is less than minimum of * minutes.";
+const char kDelayIsNonInteger[] = "Delay is not an integer value.";
 
+const int kReleaseDelayMinimum = 5;
+const double kDevDelayMinimum = 0.1;

[Matt Perry, 2012/04/25 19:11:06]

Let's allow 0 minute delays for dev mode. That'll also let you get rid of the
special case for unit tests.

[Matt Tytel, 2012/04/30 23:36:21]

Done.

+
+}
+
+bool AlarmsCreateFunction::ValidateDelayTime(double delay_in_minutes) {

[Matt Perry, 2012/04/25 19:11:06]

nit: let's make this a global function in this file, and pass in the parameters
you need.

[Matt Tytel, 2012/04/30 23:36:21]

Done.

+  double delay_minimum = kDevDelayMinimum;
+  ExtensionService* extension_service = profile()->GetExtensionService();
+  if (!extension_service) {
+    // In testing, only check if the delay is non negative.
+    delay_minimum = 0;
+  }
+  else if(extension_service->GetExtensionById(extension_id(), false)->

[Matt Perry, 2012/04/25 19:11:06]

AlarmCreateFunction has a GetExtension() method. Just pass in the extension
here.

[Matt Tytel, 2012/04/30 23:36:21]

Done.

+      location() != Extension::LOAD) {
+    // In release mode we check for integer delay values and a stricter delay
+    // minimum.
+    if (delay_in_minutes != static_cast<int>(delay_in_minutes)) {
+      error_ = kDelayIsNonInteger;
+      return false;
+    }
+    delay_minimum = kReleaseDelayMinimum;
+  }
+
+  // Validate against our found delay minimum.
+  if (delay_in_minutes < delay_minimum) {
+    error_ = ExtensionErrorUtils::FormatErrorMessage(kDelayLessThanMinimum,
+        base::DoubleToString(delay_minimum));
+    return false;
+  }
+  return true;
 }
 
 bool AlarmsCreateFunction::RunImpl() {
   scoped_ptr<alarms::Create::Params> params(
       alarms::Create::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
+  if (!ValidateDelayTime(params->alarm_info.delay_in_minutes))
+    return false;
+
   linked_ptr<AlarmManager::Alarm> alarm(new AlarmManager::Alarm());
   alarm->name = params->name.get() ? *params->name : kDefaultAlarmName;
-  alarm->delay_in_seconds = params->alarm_info.delay_in_seconds;
+  alarm->delay_in_minutes = params->alarm_info.delay_in_minutes;
   alarm->repeating = params->alarm_info.repeating.get() ?
       *params->alarm_info.repeating : false;
   ExtensionSystem::Get(profile())->alarm_manager()->AddAlarm(
       extension_id(), alarm);
 
   return true;
 }
 
 bool AlarmsGetFunction::RunImpl() {
   scoped_ptr<alarms::Get::Params> params(
@@ skipping 43 matching lines @@
   return true;
 }
 
 bool AlarmsClearAllFunction::RunImpl() {
   ExtensionSystem::Get(profile())->alarm_manager()->RemoveAllAlarms(
      extension_id());
   return true;
 }
 
 }  // namespace extensions