Make alarms extension API dev-channel-only instead of experimental.

BUG=124168
TEST=no

Review URL: https://chromiumcodereview.appspot.com/10384048

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135881 0039d316-1c4b-4281-b951-d872f2087c98

18 files changed, 47 insertions, 43 deletions

diff --git a/chrome/browser/extensions/api/alarms/alarm_manager.cc b/chrome/browser/extensions/api/alarms/alarm_manager.cc
index 08f0681..669b67f 100644
--- a/chrome/browser/extensions/api/alarms/alarm_manager.cc
+++ b/chrome/browser/extensions/api/alarms/alarm_manager.cc
@@ -20,7 +20,7 @@ namespace extensions {
 
 namespace {
 
-const char kOnAlarmEvent[] = "experimental.alarms.onAlarm";
+const char kOnAlarmEvent[] = "alarms.onAlarm";
 
 class DefaultAlarmDelegate : public AlarmManager::Delegate {
  public:
diff --git a/chrome/browser/extensions/api/alarms/alarm_manager.h b/chrome/browser/extensions/api/alarms/alarm_manager.h
index 6ca8dc07..b3d3fe0 100644
--- a/chrome/browser/extensions/api/alarms/alarm_manager.h
+++ b/chrome/browser/extensions/api/alarms/alarm_manager.h
@@ -12,7 +12,7 @@
 
 #include "base/timer.h"
 #include "chrome/browser/extensions/extension_function.h"
-#include "chrome/common/extensions/api/experimental.alarms.h"
+#include "chrome/common/extensions/api/alarms.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
@@ -24,7 +24,7 @@ namespace extensions {
 // There is one manager per virtual Profile.
 class AlarmManager : public content::NotificationObserver {
  public:
-  typedef extensions::api::experimental_alarms::Alarm Alarm;
+  typedef extensions::api::alarms::Alarm Alarm;
   typedef std::vector<linked_ptr<Alarm> > AlarmList;
 
   class Delegate {
diff --git a/chrome/browser/extensions/api/alarms/alarms_api.cc b/chrome/browser/extensions/api/alarms/alarms_api.cc
index bea10e3..8591f01 100644
--- a/chrome/browser/extensions/api/alarms/alarms_api.cc
+++ b/chrome/browser/extensions/api/alarms/alarms_api.cc
@@ -8,10 +8,10 @@
 #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/experimental.alarms.h"
+#include "chrome/common/extensions/api/alarms.h"
 #include "chrome/common/extensions/extension_error_utils.h"
 
-namespace alarms = extensions::api::experimental_alarms;
+namespace alarms = extensions::api::alarms;
 
 namespace extensions {
 
diff --git a/chrome/browser/extensions/api/alarms/alarms_api.h b/chrome/browser/extensions/api/alarms/alarms_api.h
index 4f906c0..eefe4b3 100644
--- a/chrome/browser/extensions/api/alarms/alarms_api.h
+++ b/chrome/browser/extensions/api/alarms/alarms_api.h
@@ -11,58 +11,48 @@
 namespace extensions {
 
 class AlarmsCreateFunction : public SyncExtensionFunction {
- public:
-  DECLARE_EXTENSION_FUNCTION_NAME("experimental.alarms.create");
-
  protected:
   virtual ~AlarmsCreateFunction() {}
 
   // ExtensionFunction:
   virtual bool RunImpl() OVERRIDE;
+  DECLARE_EXTENSION_FUNCTION_NAME("alarms.create");
 };
 
 class AlarmsGetFunction : public SyncExtensionFunction {
- public:
-  DECLARE_EXTENSION_FUNCTION_NAME("experimental.alarms.get");
-
  protected:
   virtual ~AlarmsGetFunction() {}
 
   // ExtensionFunction:
   virtual bool RunImpl() OVERRIDE;
+  DECLARE_EXTENSION_FUNCTION_NAME("alarms.get");
 };
 
 class AlarmsGetAllFunction : public SyncExtensionFunction {
- public:
-  DECLARE_EXTENSION_FUNCTION_NAME("experimental.alarms.getAll");
-
  protected:
   virtual ~AlarmsGetAllFunction() {}
 
   // ExtensionFunction:
   virtual bool RunImpl() OVERRIDE;
+  DECLARE_EXTENSION_FUNCTION_NAME("alarms.getAll");
 };
 
 class AlarmsClearFunction : public SyncExtensionFunction {
- public:
-  DECLARE_EXTENSION_FUNCTION_NAME("experimental.alarms.clear");
-
  protected:
   virtual ~AlarmsClearFunction() {}
 
   // ExtensionFunction:
   virtual bool RunImpl() OVERRIDE;
+  DECLARE_EXTENSION_FUNCTION_NAME("alarms.clear");
 };
 
 class AlarmsClearAllFunction : public SyncExtensionFunction {
- public:
-  DECLARE_EXTENSION_FUNCTION_NAME("experimental.alarms.clearAll");
-
  protected:
   virtual ~AlarmsClearAllFunction() {}
 
   // ExtensionFunction:
   virtual bool RunImpl() OVERRIDE;
+  DECLARE_EXTENSION_FUNCTION_NAME("alarms.clearAll");
 };
 
 } //  namespace extensions
diff --git a/chrome/common/extensions/api/_permission_features.json b/chrome/common/extensions/api/_permission_features.json
index 35d4080..ef72f19 100644
--- a/chrome/common/extensions/api/_permission_features.json
+++ b/chrome/common/extensions/api/_permission_features.json
@@ -3,6 +3,11 @@
 // found in the LICENSE file.
 
 {
+  "alarms": {
+    "channel": "dev",
+    "extension_types": ["extension", "packaged_app", "platform_app"],
+    "min_manifest_version": 2
+  },
   "appNotifications": {
     "channel": "stable",
     "extension_types": ["packaged_app", "hosted_app"]
diff --git a/chrome/common/extensions/api/experimental.alarms.idl b/chrome/common/extensions/api/alarms.idl
index b3fdd1a..cd61d86 100644
--- a/chrome/common/extensions/api/experimental.alarms.idl
+++ b/chrome/common/extensions/api/alarms.idl
@@ -5,7 +5,7 @@
 // File-level comment to appease parser. Eventually this will not be necessary.
 // TODO(mpcomplete): We need documentation before we can release this.
 
-namespace experimental.alarms {
+namespace alarms {
   dictionary Alarm {
     // Name of this alarm.
     DOMString name;
diff --git a/chrome/common/extensions/api/api.gyp b/chrome/common/extensions/api/api.gyp
index e5b1520..7134c98 100644
--- a/chrome/common/extensions/api/api.gyp
+++ b/chrome/common/extensions/api/api.gyp
@@ -28,7 +28,7 @@
           'windows.json',
         ],
         'idl_schema_files': [
-          'experimental.alarms.idl',
+          'alarms.idl',
           'experimental.bluetooth.idl',
           'experimental.dns.idl',
           'experimental.serial.idl',
diff --git a/chrome/common/extensions/docs/api_index.html b/chrome/common/extensions/docs/api_index.html
index 3bdfc75..8192bfb 100644
--- a/chrome/common/extensions/docs/api_index.html
+++ b/chrome/common/extensions/docs/api_index.html
@@ -221,7 +221,7 @@ so that extensions can interact with the browser.
 Here are the supported chrome.* APIs:
 </p>
 <ul>
-  <li><a href="bookmarks.html" js="">bookmarks</a></li><li><a href="browserAction.html" js="">browserAction</a></li><li><a href="browsingData.html" js="">browsingData</a></li><li><a href="contentSettings.html" js="">contentSettings</a></li><li><a href="contextMenus.html" js="">contextMenus</a></li><li><a href="cookies.html" js="">cookies</a></li><li><a href="debugger.html" js="">debugger</a></li><li><a href="extension.html" js="">extension</a></li><li><a href="fileBrowserHandler.html" js="">fileBrowserHandler</a></li><li><a href="history.html" js="">history</a></li><li><a href="i18n.html" js="">i18n</a></li><li><a href="idle.html" js="">idle</a></li><li><a href="management.html" js="">management</a></li><li><a href="omnibox.html" js="">omnibox</a></li><li><a href="pageAction.html" js="">pageAction</a></li><li><a href="pageCapture.html" js="">pageCapture</a></li><li><a href="permissions.html" js="">permissions</a></li><li><a href="privacy.html" js="">privacy</a></li><li><a href="proxy.html" js="">proxy</a></li><li><a href="storage.html" js="">storage</a></li><li><a href="tabs.html" js="">tabs</a></li><li><a href="topSites.html" js="">topSites</a></li><li><a href="tts.html" js="">tts</a></li><li><a href="ttsEngine.html" js="">ttsEngine</a></li><li><a href="types.html" js="">types</a></li><li><a href="webNavigation.html" js="">webNavigation</a></li><li><a href="webRequest.html" js="">webRequest</a></li><li><a href="webstore.html" js="">webstore</a></li><li><a href="windows.html" js="">windows</a></li>
+  <li><a href="alarms.html" js="">alarms</a></li><li><a href="bookmarks.html" js="">bookmarks</a></li><li><a href="browserAction.html" js="">browserAction</a></li><li><a href="browsingData.html" js="">browsingData</a></li><li><a href="contentSettings.html" js="">contentSettings</a></li><li><a href="contextMenus.html" js="">contextMenus</a></li><li><a href="cookies.html" js="">cookies</a></li><li><a href="debugger.html" js="">debugger</a></li><li><a href="extension.html" js="">extension</a></li><li><a href="fileBrowserHandler.html" js="">fileBrowserHandler</a></li><li><a href="history.html" js="">history</a></li><li><a href="i18n.html" js="">i18n</a></li><li><a href="idle.html" js="">idle</a></li><li><a href="management.html" js="">management</a></li><li><a href="omnibox.html" js="">omnibox</a></li><li><a href="pageAction.html" js="">pageAction</a></li><li><a href="pageCapture.html" js="">pageCapture</a></li><li><a href="permissions.html" js="">permissions</a></li><li><a href="privacy.html" js="">privacy</a></li><li><a href="proxy.html" js="">proxy</a></li><li><a href="storage.html" js="">storage</a></li><li><a href="tabs.html" js="">tabs</a></li><li><a href="topSites.html" js="">topSites</a></li><li><a href="tts.html" js="">tts</a></li><li><a href="ttsEngine.html" js="">ttsEngine</a></li><li><a href="types.html" js="">types</a></li><li><a href="webNavigation.html" js="">webNavigation</a></li><li><a href="webRequest.html" js="">webRequest</a></li><li><a href="webstore.html" js="">webstore</a></li><li><a href="windows.html" js="">windows</a></li>
 </ul>
 <h2 id="experimental">Experimental APIs</h2>
 <p>
diff --git a/chrome/common/extensions/docs/examples/api/eventPage/basic.zip b/chrome/common/extensions/docs/examples/api/eventPage/basic.zip
index c07527e..d5ea087 100644
--- a/chrome/common/extensions/docs/examples/api/eventPage/basic.zip
+++ b/chrome/common/extensions/docs/examples/api/eventPage/basic.zip
diff --git a/chrome/common/extensions/docs/examples/api/eventPage/basic/background.js b/chrome/common/extensions/docs/examples/api/eventPage/basic/background.js
index 57f051b..0bb7f4d7 100644
--- a/chrome/common/extensions/docs/examples/api/eventPage/basic/background.js
+++ b/chrome/common/extensions/docs/examples/api/eventPage/basic/background.js
@@ -58,7 +58,7 @@ chrome.experimental.keybinding.onCommand.addListener(function(command) {
 
 chrome.extension.onMessage.addListener(function(msg, _, sendResponse) {
   if (msg.setAlarm) {
-    chrome.experimental.alarms.create({delayInMinutes: 0.1});
+    chrome.alarms.create({delayInMinutes: 0.1});
   } else if (msg.delayedResponse) {
     // Note: setTimeout itself does NOT keep the page awake. We return true
     // from the onMessage event handler, which keeps the message channel open -
@@ -75,7 +75,7 @@ chrome.extension.onMessage.addListener(function(msg, _, sendResponse) {
   // of whether we called sendResponse.
 });
 
-chrome.experimental.alarms.onAlarm.addListener(function() {
+chrome.alarms.onAlarm.addListener(function() {
   alert("Time's up!");
 });
 
diff --git a/chrome/common/extensions/docs/examples/api/eventPage/basic/manifest.json b/chrome/common/extensions/docs/examples/api/eventPage/basic/manifest.json
index 03368e9..2c2ba07 100644
--- a/chrome/common/extensions/docs/examples/api/eventPage/basic/manifest.json
+++ b/chrome/common/extensions/docs/examples/api/eventPage/basic/manifest.json
@@ -3,7 +3,7 @@
   "description": "Demonstrates usage and features of the event page",
   "version": "1.0",
   "manifest_version": 2,
-  "permissions": ["tabs", "bookmarks", "experimental", "keybinding", "http://*.google.com/*"],
+  "permissions": ["alarms", "tabs", "bookmarks", "experimental", "keybinding", "http://*.google.com/*"],
   "background": {
     "scripts": ["background.js"],
     "persistent": false
diff --git a/chrome/common/extensions/docs/experimental.html b/chrome/common/extensions/docs/experimental.html
index e35df03..3644b664 100644
--- a/chrome/common/extensions/docs/experimental.html
+++ b/chrome/common/extensions/docs/experimental.html
@@ -237,7 +237,6 @@ on the following experimental APIs:
 </p>
 <ul>
   <li>
-  <a href="experimental.alarms.html">experimental.alarms</a></li><li>
   <a href="experimental.app.html">experimental.app</a></li><li>
   <a href="experimental.devtools.audits.html">experimental.devtools.audits</a></li><li>
   <a href="experimental.devtools.console.html">experimental.devtools.console</a></li><li>
diff --git a/chrome/common/extensions/docs/js/api_page_generator.js b/chrome/common/extensions/docs/js/api_page_generator.js
index 82d529c..9b18e57 100644
--- a/chrome/common/extensions/docs/js/api_page_generator.js
+++ b/chrome/common/extensions/docs/js/api_page_generator.js
@@ -20,6 +20,7 @@
 
 var API_TEMPLATE = 'template/api_template.html';
 var MODULE_SCHEMAS = [
+  '../api/alarms.json',  // autogenerated
   '../api/bookmarks.json',
   '../api/browserAction.json',
   '../api/browsingData.json',
@@ -31,7 +32,6 @@ var MODULE_SCHEMAS = [
   '../api/debugger.json',
   '../api/devtools.json',
   '../api/experimental.accessibility.json',
-  '../api/experimental.alarms.json',  // autogenerated
   '../api/experimental.app.json',
   '../api/experimental.bookmarkManager.json',
   '../api/experimental.downloads.json',
diff --git a/chrome/common/extensions/docs/samples.html b/chrome/common/extensions/docs/samples.html
index c6796a8..80c1e6a 100644
--- a/chrome/common/extensions/docs/samples.html
+++ b/chrome/common/extensions/docs/samples.html
@@ -217,7 +217,7 @@
   "4daa6becd0899a54776d9cf7f09613ed1a9f4d77": "COOKIE API TEST EXTENSION TESTING COOKIE API BACKGROUND_PAGE BROWSER_ACTION COOKIES TABS CHROME.BROWSERACTION.ONCLICKED CHROME.COOKIES.GET CHROME.COOKIES.GETALL CHROME.COOKIES.ONCHANGED CHROME.COOKIES.REMOVE CHROME.EXTENSION.GETURL CHROME.TABS.CREATE CHROME.TABS.UPDATE CHROME.WINDOWS.GET CHROME.WINDOWS.GETALL",
   "9e4fd06300ee2b3a171e1f30d1b70f8f10152c2b": "DOWNLOAD SELECTED LINKS SELECT LINKS ON A PAGE AND DOWNLOAD THEM. BROWSER_ACTION EXPERIMENTAL TABS CHROME.EXPERIMENTAL.DOWNLOADS.DOWNLOAD CHROME.TABS.EXECUTESCRIPT CHROME.TABS.QUERY CHROME.WINDOWS.GET CHROME.WINDOWS.GETCURRENT",
   "028eb5364924344029bcbe1d527f132fc72b34e5": "EMAIL THIS PAGE (BY GOOGLE) THIS EXTENSION ADDS AN EMAIL BUTTON TO THE TOOLBAR WHICH ALLOWS YOU TO EMAIL THE PAGE LINK USING YOUR DEFAULT MAIL CLIENT OR GMAIL. BACKGROUND_PAGE BROWSER_ACTION OPTIONS_PAGE TABS CHROME.BROWSERACTION.ONCLICKED CHROME.EXTENSION.CONNECT CHROME.EXTENSION.ONCONNECT CHROME.TABS.CREATE CHROME.TABS.EXECUTESCRIPT CHROME.TABS.UPDATE",
-  "26115f23aef245d6757587e3e517bbe4b3bc55fe": "EVENT PAGE EXAMPLE DEMONSTRATES USAGE AND FEATURES OF THE EVENT PAGE BACKGROUND_PAGE BOOKMARKS BROWSER_ACTION EXPERIMENTAL KEYBINDING TABS CHROME.BOOKMARKS.ONREMOVED CHROME.BROWSERACTION.ONCLICKED CHROME.BROWSERACTION.SETBADGETEXT CHROME.EXPERIMENTAL.ALARMS.CREATE CHROME.EXPERIMENTAL.ALARMS.ONALARM CHROME.EXPERIMENTAL.KEYBINDING.ONCOMMAND CHROME.EXPERIMENTAL.RUNTIME.ONBACKGROUNDPAGEUNLOADINGSOON CHROME.EXPERIMENTAL.RUNTIME.ONINSTALLED CHROME.EXPERIMENTAL.WEBREQUEST.ONREQUEST CHROME.EXTENSION.ONMESSAGE CHROME.EXTENSION.SENDMESSAGE CHROME.TABS.CREATE CHROME.TABS.EXECUTESCRIPT CHROME.TABS.QUERY CHROME.TABS.SENDMESSAGE",
+  "26115f23aef245d6757587e3e517bbe4b3bc55fe": "EVENT PAGE EXAMPLE DEMONSTRATES USAGE AND FEATURES OF THE EVENT PAGE ALARMS BACKGROUND_PAGE BOOKMARKS BROWSER_ACTION EXPERIMENTAL KEYBINDING TABS CHROME.ALARMS.CREATE CHROME.ALARMS.ONALARM CHROME.BOOKMARKS.ONREMOVED CHROME.BROWSERACTION.ONCLICKED CHROME.BROWSERACTION.SETBADGETEXT CHROME.EXPERIMENTAL.KEYBINDING.ONCOMMAND CHROME.EXPERIMENTAL.RUNTIME.ONBACKGROUNDPAGEUNLOADINGSOON CHROME.EXPERIMENTAL.RUNTIME.ONINSTALLED CHROME.EXPERIMENTAL.WEBREQUEST.ONREQUEST CHROME.EXTENSION.ONMESSAGE CHROME.EXTENSION.SENDMESSAGE CHROME.TABS.CREATE CHROME.TABS.EXECUTESCRIPT CHROME.TABS.QUERY CHROME.TABS.SENDMESSAGE",
   "763a08e9b06595d785568a8d392b95a2f3700258": "EVENT TRACKING WITH GOOGLE ANALYTICS A SAMPLE EXTENSION WHICH USES GOOGLE ANALYTICS TO TRACK USAGE. BROWSER_ACTION",
   "4efa12eaaa442b6b7c880e7a38ceeb0cff7e8b77": "FIREPHP FOR CHROME EXTENDS THE DEVELOPER TOOLS, ADDING SUPPORT FOR PARSING FIREPHP MESSAGES FROM SERVER BACKGROUND_PAGE DEVTOOLS_PAGE TABS CHROME.DEVTOOLS.NETWORK.GETHAR CHROME.DEVTOOLS.NETWORK.ONREQUESTFINISHED CHROME.TABS.EXECUTESCRIPT",
   "31d10fd5e61ca51eb59073b358d4ab5267cbf318": "FONT SETTINGS SAMPLE EXTENSION FOR FONT SETTINGS API BROWSER_ACTION EXPERIMENTAL POPUP CHROME.EXPERIMENTAL.FONTSETTINGS.GETDEFAULTFONTSIZE CHROME.EXPERIMENTAL.FONTSETTINGS.GETFONT CHROME.EXPERIMENTAL.FONTSETTINGS.GETFONTLIST CHROME.EXPERIMENTAL.FONTSETTINGS.SETDEFAULTFONTSIZE CHROME.EXPERIMENTAL.FONTSETTINGS.SETFONT",
@@ -276,6 +276,8 @@
     <strong>Filter by API:</strong>
     <span>
       <span>
+        <a href="javascript:void(0);" onclick="setFilter('chrome.alarms', this)">chrome.alarms</a><span>, </span>
+      </span><span>
         <a href="javascript:void(0);" onclick="setFilter('chrome.bookmarks', this)">chrome.bookmarks</a><span>, </span>
       </span><span>
         <a href="javascript:void(0);" onclick="setFilter('chrome.browserAction', this)">chrome.browserAction</a><span>, </span>
@@ -1356,6 +1358,8 @@
   </h2>
   <p class="metadata features">Uses
     <span>
+      <strong>alarms</strong><span>, </span>
+    </span><span>
       <strong>background_page</strong><span>, </span>
     </span><span>
       <strong>bookmarks</strong><span>, </span>
@@ -1374,16 +1378,16 @@
   <div class="apicalls"><strong>Calls:</strong>
     <ul>
       <li>
+        <code><a href="alarms.html#method-create">chrome.alarms.create</a></code>
+      </li><li>
+        <code><a href="alarms.html#event-onAlarm">chrome.alarms.onAlarm</a></code>
+      </li><li>
         <code><a href="bookmarks.html#event-onRemoved">chrome.bookmarks.onRemoved</a></code>
       </li><li>
         <code><a href="browserAction.html#event-onClicked">chrome.browserAction.onClicked</a></code>
       </li><li>
         <code><a href="browserAction.html#method-setBadgeText">chrome.browserAction.setBadgeText</a></code>
       </li><li>
-        <code><a href="experimental.alarms.html#method-create">chrome.experimental.alarms.create</a></code>
-      </li><li>
-        <code><a href="experimental.alarms.html#event-onAlarm">chrome.experimental.alarms.onAlarm</a></code>
-      </li><li>
         <code><a href="experimental.keybinding.html#event-onCommand">chrome.experimental.keybinding.onCommand</a></code>
       </li><li>
         <code><a href="experimental.runtime.html#event-onBackgroundPageUnloadingSoon">chrome.experimental.runtime.onBackgroundPageUnloadingSoon</a></code>
diff --git a/chrome/common/extensions/docs/samples.json b/chrome/common/extensions/docs/samples.json
index 08b5886..2bf3c22 100644
--- a/chrome/common/extensions/docs/samples.json
+++ b/chrome/common/extensions/docs/samples.json
@@ -1,5 +1,11 @@
 {
   "api": {
+    "chrome.alarms.clear": "alarms.html#method-clear",
+    "chrome.alarms.clearAll": "alarms.html#method-clearAll",
+    "chrome.alarms.create": "alarms.html#method-create",
+    "chrome.alarms.get": "alarms.html#method-get",
+    "chrome.alarms.getAll": "alarms.html#method-getAll",
+    "chrome.alarms.onAlarm": "alarms.html#event-onAlarm",
     "chrome.bookmarks.create": "bookmarks.html#method-create",
     "chrome.bookmarks.get": "bookmarks.html#method-get",
     "chrome.bookmarks.getChildren": "bookmarks.html#method-getChildren",
@@ -87,12 +93,6 @@
     "chrome.devtools.panels.ExtensionSidebarPane.setPage": "devtools.panels.html#method-ExtensionSidebarPane-setPage",
     "chrome.devtools.panels.create": "devtools.panels.html#method-create",
     "chrome.devtools.panels.setOpenResourceHandler": "devtools.panels.html#method-setOpenResourceHandler",
-    "chrome.experimental.alarms.clear": "experimental.alarms.html#method-clear",
-    "chrome.experimental.alarms.clearAll": "experimental.alarms.html#method-clearAll",
-    "chrome.experimental.alarms.create": "experimental.alarms.html#method-create",
-    "chrome.experimental.alarms.get": "experimental.alarms.html#method-get",
-    "chrome.experimental.alarms.getAll": "experimental.alarms.html#method-getAll",
-    "chrome.experimental.alarms.onAlarm": "experimental.alarms.html#event-onAlarm",
     "chrome.experimental.app.clearAllNotifications": "experimental.app.html#method-clearAllNotifications",
     "chrome.experimental.app.notify": "experimental.app.html#method-notify",
     "chrome.experimental.bluetooth.connect": "experimental.bluetooth.html#method-connect",
@@ -1044,11 +1044,11 @@
     },
     {
       "api_calls": [
+        "chrome.alarms.create",
+        "chrome.alarms.onAlarm",
         "chrome.bookmarks.onRemoved",
         "chrome.browserAction.onClicked",
         "chrome.browserAction.setBadgeText",
-        "chrome.experimental.alarms.create",
-        "chrome.experimental.alarms.onAlarm",
         "chrome.experimental.keybinding.onCommand",
         "chrome.experimental.runtime.onBackgroundPageUnloadingSoon",
         "chrome.experimental.runtime.onInstalled",
@@ -1063,6 +1063,7 @@
       "crx_path": null,
       "description": "Demonstrates usage and features of the event page",
       "features": [
+        "alarms",
         "background_page",
         "bookmarks",
         "browser_action",
@@ -1078,13 +1079,13 @@
       "protocols": [
         "http://"
       ],
-      "search_string": "EVENT PAGE EXAMPLE DEMONSTRATES USAGE AND FEATURES OF THE EVENT PAGE BACKGROUND_PAGE BOOKMARKS BROWSER_ACTION EXPERIMENTAL KEYBINDING TABS CHROME.BOOKMARKS.ONREMOVED CHROME.BROWSERACTION.ONCLICKED CHROME.BROWSERACTION.SETBADGETEXT CHROME.EXPERIMENTAL.ALARMS.CREATE CHROME.EXPERIMENTAL.ALARMS.ONALARM CHROME.EXPERIMENTAL.KEYBINDING.ONCOMMAND CHROME.EXPERIMENTAL.RUNTIME.ONBACKGROUNDPAGEUNLOADINGSOON CHROME.EXPERIMENTAL.RUNTIME.ONINSTALLED CHROME.EXPERIMENTAL.WEBREQUEST.ONREQUEST CHROME.EXTENSION.ONMESSAGE CHROME.EXTENSION.SENDMESSAGE CHROME.TABS.CREATE CHROME.TABS.EXECUTESCRIPT CHROME.TABS.QUERY CHROME.TABS.SENDMESSAGE",
+      "search_string": "EVENT PAGE EXAMPLE DEMONSTRATES USAGE AND FEATURES OF THE EVENT PAGE ALARMS BACKGROUND_PAGE BOOKMARKS BROWSER_ACTION EXPERIMENTAL KEYBINDING TABS CHROME.ALARMS.CREATE CHROME.ALARMS.ONALARM CHROME.BOOKMARKS.ONREMOVED CHROME.BROWSERACTION.ONCLICKED CHROME.BROWSERACTION.SETBADGETEXT CHROME.EXPERIMENTAL.KEYBINDING.ONCOMMAND CHROME.EXPERIMENTAL.RUNTIME.ONBACKGROUNDPAGEUNLOADINGSOON CHROME.EXPERIMENTAL.RUNTIME.ONINSTALLED CHROME.EXPERIMENTAL.WEBREQUEST.ONREQUEST CHROME.EXTENSION.ONMESSAGE CHROME.EXTENSION.SENDMESSAGE CHROME.TABS.CREATE CHROME.TABS.EXECUTESCRIPT CHROME.TABS.QUERY CHROME.TABS.SENDMESSAGE",
       "source_files": [
         "background.js",
         "content.js",
         "manifest.json"
       ],
-      "source_hash": "e9b2ca00aad14c452e444f5972f28124ea67168a",
+      "source_hash": "67edee025b8525206415cb3106471e5d5ba06baf",
       "zip_path": "examples/api/eventPage/basic.zip"
     },
     {
diff --git a/chrome/common/extensions/extension_permission_set.cc b/chrome/common/extensions/extension_permission_set.cc
index b34a79a..cf4c1e0 100644
--- a/chrome/common/extensions/extension_permission_set.cc
+++ b/chrome/common/extensions/extension_permission_set.cc
@@ -205,6 +205,9 @@ void ExtensionAPIPermission::RegisterAllPermissions(
 
   // Register extension permissions.
   info->RegisterPermission(
+      kAlarms, "alarms", 0,
+      ExtensionPermissionMessage::kNone, kFlagNone);
+  info->RegisterPermission(
       kBookmark, "bookmarks", IDS_EXTENSION_PROMPT_WARNING_BOOKMARKS,
       ExtensionPermissionMessage::kBookmarks, kFlagNone);
   info->RegisterPermission(
diff --git a/chrome/common/extensions/extension_permission_set.h b/chrome/common/extensions/extension_permission_set.h
index 75c4370..1e1ac6b 100644
--- a/chrome/common/extensions/extension_permission_set.h
+++ b/chrome/common/extensions/extension_permission_set.h
@@ -95,6 +95,7 @@ class ExtensionAPIPermission {
     kUnknown = -1,
 
     // Real permissions.
+    kAlarms,
     kAppNotifications,
     kBackground,
     kBookmark,
diff --git a/chrome/common/extensions/extension_permission_set_unittest.cc b/chrome/common/extensions/extension_permission_set_unittest.cc
index 026858f..e18a266 100644
--- a/chrome/common/extensions/extension_permission_set_unittest.cc
+++ b/chrome/common/extensions/extension_permission_set_unittest.cc
@@ -558,6 +558,7 @@ TEST(ExtensionPermissionsTest, PermissionMessages) {
 
   // These are considered "nuisance" or "trivial" permissions that don't need
   // a prompt.
+  skip.insert(ExtensionAPIPermission::kAlarms);
   skip.insert(ExtensionAPIPermission::kAppNotifications);
   skip.insert(ExtensionAPIPermission::kBrowsingData);
   skip.insert(ExtensionAPIPermission::kContextMenus);