Move extension_error_utils.* and url_pattern_set.* into

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_system.h"
 #include "chrome/common/extensions/api/alarms.h"
-#include "chrome/common/extensions/extension_error_utils.h"
+#include "extensions/common/extension_error_utils.h"
 
 namespace alarms = extensions::api::alarms;
 
 namespace extensions {
 
 namespace {
 
 const char kDefaultAlarmName[] = "";
 const char kAlarmNotFound[] = "No alarm named '*' exists.";
 const char kDelayLessThanMinimum[] = "* is less than minimum of * minutes.";
 const char kDelayIsNonInteger[] = "* is not an integer value.";
 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 = 5;
 const int kDevDelayMinimum = 0;
 
 bool ValidateDelay(double delay_in_minutes,
                    const Extension* extension,
                    const std::string& delay_or_period,
                    std::string* error) {
   double delay_minimum = kDevDelayMinimum;
   if (extension->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 = ExtensionErrorUtils::FormatErrorMessage(
+      *error = ErrorUtils::FormatErrorMessage(
           kDelayIsNonInteger,
           delay_or_period);
       return false;
     }
     delay_minimum = kReleaseDelayMinimum;
   }
 
   // Validate against our found delay minimum.
   if (delay_in_minutes < delay_minimum) {
-    *error = ExtensionErrorUtils::FormatErrorMessage(
+    *error = ErrorUtils::FormatErrorMessage(
         kDelayLessThanMinimum,
         delay_or_period,
         base::DoubleToString(delay_minimum));
     return false;
   }
 
   return true;
 }
 
 bool ValidateAlarmCreateInfo(const alarms::AlarmCreateInfo& create_info,
@@ skipping 60 matching lines @@
 bool AlarmsGetFunction::RunImpl() {
   scoped_ptr<alarms::Get::Params> params(alarms::Get::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
   std::string name = params->name.get() ? *params->name : kDefaultAlarmName;
   const Alarm* alarm =
       ExtensionSystem::Get(profile())->alarm_manager()->GetAlarm(
           extension_id(), name);
 
   if (!alarm) {
-    error_ = ExtensionErrorUtils::FormatErrorMessage(kAlarmNotFound, name);
+    error_ = ErrorUtils::FormatErrorMessage(kAlarmNotFound, name);
     return false;
   }
 
   results_ = alarms::Get::Results::Create(*alarm->js_alarm);
   return true;
 }
 
 bool AlarmsGetAllFunction::RunImpl() {
   const AlarmManager::AlarmList* alarms =
       ExtensionSystem::Get(profile())->alarm_manager()->GetAllAlarms(
@@ skipping 14 matching lines @@
 bool AlarmsClearFunction::RunImpl() {
   scoped_ptr<alarms::Clear::Params> params(
       alarms::Clear::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
   std::string name = params->name.get() ? *params->name : kDefaultAlarmName;
   bool success = ExtensionSystem::Get(profile())->alarm_manager()->RemoveAlarm(
      extension_id(), name);
 
   if (!success) {
-    error_ = ExtensionErrorUtils::FormatErrorMessage(kAlarmNotFound, name);
+    error_ = ErrorUtils::FormatErrorMessage(kAlarmNotFound, name);
     return false;
   }
 
   return true;
 }
 
 bool AlarmsClearAllFunction::RunImpl() {
   ExtensionSystem::Get(profile())->alarm_manager()->RemoveAllAlarms(
      extension_id());
   return true;
 }
 
 }  // namespace extensions