Extension docs: Manual merge crrev.com/143652

chrome/common/extensions/docs/browsingData.html

Index: chrome/common/extensions/docs/browsingData.html
===================================================================
--- chrome/common/extensions/docs/browsingData.html	(revision 151318)
+++ chrome/common/extensions/docs/browsingData.html	(working copy)
@@ -249,7 +249,7 @@
             <a href="#types">Types</a>
             <ol>
               <li>
-                <a href="#type-RemovalOptions">null</a>
+                <a href="#type-browsingData.RemovalOptions">RemovalOptions</a>
                 <ol>
                 </ol>
               </li>
@@ -422,7 +422,7 @@
               <h4>remove</h4>
               <div class="summary">
                   <!-- Note: intentionally longer 80 columns -->
-                  <span>chrome.browsingData.remove</span>(<span class="null"><span>RemovalOptions</span>
+                  <span>chrome.browsingData.remove</span>(<span class="null"><span>browsingData.RemovalOptions</span>
                       <var><span>options</span></var></span><span class="null"><span>, </span><span>object</span>
                       <var><span>dataToRemove</span></var></span><span class="optional"><span>, </span><span>function</span>
                       <var><span>callback</span></var></span>)</div>
@@ -441,7 +441,7 @@
                   (
                     <span id="typeTemplate">
                       <span>
-                        <a href="browsingData.html#type-RemovalOptions">RemovalOptions</a>
+                        <a href="browsingData.html#type-browsingData.RemovalOptions">browsingData.RemovalOptions</a>
                       </span>
                     </span>
                   )
@@ -833,7 +833,7 @@
               <h4>removeAppcache</h4>
               <div class="summary">
                   <!-- Note: intentionally longer 80 columns -->
-                  <span>chrome.browsingData.removeAppcache</span>(<span class="null"><span>RemovalOptions</span>
+                  <span>chrome.browsingData.removeAppcache</span>(<span class="null"><span>browsingData.RemovalOptions</span>
                       <var><span>options</span></var></span><span class="optional"><span>, </span><span>function</span>
                       <var><span>callback</span></var></span>)</div>
               <div class="description">
@@ -851,7 +851,7 @@
                   (
                     <span id="typeTemplate">
                       <span>
-                        <a href="browsingData.html#type-RemovalOptions">RemovalOptions</a>
+                        <a href="browsingData.html#type-browsingData.RemovalOptions">browsingData.RemovalOptions</a>
                       </span>
                     </span>
                   )
@@ -903,7 +903,7 @@
               <h4>removeCache</h4>
               <div class="summary">
                   <!-- Note: intentionally longer 80 columns -->
-                  <span>chrome.browsingData.removeCache</span>(<span class="null"><span>RemovalOptions</span>
+                  <span>chrome.browsingData.removeCache</span>(<span class="null"><span>browsingData.RemovalOptions</span>
                       <var><span>options</span></var></span><span class="optional"><span>, </span><span>function</span>
                       <var><span>callback</span></var></span>)</div>
               <div class="description">
@@ -921,7 +921,7 @@
                   (
                     <span id="typeTemplate">
                       <span>
-                        <a href="browsingData.html#type-RemovalOptions">RemovalOptions</a>
+                        <a href="browsingData.html#type-browsingData.RemovalOptions">browsingData.RemovalOptions</a>
                       </span>
                     </span>
                   )
@@ -973,7 +973,7 @@
               <h4>removeCookies</h4>
               <div class="summary">
                   <!-- Note: intentionally longer 80 columns -->
-                  <span>chrome.browsingData.removeCookies</span>(<span class="null"><span>RemovalOptions</span>
+                  <span>chrome.browsingData.removeCookies</span>(<span class="null"><span>browsingData.RemovalOptions</span>
                       <var><span>options</span></var></span><span class="optional"><span>, </span><span>function</span>
                       <var><span>callback</span></var></span>)</div>
               <div class="description">
@@ -991,7 +991,7 @@
                   (
                     <span id="typeTemplate">
                       <span>
-                        <a href="browsingData.html#type-RemovalOptions">RemovalOptions</a>
+                        <a href="browsingData.html#type-browsingData.RemovalOptions">browsingData.RemovalOptions</a>
                       </span>
                     </span>
                   )
@@ -1043,7 +1043,7 @@
               <h4>removeDownloads</h4>
               <div class="summary">
                   <!-- Note: intentionally longer 80 columns -->
-                  <span>chrome.browsingData.removeDownloads</span>(<span class="null"><span>RemovalOptions</span>
+                  <span>chrome.browsingData.removeDownloads</span>(<span class="null"><span>browsingData.RemovalOptions</span>
                       <var><span>options</span></var></span><span class="optional"><span>, </span><span>function</span>
                       <var><span>callback</span></var></span>)</div>
               <div class="description">
@@ -1061,7 +1061,7 @@
                   (
                     <span id="typeTemplate">
                       <span>
-                        <a href="browsingData.html#type-RemovalOptions">RemovalOptions</a>
+                        <a href="browsingData.html#type-browsingData.RemovalOptions">browsingData.RemovalOptions</a>
                       </span>
                     </span>
                   )
@@ -1113,7 +1113,7 @@
               <h4>removeFileSystems</h4>
               <div class="summary">
                   <!-- Note: intentionally longer 80 columns -->
-                  <span>chrome.browsingData.removeFileSystems</span>(<span class="null"><span>RemovalOptions</span>
+                  <span>chrome.browsingData.removeFileSystems</span>(<span class="null"><span>browsingData.RemovalOptions</span>
                       <var><span>options</span></var></span><span class="optional"><span>, </span><span>function</span>
                       <var><span>callback</span></var></span>)</div>
               <div class="description">
@@ -1131,7 +1131,7 @@
                   (
                     <span id="typeTemplate">
                       <span>
-                        <a href="browsingData.html#type-RemovalOptions">RemovalOptions</a>
+                        <a href="browsingData.html#type-browsingData.RemovalOptions">browsingData.RemovalOptions</a>
                       </span>
                     </span>
                   )
@@ -1183,7 +1183,7 @@
               <h4>removeFormData</h4>
               <div class="summary">
                   <!-- Note: intentionally longer 80 columns -->
-                  <span>chrome.browsingData.removeFormData</span>(<span class="null"><span>RemovalOptions</span>
+                  <span>chrome.browsingData.removeFormData</span>(<span class="null"><span>browsingData.RemovalOptions</span>
                       <var><span>options</span></var></span><span class="optional"><span>, </span><span>function</span>
                       <var><span>callback</span></var></span>)</div>
               <div class="description">
@@ -1201,7 +1201,7 @@
                   (
                     <span id="typeTemplate">
                       <span>
-                        <a href="browsingData.html#type-RemovalOptions">RemovalOptions</a>
+                        <a href="browsingData.html#type-browsingData.RemovalOptions">browsingData.RemovalOptions</a>
                       </span>
                     </span>
                   )
@@ -1253,7 +1253,7 @@
               <h4>removeHistory</h4>
               <div class="summary">
                   <!-- Note: intentionally longer 80 columns -->
-                  <span>chrome.browsingData.removeHistory</span>(<span class="null"><span>RemovalOptions</span>
+                  <span>chrome.browsingData.removeHistory</span>(<span class="null"><span>browsingData.RemovalOptions</span>
                       <var><span>options</span></var></span><span class="optional"><span>, </span><span>function</span>
                       <var><span>callback</span></var></span>)</div>
               <div class="description">
@@ -1271,7 +1271,7 @@
                   (
                     <span id="typeTemplate">
                       <span>
-                        <a href="browsingData.html#type-RemovalOptions">RemovalOptions</a>
+                        <a href="browsingData.html#type-browsingData.RemovalOptions">browsingData.RemovalOptions</a>
                       </span>
                     </span>
                   )
@@ -1323,7 +1323,7 @@
               <h4>removeIndexedDB</h4>
               <div class="summary">
                   <!-- Note: intentionally longer 80 columns -->
-                  <span>chrome.browsingData.removeIndexedDB</span>(<span class="null"><span>RemovalOptions</span>
+                  <span>chrome.browsingData.removeIndexedDB</span>(<span class="null"><span>browsingData.RemovalOptions</span>
                       <var><span>options</span></var></span><span class="optional"><span>, </span><span>function</span>
                       <var><span>callback</span></var></span>)</div>
               <div class="description">
@@ -1341,7 +1341,7 @@
                   (
                     <span id="typeTemplate">
                       <span>
-                        <a href="browsingData.html#type-RemovalOptions">RemovalOptions</a>
+                        <a href="browsingData.html#type-browsingData.RemovalOptions">browsingData.RemovalOptions</a>
                       </span>
                     </span>
                   )
@@ -1393,7 +1393,7 @@
               <h4>removeLocalStorage</h4>
               <div class="summary">
                   <!-- Note: intentionally longer 80 columns -->
-                  <span>chrome.browsingData.removeLocalStorage</span>(<span class="null"><span>RemovalOptions</span>
+                  <span>chrome.browsingData.removeLocalStorage</span>(<span class="null"><span>browsingData.RemovalOptions</span>
                       <var><span>options</span></var></span><span class="optional"><span>, </span><span>function</span>
                       <var><span>callback</span></var></span>)</div>
               <div class="description">
@@ -1411,7 +1411,7 @@
                   (
                     <span id="typeTemplate">
                       <span>
-                        <a href="browsingData.html#type-RemovalOptions">RemovalOptions</a>
+                        <a href="browsingData.html#type-browsingData.RemovalOptions">browsingData.RemovalOptions</a>
                       </span>
                     </span>
                   )
@@ -1463,7 +1463,7 @@
               <h4>removePasswords</h4>
               <div class="summary">
                   <!-- Note: intentionally longer 80 columns -->
-                  <span>chrome.browsingData.removePasswords</span>(<span class="null"><span>RemovalOptions</span>
+                  <span>chrome.browsingData.removePasswords</span>(<span class="null"><span>browsingData.RemovalOptions</span>
                       <var><span>options</span></var></span><span class="optional"><span>, </span><span>function</span>
                       <var><span>callback</span></var></span>)</div>
               <div class="description">
@@ -1481,7 +1481,7 @@
                   (
                     <span id="typeTemplate">
                       <span>
-                        <a href="browsingData.html#type-RemovalOptions">RemovalOptions</a>
+                        <a href="browsingData.html#type-browsingData.RemovalOptions">browsingData.RemovalOptions</a>
                       </span>
                     </span>
                   )
@@ -1533,7 +1533,7 @@
               <h4>removePluginData</h4>
               <div class="summary">
                   <!-- Note: intentionally longer 80 columns -->
-                  <span>chrome.browsingData.removePluginData</span>(<span class="null"><span>RemovalOptions</span>
+                  <span>chrome.browsingData.removePluginData</span>(<span class="null"><span>browsingData.RemovalOptions</span>
                       <var><span>options</span></var></span><span class="optional"><span>, </span><span>function</span>
                       <var><span>callback</span></var></span>)</div>
               <div class="description">
@@ -1551,7 +1551,7 @@
                   (
                     <span id="typeTemplate">
                       <span>
-                        <a href="browsingData.html#type-RemovalOptions">RemovalOptions</a>
+                        <a href="browsingData.html#type-browsingData.RemovalOptions">browsingData.RemovalOptions</a>
                       </span>
                     </span>
                   )
@@ -1603,7 +1603,7 @@
               <h4>removeWebSQL</h4>
               <div class="summary">
                   <!-- Note: intentionally longer 80 columns -->
-                  <span>chrome.browsingData.removeWebSQL</span>(<span class="null"><span>RemovalOptions</span>
+                  <span>chrome.browsingData.removeWebSQL</span>(<span class="null"><span>browsingData.RemovalOptions</span>
                       <var><span>options</span></var></span><span class="optional"><span>, </span><span>function</span>
                       <var><span>callback</span></var></span>)</div>
               <div class="description">
@@ -1621,7 +1621,7 @@
                   (
                     <span id="typeTemplate">
                       <span>
-                        <a href="browsingData.html#type-RemovalOptions">RemovalOptions</a>
+                        <a href="browsingData.html#type-browsingData.RemovalOptions">browsingData.RemovalOptions</a>
                       </span>
                     </span>
                   )
@@ -1678,8 +1678,8 @@
             <h3 id="types">Types</h3>
             <!-- iterates over all types -->
             <div class="apiItem">
-              <a name="type-RemovalOptions"></a>
-              <h4>RemovalOptions</h4>
+              <a name="type-browsingData.RemovalOptions"></a>
+              <h4>browsingData.RemovalOptions</h4>
               <div>
           <dt>
               <em>