Merge 108704 - "contentSettings" permission not listed in permission warnings

chrome/common/extensions/docs/static/permission_warnings.html

 <div id="pageData-name" class="pageData">Permission Warnings</div>
 <div id="pageData-showTOC" class="pageData">true</div>
 
 <!--
 NOTE: When this doc is updated, the online help should also be updated:
 http://www.google.com/support/chrome_webstore/bin/answer.py?hl=en&answer=186213
 
 We should periodically look at 
 http://src.chromium.org/viewvc/chrome/trunk/src/chrome/app/generated_resources.grd?view=markup
 to make sure that we're covering all messages. Search for
@@ skipping 186 matching lines @@
     <p>
       The "tabs" permission is required by the
       <a href="tabs.html"><code>chrome.tabs</code></a> and 
       <a href="windows.html"><code>chrome.windows</code></a> modules.
     </p>
   </td>
 </tr>
 
 <tr>
   <td style="font-weight:bold">
+    <!-- IDS_EXTENSION_PROMPT_WARNING_CONTENT_SETTINGS -->
+    Settings that specify whether websites can use features such as cookies, JavaScript, and plug-ins
+  </td>
+  <td>
+    <!-- HasEffectiveBrowsingHistoryPermission -->
+     "contentSettings" permission
+  </td>
+  <td>
+    <p>
+      The "contentSettings" permission is required by
+      <a href="contentSettings.html"><code>chrome.contentSettings</code></a>.
+    </p>
+  </td>
+</tr>
+
+<tr>
+  <td style="font-weight:bold">
     <!-- IDS_EXTENSION_PROMPT_WARNING_ALL_HOSTS -->
     Your data on all websites
   </td>
   <td>
     <!-- HasEffectiveAccessToAllHosts() -->
     Any of the following:
     <ul>
       <li> "debugger" permission </li>
       <li> "proxy" permission </li>
       <li> A match pattern in the "permissions" field
@@ skipping 161 matching lines @@
 by clicking the <b>chrome://extensions</b> page's
 <b>Update extensions now</b> button.
 </p>
 
 <h2 id="api">API</h2>
 
 <p>
 You can get a list of permission warnings for any manifest with
 <a href="management.html#method-getPermissionWarnings">chrome.management.getPermissionWarnings()</a>.
 </p>