Move contentSettings extension API out of experimental

BUG=71067
TEST=none

Review URL: http://codereview.chromium.org/8071025

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

27 files changed, 50 insertions, 799 deletions

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 60bcbd5..e64f3dd 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -3793,6 +3793,9 @@ are declared in build/common.gypi.
       <message name="IDS_EXTENSION_PROMPT_WARNING_TTS_ENGINE" desc="Permission string for access to clipboard.">
         Any text spoken using synthesized speech
       </message>
+      <message name="IDS_EXTENSION_PROMPT_WARNING_CONTENT_SETTINGS" desc="Permission string for access to content settings.">
+        Settings that specify whether websites can use features such as cookies, JavaScript, and plug-ins
+      </message>
 
       <!-- Extension/App error messages -->
       <message name="IDS_EXTENSION_CANT_GET_ABSOLUTE_PATH" desc="Warning displayed in pack dialog when the absolute path to the extension directory can not be found.">
diff --git a/chrome/browser/extensions/extension_content_settings_api.h b/chrome/browser/extensions/extension_content_settings_api.h
index 0330e5d..6721d67 100644
--- a/chrome/browser/extensions/extension_content_settings_api.h
+++ b/chrome/browser/extensions/extension_content_settings_api.h
@@ -17,29 +17,25 @@ class PluginGroup;
 class ClearContentSettingsFunction : public SyncExtensionFunction {
  public:
   virtual bool RunImpl();
-  DECLARE_EXTENSION_FUNCTION_NAME(
-      "experimental.contentSettings.clear")
+  DECLARE_EXTENSION_FUNCTION_NAME("contentSettings.clear")
 };
 
 class GetContentSettingFunction : public SyncExtensionFunction {
  public:
   virtual bool RunImpl();
-  DECLARE_EXTENSION_FUNCTION_NAME(
-      "experimental.contentSettings.get")
+  DECLARE_EXTENSION_FUNCTION_NAME("contentSettings.get")
 };
 
 class SetContentSettingFunction : public SyncExtensionFunction {
  public:
   virtual bool RunImpl();
-  DECLARE_EXTENSION_FUNCTION_NAME(
-      "experimental.contentSettings.set")
+  DECLARE_EXTENSION_FUNCTION_NAME("contentSettings.set")
 };
 
 class GetResourceIdentifiersFunction : public AsyncExtensionFunction {
  public:
   virtual bool RunImpl();
-  DECLARE_EXTENSION_FUNCTION_NAME(
-      "experimental.contentSettings.getResourceIdentifiers")
+  DECLARE_EXTENSION_FUNCTION_NAME("contentSettings.getResourceIdentifiers")
 
  private:
   FRIEND_TEST_ALL_PREFIXES(ExtensionApiTest,
diff --git a/chrome/common/extensions/api/extension_api.json b/chrome/common/extensions/api/extension_api.json
index 675b6f2..9c2f05b 100644
--- a/chrome/common/extensions/api/extension_api.json
+++ b/chrome/common/extensions/api/extension_api.json
@@ -8160,7 +8160,7 @@
     ]
   },
   {
-    "namespace": "experimental.contentSettings",
+    "namespace": "contentSettings",
     "types": [
       {
         "id": "ResourceIdentifier",
diff --git a/chrome/common/extensions/docs/api_index.html b/chrome/common/extensions/docs/api_index.html
index 25f43f8..2c36a53 100644
--- a/chrome/common/extensions/docs/api_index.html
+++ b/chrome/common/extensions/docs/api_index.html
@@ -341,7 +341,7 @@ 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="contextMenus.html" js="">contextMenus</a></li><li><a href="cookies.html" js="">cookies</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="proxy.html" js="">proxy</a></li><li><a href="tabs.html" js="">tabs</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="windows.html" js="">windows</a></li>
+  <li><a href="bookmarks.html" js="">bookmarks</a></li><li><a href="browserAction.html" js="">browserAction</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="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="proxy.html" js="">proxy</a></li><li><a href="tabs.html" js="">tabs</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="windows.html" js="">windows</a></li>
 </ul>
 
 <h2 id="experimental">Experimental APIs</h2>
diff --git a/chrome/common/extensions/docs/experimental.contentSettings.html b/chrome/common/extensions/docs/contentSettings.html
index 42ac6128..213a345 100644
--- a/chrome/common/extensions/docs/experimental.contentSettings.html
+++ b/chrome/common/extensions/docs/contentSettings.html
@@ -16,7 +16,7 @@
     <script type="text/javascript" src="js/api_page_generator.js"></script>
     <script type="text/javascript" src="js/bootstrap.js"></script>
     <script type="text/javascript" src="js/sidebar.js"></script>
-  <title>chrome.experimental.contentSettings - Google Chrome Extensions - Google Code</title></head>
+  <title>chrome.contentSettings - Google Chrome Extensions - Google Code</title></head>
   <body>  <div id="gc-container" class="labs">
       <div id="devModeWarning">
         You are viewing extension docs in chrome via the 'file:' scheme: are you expecting to see local changes when you refresh? You'll need run chrome with --allow-file-access-from-files.
@@ -250,7 +250,7 @@
 
     <div class="g-unit" id="gc-pagecontent">
       <div id="pageTitle">
-        <h1 class="page_title">chrome.experimental.contentSettings</h1>
+        <h1 class="page_title">chrome.contentSettings</h1>
       </div>
         <!-- TABLE OF CONTENTS -->
         <div id="toc">
@@ -265,7 +265,7 @@
               </ol>
             </li>
               <li>
-                <a href="#apiReference">API reference: chrome.experimental.contentSettings</a>
+                <a href="#apiReference">API reference: chrome.contentSettings</a>
                 <ol>
                   <li>
                     <a href="#properties">Properties</a>
@@ -318,7 +318,7 @@
         <!-- /TABLE OF CONTENTS -->
 
         <!-- Standard content lead-in for experimental API pages -->
-        <p id="classSummary">
+        <p id="classSummary" style="display: none; ">
           For information on how to use experimental APIs, see the <a href="experimental.html">chrome.experimental.* APIs</a> page.
         </p>
 
@@ -328,7 +328,7 @@
         <!-- API PAGE -->
         <div class="apiPage">
         <a name="apiReference"></a>
-        <h2>API reference: chrome.experimental.contentSettings</h2>
+        <h2>API reference: chrome.contentSettings</h2>
 
           <!-- PROPERTIES -->
           <div class="apiGroup">
@@ -340,7 +340,7 @@
               <h4>cookies</h4>
               <div class="summary">
                 <!-- Note: intentionally longer 80 columns -->
-                <span>chrome.experimental.contentSettings.</span><span>cookies</span>
+                <span>chrome.contentSettings.</span><span>cookies</span>
               </div>
               <div>
           <dt>
@@ -354,7 +354,7 @@
                     <span class="enum" style="display: none; ">enumerated</span>
                     <span id="typeTemplate">
                       <span>
-                        <a href="experimental.contentSettings.html#type-ContentSetting">ContentSetting</a>
+                        <a href="contentSettings.html#type-ContentSetting">ContentSetting</a>
                       </span>
                       <span style="display: none; ">
                         <span>
@@ -414,7 +414,7 @@
               <h4>images</h4>
               <div class="summary">
                 <!-- Note: intentionally longer 80 columns -->
-                <span>chrome.experimental.contentSettings.</span><span>images</span>
+                <span>chrome.contentSettings.</span><span>images</span>
               </div>
               <div>
           <dt>
@@ -428,7 +428,7 @@
                     <span class="enum" style="display: none; ">enumerated</span>
                     <span id="typeTemplate">
                       <span>
-                        <a href="experimental.contentSettings.html#type-ContentSetting">ContentSetting</a>
+                        <a href="contentSettings.html#type-ContentSetting">ContentSetting</a>
                       </span>
                       <span style="display: none; ">
                         <span>
@@ -488,7 +488,7 @@
               <h4>javascript</h4>
               <div class="summary">
                 <!-- Note: intentionally longer 80 columns -->
-                <span>chrome.experimental.contentSettings.</span><span>javascript</span>
+                <span>chrome.contentSettings.</span><span>javascript</span>
               </div>
               <div>
           <dt>
@@ -502,7 +502,7 @@
                     <span class="enum" style="display: none; ">enumerated</span>
                     <span id="typeTemplate">
                       <span>
-                        <a href="experimental.contentSettings.html#type-ContentSetting">ContentSetting</a>
+                        <a href="contentSettings.html#type-ContentSetting">ContentSetting</a>
                       </span>
                       <span style="display: none; ">
                         <span>
@@ -562,7 +562,7 @@
               <h4>plugins</h4>
               <div class="summary">
                 <!-- Note: intentionally longer 80 columns -->
-                <span>chrome.experimental.contentSettings.</span><span>plugins</span>
+                <span>chrome.contentSettings.</span><span>plugins</span>
               </div>
               <div>
           <dt>
@@ -576,7 +576,7 @@
                     <span class="enum" style="display: none; ">enumerated</span>
                     <span id="typeTemplate">
                       <span>
-                        <a href="experimental.contentSettings.html#type-ContentSetting">ContentSetting</a>
+                        <a href="contentSettings.html#type-ContentSetting">ContentSetting</a>
                       </span>
                       <span style="display: none; ">
                         <span>
@@ -636,7 +636,7 @@
               <h4>popups</h4>
               <div class="summary">
                 <!-- Note: intentionally longer 80 columns -->
-                <span>chrome.experimental.contentSettings.</span><span>popups</span>
+                <span>chrome.contentSettings.</span><span>popups</span>
               </div>
               <div>
           <dt>
@@ -650,7 +650,7 @@
                     <span class="enum" style="display: none; ">enumerated</span>
                     <span id="typeTemplate">
                       <span>
-                        <a href="experimental.contentSettings.html#type-ContentSetting">ContentSetting</a>
+                        <a href="contentSettings.html#type-ContentSetting">ContentSetting</a>
                       </span>
                       <span style="display: none; ">
                         <span>
@@ -710,7 +710,7 @@
               <h4>notifications</h4>
               <div class="summary">
                 <!-- Note: intentionally longer 80 columns -->
-                <span>chrome.experimental.contentSettings.</span><span>notifications</span>
+                <span>chrome.contentSettings.</span><span>notifications</span>
               </div>
               <div>
           <dt>
@@ -724,7 +724,7 @@
                     <span class="enum" style="display: none; ">enumerated</span>
                     <span id="typeTemplate">
                       <span>
-                        <a href="experimental.contentSettings.html#type-ContentSetting">ContentSetting</a>
+                        <a href="contentSettings.html#type-ContentSetting">ContentSetting</a>
                       </span>
                       <span style="display: none; ">
                         <span>
@@ -1670,7 +1670,7 @@
                     <span class="enum" style="display: none; ">enumerated</span>
                     <span id="typeTemplate">
                       <span>
-                        <a href="experimental.contentSettings.html#type-ResourceIdentifier">ResourceIdentifier</a>
+                        <a href="contentSettings.html#type-ResourceIdentifier">ResourceIdentifier</a>
                       </span>
                       <span style="display: none; ">
                         <span>
@@ -2195,7 +2195,7 @@
                         <span>
                           array of <span><span>
                       <span>
-                        <a href="experimental.contentSettings.html#type-ResourceIdentifier">ResourceIdentifier</a>
+                        <a href="contentSettings.html#type-ResourceIdentifier">ResourceIdentifier</a>
                       </span>
                       <span style="display: none; ">
                         <span>
@@ -2482,7 +2482,7 @@
                     <span class="enum" style="display: none; ">enumerated</span>
                     <span id="typeTemplate">
                       <span>
-                        <a href="experimental.contentSettings.html#type-ResourceIdentifier">ResourceIdentifier</a>
+                        <a href="contentSettings.html#type-ResourceIdentifier">ResourceIdentifier</a>
                       </span>
                       <span style="display: none; ">
                         <span>
diff --git a/chrome/common/extensions/docs/examples/api/contentSettings.zip b/chrome/common/extensions/docs/examples/api/contentSettings.zip
index d174d96..d6b9d5a 100644
--- a/chrome/common/extensions/docs/examples/api/contentSettings.zip
+++ b/chrome/common/extensions/docs/examples/api/contentSettings.zip
diff --git a/chrome/common/extensions/docs/examples/api/contentSettings/manifest.json b/chrome/common/extensions/docs/examples/api/contentSettings/manifest.json
index 432dbe8..94d04ef 100644
--- a/chrome/common/extensions/docs/examples/api/contentSettings/manifest.json
+++ b/chrome/common/extensions/docs/examples/api/contentSettings/manifest.json
@@ -2,7 +2,7 @@
   "name" : "Content settings",

   "version" : "0.1",

   "description" : "Shows the content settings for the current site.",

-  "permissions": [ "experimental", "contentSettings", "tabs" ],

+  "permissions": [ "contentSettings", "tabs" ],

   "browser_action": {

      "default_icon": "contentSettings.png",

      "popup":        "popup.html"

diff --git a/chrome/common/extensions/docs/examples/api/contentSettings/popup.html b/chrome/common/extensions/docs/examples/api/contentSettings/popup.html
index 4d8541af..da68f3e 100644
--- a/chrome/common/extensions/docs/examples/api/contentSettings/popup.html
+++ b/chrome/common/extensions/docs/examples/api/contentSettings/popup.html
@@ -12,7 +12,7 @@ function init() {
     var types = ["cookies", "images", "javascript", "plugins", "popups",
                  "notifications"];
     types.forEach(function(type) {
-      chrome.experimental.contentSettings[type].get({
+      chrome.contentSettings[type].get({
             'primaryUrl': url,
             'incognito': incognito
           },
@@ -28,7 +28,7 @@ function settingChanged(element) {
   var setting = element.value;
   var pattern = /^file:/.test(url) ? url : url.replace(/\/[^\/]*?$/, '/*');
   console.log(type+" setting for "+pattern+": "+setting);
-  chrome.experimental.contentSettings[type].set({
+  chrome.contentSettings[type].set({
         'primaryPattern': pattern,
         'setting': setting,
         'scope': (incognito ? 'incognito_session_only' : 'regular')
diff --git a/chrome/common/extensions/docs/examples/api/devtools/network/chrome-firephp.zip b/chrome/common/extensions/docs/examples/api/devtools/network/chrome-firephp.zip
index b3965d6..ab4d359 100644
--- a/chrome/common/extensions/docs/examples/api/devtools/network/chrome-firephp.zip
+++ b/chrome/common/extensions/docs/examples/api/devtools/network/chrome-firephp.zip
diff --git a/chrome/common/extensions/docs/examples/api/permissions/extension-questions.zip b/chrome/common/extensions/docs/examples/api/permissions/extension-questions.zip
index c926893..4d45615 100644
--- a/chrome/common/extensions/docs/examples/api/permissions/extension-questions.zip
+++ b/chrome/common/extensions/docs/examples/api/permissions/extension-questions.zip
diff --git a/chrome/common/extensions/docs/examples/api/webNavigation/basic.zip b/chrome/common/extensions/docs/examples/api/webNavigation/basic.zip
index 797ca81..84422b5 100644
--- a/chrome/common/extensions/docs/examples/api/webNavigation/basic.zip
+++ b/chrome/common/extensions/docs/examples/api/webNavigation/basic.zip
diff --git a/chrome/common/extensions/docs/examples/extensions/imageinfo.zip b/chrome/common/extensions/docs/examples/extensions/imageinfo.zip
index ed9ec00..2dc2ee7 100644
--- a/chrome/common/extensions/docs/examples/extensions/imageinfo.zip
+++ b/chrome/common/extensions/docs/examples/extensions/imageinfo.zip
diff --git a/chrome/common/extensions/docs/examples/extensions/speak_selection.zip b/chrome/common/extensions/docs/examples/extensions/speak_selection.zip
index 3fc4da7..64436d5 100644
--- a/chrome/common/extensions/docs/examples/extensions/speak_selection.zip
+++ b/chrome/common/extensions/docs/examples/extensions/speak_selection.zip
diff --git a/chrome/common/extensions/docs/examples/extensions/talking_alarm_clock.zip b/chrome/common/extensions/docs/examples/extensions/talking_alarm_clock.zip
index 37325f1..cd476dc 100644
--- a/chrome/common/extensions/docs/examples/extensions/talking_alarm_clock.zip
+++ b/chrome/common/extensions/docs/examples/extensions/talking_alarm_clock.zip
diff --git a/chrome/common/extensions/docs/experimental.contentSettings.global.html b/chrome/common/extensions/docs/experimental.contentSettings.global.html
deleted file mode 100644
index c79e32e..0000000
--- a/chrome/common/extensions/docs/experimental.contentSettings.global.html
+++ /dev/null
@@ -1,746 +0,0 @@
-<!DOCTYPE html><!-- This page is a placeholder for generated extensions api doc. Note:
-    1) The <head> information in this page is significant, should be uniform
-       across api docs and should be edited only with knowledge of the
-       templating mechanism.
-    3) All <body>.innerHTML is genereated as an rendering step. If viewed in a
-       browser, it will be re-generated from the template, json schema and
-       authored overview content.
-    4) The <body>.innerHTML is also generated by an offline step so that this
-       page may easily be indexed by search engines.
---><html xmlns="http://www.w3.org/1999/xhtml"><head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <link href="css/ApiRefStyles.css" rel="stylesheet" type="text/css">
-    <link href="css/print.css" rel="stylesheet" type="text/css" media="print">
-    <script type="text/javascript" src="../../../third_party/jstemplate/jstemplate_compiled.js">
-    </script>
-    <script type="text/javascript" src="js/api_page_generator.js"></script>
-    <script type="text/javascript" src="js/bootstrap.js"></script>
-    <script type="text/javascript" src="js/sidebar.js"></script>
-  <title>chrome.experimental.contentSettings.global - Google Chrome Extensions - Google Code</title></head>
-  <body>  <div id="gc-container" class="labs">
-      <div id="devModeWarning">
-        You are viewing extension docs in chrome via the 'file:' scheme: are you expecting to see local changes when you refresh? You'll need run chrome with --allow-file-access-from-files.
-      </div>
-      <!-- SUBTEMPLATES: DO NOT MOVE FROM THIS LOCATION -->
-      <!-- In particular, sub-templates that recurse, must be used by allowing
-           jstemplate to make a copy of the template in this section which
-           are not operated on by way of the jsskip="true" -->
-      <div style="display:none">
-
-        <!-- VALUE -->
-        <div id="valueTemplate">
-          <dt>
-            <var>paramName</var>
-              <em>
-
-                <!-- TYPE -->
-                <div style="display:inline">
-                  (
-                    <span class="optional">optional</span>
-                    <span class="enum">enumerated</span>
-                    <span id="typeTemplate">
-                      <span>
-                        <a> Type</a>
-                      </span>
-                      <span>
-                        <span>
-                          array of <span><span></span></span>
-                        </span>
-                        <span>paramType</span>
-                        <span></span>
-                      </span>
-                    </span>
-                  )
-                </div>
-
-              </em>
-          </dt>
-          <dd class="todo">
-            Undocumented.
-          </dd>
-          <dd>
-            Description of this parameter from the json schema.
-          </dd>
-          <dd>
-            This parameter was added in version
-            <b><span></span></b>.
-            You must omit this parameter in earlier versions,
-            and you may omit it in any version.  If you require this
-            parameter, the manifest key
-            <a href="manifest.html#minimum_chrome_version">minimum_chrome_version</a>
-            can ensure that your extension won't be run in an earlier browser version.
-          </dd>
-
-          <!-- OBJECT PROPERTIES -->
-          <dd>
-            <dl>
-              <div>
-                <div>
-                </div>
-              </div>
-            </dl>
-          </dd>
-
-          <!-- OBJECT METHODS -->
-          <dd>
-            <div></div>
-          </dd>
-
-          <!-- OBJECT EVENT FIELDS -->
-          <dd>
-            <div></div>
-          </dd>
-
-          <!-- FUNCTION PARAMETERS -->
-          <dd>
-            <div></div>
-          </dd>
-
-        </div> <!-- /VALUE -->
-
-        <div id="functionParametersTemplate">
-          <h5>Parameters</h5>
-          <dl>
-            <div>
-              <div>
-              </div>
-            </div>
-          </dl>
-        </div>
-      </div> <!-- /SUBTEMPLATES -->
-
-  <a id="top"></a>
-    <div id="skipto">
-      <a href="#gc-pagecontent">Skip to page content</a>
-      <a href="#gc-toc">Skip to main navigation</a>
-    </div>
-    <!-- API HEADER -->
-    <table id="header" width="100%" cellspacing="0" border="0">
-      <tbody><tr>
-        <td valign="middle"><a href="http://code.google.com/"><img src="images/code_labs_logo.gif" height="43" width="161" alt="Google Code Labs" style="border:0; margin:0;"></a></td>
-        <td valign="middle" width="100%" style="padding-left:0.6em;">
-          <form action="http://www.google.com/cse" id="cse" style="margin-top:0.5em">
-            <div id="gsc-search-box">
-              <input type="hidden" name="cx" value="002967670403910741006:61_cvzfqtno">
-              <input type="hidden" name="ie" value="UTF-8">
-              <input type="text" name="q" value="" size="55">
-              <input class="gsc-search-button" type="submit" name="sa" value="Search">
-              <br>
-              <span class="greytext">e.g. "page action" or "tabs"</span>
-            </div>
-          </form>
-
-          <script type="text/javascript" src="http://www.google.com/jsapi"></script>
-          <script type="text/javascript">google.load("elements", "1", {packages: "transliteration"});</script>
-          <script type="text/javascript" src="http://www.google.com/coop/cse/t13n?form=cse&amp;t13n_langs=en"></script>
-          <script type="text/javascript" src="http://www.google.com/coop/cse/brand?form=cse&amp;lang=en"></script>
-        </td>
-      </tr>
-    </tbody></table>
-
-    <div id="codesiteContent" class="">
-
-      <a id="gc-topnav-anchor"></a>
-      <div id="gc-topnav">
-        <h1>Google Chrome Extensions (<a href="http://code.google.com/labs/">Labs</a>)</h1>
-        <ul id="home" class="gc-topnav-tabs">
-          <li id="home_link">
-            <a href="index.html" title="Google Chrome Extensions home page">Home</a>
-          </li>
-          <li id="docs_link">
-            <a href="docs.html" title="Official Google Chrome Extensions documentation">Docs</a>
-          </li>
-          <li id="faq_link">
-            <a href="faq.html" title="Answers to frequently asked questions about Google Chrome Extensions">FAQ</a>
-          </li>
-          <li id="samples_link">
-            <a href="samples.html" title="Sample extensions (with source code)">Samples</a>
-          </li>
-          <li id="group_link">
-            <a href="http://groups.google.com/a/chromium.org/group/chromium-extensions" title="Google Chrome Extensions developer forum">Group</a>
-          </li>
-        </ul>
-      </div> <!-- end gc-topnav -->
-
-    <div class="g-section g-tpl-170">
-      <!-- SIDENAV -->
-      <div class="g-unit g-first" id="gc-toc">
-        <ul>
-          <li><a href="getstarted.html">Getting Started</a></li>
-          <li><a href="overview.html">Overview</a></li>
-          <li><a href="whats_new.html">What's New?</a></li>
-          <li><h2><a href="devguide.html">Developer's Guide</a></h2>
-            <ul>
-              <li>Browser UI
-                <ul>
-                  <li><a href="browserAction.html">Browser Actions</a></li>
-                  <li><a href="contextMenus.html">Context Menus</a></li>
-                  <li><a href="notifications.html">Desktop Notifications</a></li>
-                  <li><a href="omnibox.html">Omnibox</a></li>
-                  <li><a href="options.html">Options Pages</a></li>
-                  <li><a href="override.html">Override Pages</a></li>
-                  <li><a href="pageAction.html">Page Actions</a></li>
-                </ul>
-              </li>
-              <li>Browser Interaction
-                <ul>
-                  <li><a href="bookmarks.html">Bookmarks</a></li>
-                  <li><a href="cookies.html">Cookies</a></li>
-                  <li><a href="events.html">Events</a></li>
-                  <li><a href="history.html">History</a></li>
-                  <li><a href="management.html">Management</a></li>
-                  <li><a href="tabs.html">Tabs</a></li>
-                  <li><a href="windows.html">Windows</a></li>
-                </ul>
-              </li>
-              <li>Implementation
-                <ul>
-                  <li><a href="a11y.html">Accessibility</a></li>
-                  <li><a href="background_pages.html">Background Pages</a></li>
-                  <li><a href="content_scripts.html">Content Scripts</a></li>
-                  <li><a href="xhr.html">Cross-Origin XHR</a></li>
-                  <li><a href="idle.html">Idle</a></li>
-                  <li><a href="i18n.html">Internationalization</a></li>
-                  <li><a href="messaging.html">Message Passing</a></li>
-                  <li><a href="npapi.html">NPAPI Plugins</a></li>
-                </ul>
-              </li>
-              <li>Finishing
-                <ul>
-                  <li><a href="hosting.html">Hosting</a></li>
-                  <li><a href="external_extensions.html">Other Deployment Options</a></li>
-                </ul>
-              </li>
-            </ul>
-          </li>
-          <li><h2><a href="apps.html">Packaged Apps</a></h2></li>
-          <li><h2><a href="tutorials.html">Tutorials</a></h2>
-            <ul>
-              <li><a href="tut_debugging.html">Debugging</a></li>
-              <li><a href="tut_analytics.html">Google Analytics</a></li>
-              <li><a href="tut_oauth.html">OAuth</a></li>
-            </ul>
-          </li>
-          <li><h2>Reference</h2>
-            <ul>
-              <li>Formats
-                <ul>
-                  <li><a href="manifest.html">Manifest Files</a></li>
-                  <li><a href="match_patterns.html">Match Patterns</a></li>
-                </ul>
-              </li>
-              <li><a href="permission_warnings.html">Permission Warnings</a></li>
-              <li><a href="api_index.html">chrome.* APIs</a></li>
-              <li><a href="api_other.html">Other APIs</a></li>
-            </ul>
-          </li>
-          <li><h2><a href="samples.html">Samples</a></h2></li>
-          <div class="line"> </div>
-          <li><h2>More</h2>
-            <ul>
-              <li><a href="http://code.google.com/chrome/webstore/docs/index.html">Chrome Web Store</a></li>
-              <li><a href="http://code.google.com/chrome/apps/docs/developers_guide.html">Hosted Apps</a></li>
-              <li><a href="themes.html">Themes</a></li>
-            </ul>
-          </li>
-        </ul>
-      </div>
-      <script>
-        initToggles();
-      </script>
-
-    <div class="g-unit" id="gc-pagecontent">
-      <div id="pageTitle">
-        <h1 class="page_title">chrome.experimental.contentSettings.global</h1>
-      </div>
-        <!-- TABLE OF CONTENTS -->
-        <div id="toc">
-          <h2>Contents</h2>
-          <ol>
-            <li style="display: none; ">
-              <a>h2Name</a>
-              <ol>
-                <li>
-                  <a>h3Name</a>
-                </li>
-              </ol>
-            </li>
-              <li>
-                <a href="#apiReference">API reference: chrome.experimental.contentSettings.global</a>
-                <ol>
-                  <li>
-                    <a href="#properties">Properties</a>
-                    <ol>
-                      <li>
-                        <a href="#property-thirdPartyCookiesAllowed">thirdPartyCookiesAllowed</a>
-                      </li><li>
-                        <a href="#property-referrersEnabled">referrersEnabled</a>
-                      </li><li>
-                        <a href="#property-hyperlinkAuditingEnabled">hyperlinkAuditingEnabled</a>
-                      </li>
-                    </ol>
-                  </li>
-                  <li style="display: none; ">
-                    <a>Methods</a>
-                    <ol>
-                      <li>
-                        <a href="#method-anchor">methodName</a>
-                      </li>
-                    </ol>
-                  </li>
-                  <li style="display: none; ">
-                    <a>Events</a>
-                    <ol>
-                      <li>
-                        <a href="#event-anchor">eventName</a>
-                      </li>
-                    </ol>
-                  </li>
-                  <li style="display: none; ">
-                    <a href="#types">Types</a>
-                    <ol>
-                      <li>
-                        <a href="#id-anchor">id</a>
-                      </li>
-                    </ol>
-                  </li>
-                </ol>
-              </li>
-          </ol>
-        </div>
-        <!-- /TABLE OF CONTENTS -->
-
-        <!-- Standard content lead-in for experimental API pages -->
-        <p id="classSummary">
-          For information on how to use experimental APIs, see the <a href="experimental.html">chrome.experimental.* APIs</a> page.
-        </p>
-
-        <!-- STATIC CONTENT PLACEHOLDER -->
-        <div id="static"></div>
-
-        <!-- API PAGE -->
-        <div class="apiPage">
-        <a name="apiReference"></a>
-        <h2>API reference: chrome.experimental.contentSettings.global</h2>
-
-          <!-- PROPERTIES -->
-          <div class="apiGroup">
-            <a name="properties"></a>
-            <h3 id="properties">Properties</h3>
-
-            <div>
-              <a name="property-thirdPartyCookiesAllowed"></a>
-              <h4>thirdPartyCookiesAllowed</h4>
-              <div class="summary">
-                <!-- Note: intentionally longer 80 columns -->
-                <span>chrome.experimental.contentSettings.global.</span><span>thirdPartyCookiesAllowed</span>
-              </div>
-              <div>
-          <dt>
-            <var>thirdPartyCookiesAllowed</var>
-              <em>
-
-                <!-- TYPE -->
-                <div style="display:inline">
-                  (
-                    <span class="optional" style="display: none; ">optional</span>
-                    <span class="enum" style="display: none; ">enumerated</span>
-                    <span id="typeTemplate">
-                      <span>
-                        <a href="types.html#type-ChromeSetting">ChromeSetting</a>
-                      </span>
-                      <span style="display: none; ">
-                        <span>
-                          array of <span><span></span></span>
-                        </span>
-                        <span>paramType</span>
-                        <span></span>
-                      </span>
-                    </span>
-                  )
-                </div>
-
-              </em>
-          </dt>
-          <dd class="todo" style="display: none; ">
-            Undocumented.
-          </dd>
-          <dd>Whether third party cookies should be allowed. The value of this preference is of type boolean, and the default value is true.</dd>
-          <dd style="display: none; ">
-            This parameter was added in version
-            <b><span></span></b>.
-            You must omit this parameter in earlier versions,
-            and you may omit it in any version.  If you require this
-            parameter, the manifest key
-            <a href="manifest.html#minimum_chrome_version">minimum_chrome_version</a>
-            can ensure that your extension won't be run in an earlier browser version.
-          </dd>
-
-          <!-- OBJECT PROPERTIES -->
-          <dd style="display: none; ">
-            <dl>
-              <div>
-                <div>
-                </div>
-              </div>
-            </dl>
-          </dd>
-
-          <!-- OBJECT METHODS -->
-          <dd style="display: none; ">
-            <div></div>
-          </dd>
-
-          <!-- OBJECT EVENT FIELDS -->
-          <dd style="display: none; ">
-            <div></div>
-          </dd>
-
-          <!-- FUNCTION PARAMETERS -->
-          <dd style="display: none; ">
-            <div></div>
-          </dd>
-
-        </div>
-            </div><div>
-              <a name="property-referrersEnabled"></a>
-              <h4>referrersEnabled</h4>
-              <div class="summary">
-                <!-- Note: intentionally longer 80 columns -->
-                <span>chrome.experimental.contentSettings.global.</span><span>referrersEnabled</span>
-              </div>
-              <div>
-          <dt>
-            <var>referrersEnabled</var>
-              <em>
-
-                <!-- TYPE -->
-                <div style="display:inline">
-                  (
-                    <span class="optional" style="display: none; ">optional</span>
-                    <span class="enum" style="display: none; ">enumerated</span>
-                    <span id="typeTemplate">
-                      <span>
-                        <a href="types.html#type-ChromeSetting">ChromeSetting</a>
-                      </span>
-                      <span style="display: none; ">
-                        <span>
-                          array of <span><span></span></span>
-                        </span>
-                        <span>paramType</span>
-                        <span></span>
-                      </span>
-                    </span>
-                  )
-                </div>
-
-              </em>
-          </dt>
-          <dd class="todo" style="display: none; ">
-            Undocumented.
-          </dd>
-          <dd>Whether referrers should be enabled. The value of this preference is of type boolean, and the default value is true.</dd>
-          <dd style="display: none; ">
-            This parameter was added in version
-            <b><span></span></b>.
-            You must omit this parameter in earlier versions,
-            and you may omit it in any version.  If you require this
-            parameter, the manifest key
-            <a href="manifest.html#minimum_chrome_version">minimum_chrome_version</a>
-            can ensure that your extension won't be run in an earlier browser version.
-          </dd>
-
-          <!-- OBJECT PROPERTIES -->
-          <dd style="display: none; ">
-            <dl>
-              <div>
-                <div>
-                </div>
-              </div>
-            </dl>
-          </dd>
-
-          <!-- OBJECT METHODS -->
-          <dd style="display: none; ">
-            <div></div>
-          </dd>
-
-          <!-- OBJECT EVENT FIELDS -->
-          <dd style="display: none; ">
-            <div></div>
-          </dd>
-
-          <!-- FUNCTION PARAMETERS -->
-          <dd style="display: none; ">
-            <div></div>
-          </dd>
-
-        </div>
-            </div><div>
-              <a name="property-hyperlinkAuditingEnabled"></a>
-              <h4>hyperlinkAuditingEnabled</h4>
-              <div class="summary">
-                <!-- Note: intentionally longer 80 columns -->
-                <span>chrome.experimental.contentSettings.global.</span><span>hyperlinkAuditingEnabled</span>
-              </div>
-              <div>
-          <dt>
-            <var>hyperlinkAuditingEnabled</var>
-              <em>
-
-                <!-- TYPE -->
-                <div style="display:inline">
-                  (
-                    <span class="optional" style="display: none; ">optional</span>
-                    <span class="enum" style="display: none; ">enumerated</span>
-                    <span id="typeTemplate">
-                      <span>
-                        <a href="types.html#type-ChromeSetting">ChromeSetting</a>
-                      </span>
-                      <span style="display: none; ">
-                        <span>
-                          array of <span><span></span></span>
-                        </span>
-                        <span>paramType</span>
-                        <span></span>
-                      </span>
-                    </span>
-                  )
-                </div>
-
-              </em>
-          </dt>
-          <dd class="todo" style="display: none; ">
-            Undocumented.
-          </dd>
-          <dd>Whether to enable hyperlink auditing ("&lt;a ping&gt;"). The value of this preference is of type boolean, and the default value is true.</dd>
-          <dd style="display: none; ">
-            This parameter was added in version
-            <b><span></span></b>.
-            You must omit this parameter in earlier versions,
-            and you may omit it in any version.  If you require this
-            parameter, the manifest key
-            <a href="manifest.html#minimum_chrome_version">minimum_chrome_version</a>
-            can ensure that your extension won't be run in an earlier browser version.
-          </dd>
-
-          <!-- OBJECT PROPERTIES -->
-          <dd style="display: none; ">
-            <dl>
-              <div>
-                <div>
-                </div>
-              </div>
-            </dl>
-          </dd>
-
-          <!-- OBJECT METHODS -->
-          <dd style="display: none; ">
-            <div></div>
-          </dd>
-
-          <!-- OBJECT EVENT FIELDS -->
-          <dd style="display: none; ">
-            <div></div>
-          </dd>
-
-          <!-- FUNCTION PARAMETERS -->
-          <dd style="display: none; ">
-            <div></div>
-          </dd>
-
-        </div>
-            </div>
-
-          </div> <!-- /apiGroup -->
-
-          <!-- METHODS -->
-          <div id="methodsTemplate" class="apiGroup" style="display: none; ">
-            <a></a>
-            <h3>Methods</h3>
-
-            <!-- iterates over all functions -->
-            <div class="apiItem">
-              <a></a> <!-- method-anchor -->
-              <h4>method name</h4>
-
-              <div class="summary"><span>void</span>
-                  <!-- Note: intentionally longer 80 columns -->
-                  <span>chrome.module.methodName</span>(<span><span>, </span><span></span>
-                      <var><span></span></var></span>)</div>
-
-              <div class="description">
-                <p class="todo">Undocumented.</p>
-                <p>
-                  A description from the json schema def of the function goes here.
-                </p>
-
-                <!-- PARAMETERS -->
-                <h4>Parameters</h4>
-                <dl>
-                  <div>
-                    <div>
-                    </div>
-                  </div>
-                </dl>
-
-                <!-- RETURNS -->
-                <h4>Returns</h4>
-                <dl>
-                  <div>
-                    <div>
-                    </div>
-                  </div>
-                </dl>
-
-                <!-- CALLBACK -->
-                <div>
-                  <div>
-                  <h4>Callback function</h4>
-                  <p>
-                    The callback <em>parameter</em> should specify a function
-                    that looks like this:
-                  </p>
-                  <p>
-                    If you specify the <em>callback</em> parameter, it should
-                    specify a function that looks like this:
-                  </p>
-
-                  <!-- Note: intentionally longer 80 columns -->
-                  <pre>function(<span>Type param1, Type param2</span>) <span class="subdued">{...}</span>;</pre>
-                  <dl>
-                    <div>
-                      <div>
-                      </div>
-                    </div>
-                  </dl>
-                  </div>
-                </div>
-
-                <!-- MIN_VERSION -->
-                <p>
-                  This function was added in version <b><span></span></b>.
-                  If you require this function, the manifest key
-                  <a href="manifest.html#minimum_chrome_version">minimum_chrome_version</a>
-                  can ensure that your extension won't be run in an earlier browser version.
-                </p>
-              </div> <!-- /description -->
-
-            </div>  <!-- /apiItem -->
-
-          </div>  <!-- /apiGroup -->
-
-          <!-- EVENTS -->
-          <div id="eventsTemplate" class="apiGroup" style="display: none; ">
-            <a></a>
-            <h3>Events</h3>
-            <!-- iterates over all events -->
-            <div class="apiItem">
-              <a></a>
-              <h4>event name</h4>
-
-              <div class="summary">
-                <!-- Note: intentionally longer 80 columns -->
-                <span class="subdued">chrome.bookmarks</span><span>onEvent</span><span class="subdued">.addListener</span>(function(<span>Type param1, Type param2</span>) <span class="subdued">{...}</span><span>, Type opt_param1, Type opt_param2</span>));
-              </div>
-
-              <div class="description">
-                <p class="todo">Undocumented.</p>
-                <p>
-                  A description from the json schema def of the event goes here.
-                </p>
-
-                <!-- LISTENER PARAMETERS -->
-                <div>
-                  <h4>Listener parameters</h4>
-                  <dl>
-                    <div>
-                      <div>
-                      </div>
-                    </div>
-                  </dl>
-                </div>
-
-                <!-- EXTRA PARAMETERS -->
-                <div>
-                  <h4>Extra parameters to addListener</h4>
-                  <dl>
-                    <div>
-                      <div>
-                      </div>
-                    </div>
-                  </dl>
-                </div>
-
-                <!-- LISTENER RETURN VALUE -->
-                <h4>Listener returns</h4>
-                <dl>
-                  <div>
-                    <div>
-                    </div>
-                  </div>
-                </dl>
-
-              </div> <!-- /description -->
-            </div> <!-- /apiItem -->
-
-          </div> <!-- /apiGroup -->
-
-          <!-- TYPES -->
-          <div class="apiGroup" style="display: none; ">
-            <a name="types"></a>
-            <h3 id="types">Types</h3>
-
-            <!-- iterates over all types -->
-            <div class="apiItem">
-              <a></a>
-              <h4>type name</h4>
-
-              <div>
-              </div>
-
-            </div> <!-- /apiItem -->
-
-          </div> <!-- /apiGroup -->
-
-        </div> <!-- /apiPage -->
-      </div> <!-- /gc-pagecontent -->
-    </div> <!-- /g-section -->
-  </div> <!-- /codesiteContent -->
-    <div id="gc-footer" --="">
-      <div class="text">
-  <p>
-  Except as otherwise <a href="http://code.google.com/policies.html#restrictions">noted</a>,
-  the content of this page is licensed under the <a rel="license" href="http://creativecommons.org/licenses/by/3.0/">Creative Commons
-  Attribution 3.0 License</a>, and code samples are licensed under the
-  <a rel="license" href="http://code.google.com/google_bsd_license.html">BSD License</a>.
-  </p>
-  <p>
-  ©2011 Google
-  </p>
-
-<!-- begin analytics -->
-<script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
-<script src="http://www.google-analytics.com/ga.js" type="text/javascript"></script>
-
-<script type="text/javascript">
-  // chrome doc tracking
-  try {
-    var engdocs = _gat._getTracker("YT-10763712-2");
-    engdocs._trackPageview();
-  } catch(err) {}
-
-  // code.google.com site-wide tracking
-  try {
-    _uacct="UA-18071-1";
-    _uanchor=1;
-    _uff=0;
-    urchinTracker();
-  }
-  catch(e) {/* urchinTracker not available. */}
-</script>
-<!-- end analytics -->
-      </div>
-    </div> <!-- /gc-footer -->
-  </div> <!-- /gc-container -->
-</body></html>
diff --git a/chrome/common/extensions/docs/experimental.html b/chrome/common/extensions/docs/experimental.html
index 8ceb913..2c3aa0a 100644
--- a/chrome/common/extensions/docs/experimental.html
+++ b/chrome/common/extensions/docs/experimental.html
@@ -361,7 +361,6 @@ on the following experimental APIs:
   <li>
   <a href="experimental.app.html">experimental.app</a></li><li>
   <a href="experimental.clear.html">experimental.clear</a></li><li>
-  <a href="experimental.contentSettings.html">experimental.contentSettings</a></li><li>
   <a href="experimental.debugger.html">experimental.debugger</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/samples.html b/chrome/common/extensions/docs/samples.html
index 3628d5e..aa6391a 100644
--- a/chrome/common/extensions/docs/samples.html
+++ b/chrome/common/extensions/docs/samples.html
@@ -329,7 +329,7 @@
   "ac31228200b41a87982e386cc90d3a6eee4ad885": "CHROMIUM SEARCH ADD SUPPORT TO THE OMNIBOX TO SEARCH THE CHROMIUM SOURCE CODE. BACKGROUND_PAGE TABS CHROME.OMNIBOX.ONINPUTCANCELLED CHROME.OMNIBOX.ONINPUTCHANGED CHROME.OMNIBOX.ONINPUTENTERED CHROME.OMNIBOX.ONINPUTSTARTED CHROME.OMNIBOX.SETDEFAULTSUGGESTION CHROME.TABS.GET CHROME.TABS.GETSELECTED CHROME.TABS.UPDATE",
   "7d5d6cf195bc25480256618e360aa38c6e6fba82": "CLD DISPLAYS THE LANGUAGE OF A TAB BACKGROUND_PAGE BROWSER_ACTION TABS CHROME.BROWSERACTION.SETBADGETEXT CHROME.TABS.DETECTLANGUAGE CHROME.TABS.GET CHROME.TABS.GETSELECTED CHROME.TABS.ONSELECTIONCHANGED CHROME.TABS.ONUPDATED",
   "6871d09f4a96bf9d4b6cc724d00e909cee0f3902": "CONTENT SCRIPT CROSS-DOMAIN XMLHTTPREQUEST EXAMPLE DEMONSTRATES MAKING CROSS DOMAIN REQUESTS FROM A CONTENT SCRIPT BY PUTTING TWITTER TRENDS ON GOOGLE NEWS.",
-  "e1f97e61e28ff33131d66dd28a4ed70a77874a51": "CONTENT SETTINGS SHOWS THE CONTENT SETTINGS FOR THE CURRENT SITE. BROWSER_ACTION CONTENTSETTINGS EXPERIMENTAL POPUP TABS CHROME.TABS.GET CHROME.TABS.GETSELECTED",
+  "e1f97e61e28ff33131d66dd28a4ed70a77874a51": "CONTENT SETTINGS SHOWS THE CONTENT SETTINGS FOR THE CURRENT SITE. BROWSER_ACTION CONTENTSETTINGS POPUP TABS CHROME.TABS.GET CHROME.TABS.GETSELECTED",
   "5d81304a17cf7ac2887484f730fbd2b01e51e166": "CONTEXT MENUS SAMPLE SHOWS SOME OF THE FEATURES OF THE CONTEXT MENUS API BACKGROUND_PAGE CONTEXTMENUS CHROME.CONTEXTMENUS.CREATE",
   "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",
   "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",
@@ -397,6 +397,8 @@
       </span><span>
         <a href="javascript:void(0);" onclick="setFilter('chrome.browserAction', this)">chrome.browserAction</a><span>, </span>
       </span><span>
+        <a href="javascript:void(0);" onclick="setFilter('chrome.contentSettings', this)">chrome.contentSettings</a><span>, </span>
+      </span><span>
         <a href="javascript:void(0);" onclick="setFilter('chrome.contextMenus', this)">chrome.contextMenus</a><span>, </span>
       </span><span>
         <a href="javascript:void(0);" onclick="setFilter('chrome.cookies', this)">chrome.cookies</a><span>, </span>
@@ -1272,9 +1274,6 @@
       <strong>contentSettings</strong><span>, </span>
       <span style="display: none; "> and</span>
     </span><span>
-      <strong>experimental</strong><span>, </span>
-      <span style="display: none; "> and</span>
-    </span><span>
       <strong>popup</strong><span style="display: none; ">, </span>
       <span> and</span>
     </span><span>
diff --git a/chrome/common/extensions/docs/samples.json b/chrome/common/extensions/docs/samples.json
index ae1ef8d..a9fc2f5 100644
--- a/chrome/common/extensions/docs/samples.json
+++ b/chrome/common/extensions/docs/samples.json
@@ -685,7 +685,6 @@
       "features": [
         "browser_action",
         "contentSettings",
-        "experimental",
         "popup",
         "tabs"
       ],
@@ -695,12 +694,12 @@
       "packaged_app": false,
       "path": "examples\/api\/contentSettings\/",
       "protocols": [],
-      "search_string": "CONTENT SETTINGS SHOWS THE CONTENT SETTINGS FOR THE CURRENT SITE. BROWSER_ACTION CONTENTSETTINGS EXPERIMENTAL POPUP TABS CHROME.TABS.GET CHROME.TABS.GETSELECTED",
+      "search_string": "CONTENT SETTINGS SHOWS THE CONTENT SETTINGS FOR THE CURRENT SITE. BROWSER_ACTION CONTENTSETTINGS POPUP TABS CHROME.TABS.GET CHROME.TABS.GETSELECTED",
       "source_files": [
         "manifest.json",
         "popup.html"
       ],
-      "source_hash": "aab21662d31c6d61f2304eacce32a3b6ca8bb207",
+      "source_hash": "14d647a5ea1fa8551089fdb8810b6acaf16530cf",
       "zip_path": "examples\/api\/contentSettings.zip"
     },
     {
diff --git a/chrome/common/extensions/extension_permission_set.cc b/chrome/common/extensions/extension_permission_set.cc
index 4f66c94..417da8f 100644
--- a/chrome/common/extensions/extension_permission_set.cc
+++ b/chrome/common/extensions/extension_permission_set.cc
@@ -271,8 +271,9 @@ ExtensionPermissionsInfo::ExtensionPermissionsInfo()
       IDS_EXTENSION_PROMPT_WARNING_BOOKMARKS,
       ExtensionPermissionMessage::kBookmarks, optional);
   RegisterPermission(
-      ExtensionAPIPermission::kContentSettings, "contentSettings", 0,
-      ExtensionPermissionMessage::kNone, none);
+      ExtensionAPIPermission::kContentSettings, "contentSettings",
+      IDS_EXTENSION_PROMPT_WARNING_CONTENT_SETTINGS,
+      ExtensionPermissionMessage::kContentSettings, none);
   RegisterPermission(
       ExtensionAPIPermission::kContextMenus, "contextMenus", 0,
       ExtensionPermissionMessage::kNone, optional);
diff --git a/chrome/common/extensions/extension_permission_set.h b/chrome/common/extensions/extension_permission_set.h
index 8c4118c..7250174 100644
--- a/chrome/common/extensions/extension_permission_set.h
+++ b/chrome/common/extensions/extension_permission_set.h
@@ -46,6 +46,7 @@ class ExtensionPermissionMessage {
     kFullAccess,
     kClipboard,
     kTtsEngine,
+    kContentSettings,
     kEnumBoundary
   };
 
diff --git a/chrome/common/extensions/extension_permission_set_unittest.cc b/chrome/common/extensions/extension_permission_set_unittest.cc
index c80eaf7..c83e793 100644
--- a/chrome/common/extensions/extension_permission_set_unittest.cc
+++ b/chrome/common/extensions/extension_permission_set_unittest.cc
@@ -610,7 +610,6 @@ TEST(ExtensionPermissionSetTest, PermissionMessages) {
   skip.insert(ExtensionAPIPermission::kIdle);
   skip.insert(ExtensionAPIPermission::kNotification);
   skip.insert(ExtensionAPIPermission::kUnlimitedStorage);
-  skip.insert(ExtensionAPIPermission::kContentSettings);
   skip.insert(ExtensionAPIPermission::kTts);
 
   // TODO(erikkay) add a string for this permission.
diff --git a/chrome/renderer/resources/extensions/extension_process_bindings.js b/chrome/renderer/resources/extensions/extension_process_bindings.js
index 7b3f8b5..5ada917 100644
--- a/chrome/renderer/resources/extensions/extension_process_bindings.js
+++ b/chrome/renderer/resources/extensions/extension_process_bindings.js
@@ -339,7 +339,7 @@ var chrome = chrome || {};
       this.get = function(details, callback) {
         var getSchema = this.parameters.get;
         chromeHidden.validate([details, callback], getSchema);
-        return sendRequest('experimental.contentSettings.get',
+        return sendRequest('contentSettings.get',
                            [contentType, details, callback],
                            extendSchema(getSchema));
       };
@@ -347,14 +347,14 @@ var chrome = chrome || {};
         var setSchema = this.parameters.set.slice();
         setSchema[0].properties.setting = settingSchema;
         chromeHidden.validate([details, callback], setSchema);
-        return sendRequest('experimental.contentSettings.set',
+        return sendRequest('contentSettings.set',
                            [contentType, details, callback],
                            extendSchema(setSchema));
       };
       this.clear = function(details, callback) {
         var clearSchema = this.parameters.clear;
         chromeHidden.validate([details, callback], clearSchema);
-        return sendRequest('experimental.contentSettings.clear',
+        return sendRequest('contentSettings.clear',
                            [contentType, details, callback],
                            extendSchema(clearSchema));
       };
@@ -362,7 +362,7 @@ var chrome = chrome || {};
         var schema = this.parameters.getResourceIdentifiers;
         chromeHidden.validate([callback], schema);
         return sendRequest(
-            'experimental.contentSettings.getResourceIdentifiers',
+            'contentSettings.getResourceIdentifiers',
             [contentType, callback],
             extendSchema(schema));
       };
diff --git a/chrome/renderer/resources/extensions/renderer_process_bindings.js b/chrome/renderer/resources/extensions/renderer_process_bindings.js
index fab9261..e934bf3 100644
--- a/chrome/renderer/resources/extensions/renderer_process_bindings.js
+++ b/chrome/renderer/resources/extensions/renderer_process_bindings.js
@@ -318,6 +318,7 @@ var chrome = chrome || {};
       "chromeAuthPrivate",
       "chromePrivate",
       "chromeosInfoPrivate",
+      "contentSettings",
       "contextMenus",
       "cookies",
       "devtools",
@@ -325,7 +326,6 @@ var chrome = chrome || {};
       "experimental.app",
       "experimental.bookmarkManager",
       "experimental.clear",
-      "experimental.contentSettings",
       "experimental.debugger",
       "experimental.downloads",
       "experimental.extension",
diff --git a/chrome/test/data/extensions/api_test/content_settings/getresourceidentifiers/manifest.json b/chrome/test/data/extensions/api_test/content_settings/getresourceidentifiers/manifest.json
index ab04c76..c8d313e 100644
--- a/chrome/test/data/extensions/api_test/content_settings/getresourceidentifiers/manifest.json
+++ b/chrome/test/data/extensions/api_test/content_settings/getresourceidentifiers/manifest.json
@@ -2,6 +2,6 @@
   "name" : "Content Settings API Test Extension",
   "version" : "0.1",
   "description" : "Content Settings API Test Extension",
-  "permissions": [ "experimental", "contentSettings" ],
+  "permissions": [ "contentSettings" ],
   "background_page": "test.html"
 }
diff --git a/chrome/test/data/extensions/api_test/content_settings/getresourceidentifiers/test.html b/chrome/test/data/extensions/api_test/content_settings/getresourceidentifiers/test.html
index 210b84b..0543a8c 100644
--- a/chrome/test/data/extensions/api_test/content_settings/getresourceidentifiers/test.html
+++ b/chrome/test/data/extensions/api_test/content_settings/getresourceidentifiers/test.html
@@ -10,7 +10,7 @@ Object.prototype.forEach = function(f) {
   }
 }
 
-var cs = chrome.experimental.contentSettings;
+var cs = chrome.contentSettings;
 chrome.test.runTests([
   function getResourceIdentifiers() {
     var contentTypes = {
diff --git a/chrome/test/data/extensions/api_test/content_settings/standard/manifest.json b/chrome/test/data/extensions/api_test/content_settings/standard/manifest.json
index ab04c76..c8d313e 100644
--- a/chrome/test/data/extensions/api_test/content_settings/standard/manifest.json
+++ b/chrome/test/data/extensions/api_test/content_settings/standard/manifest.json
@@ -2,6 +2,6 @@
   "name" : "Content Settings API Test Extension",
   "version" : "0.1",
   "description" : "Content Settings API Test Extension",
-  "permissions": [ "experimental", "contentSettings" ],
+  "permissions": [ "contentSettings" ],
   "background_page": "test.html"
 }
diff --git a/chrome/test/data/extensions/api_test/content_settings/standard/test.html b/chrome/test/data/extensions/api_test/content_settings/standard/test.html
index 5894b7e..2659935 100644
--- a/chrome/test/data/extensions/api_test/content_settings/standard/test.html
+++ b/chrome/test/data/extensions/api_test/content_settings/standard/test.html
@@ -2,7 +2,7 @@
 // Content settings API test
 // Run with browser_tests --gtest_filter=ExtensionApiTest.ContentSettings
 
-var cs = chrome.experimental.contentSettings;
+var cs = chrome.contentSettings;
 var default_content_settings = {
   "cookies": "session_only",
   "images": "allow",