Extension docs: Manual merge crrev.com/143652

chrome/common/extensions/docs/cookies.html

Index: chrome/common/extensions/docs/cookies.html
===================================================================
--- chrome/common/extensions/docs/cookies.html	(revision 151318)
+++ chrome/common/extensions/docs/cookies.html	(working copy)
@@ -233,11 +233,11 @@
             <a href="#types">Types</a>
             <ol>
               <li>
-                <a href="#type-Cookie">null</a>
+                <a href="#type-cookies.Cookie">Cookie</a>
                 <ol>
                 </ol>
               </li><li>
-                <a href="#type-CookieStore">null</a>
+                <a href="#type-cookies.CookieStore">CookieStore</a>
                 <ol>
                 </ol>
               </li>
@@ -1251,7 +1251,7 @@
                   (
                     <span id="typeTemplate">
                       <span>
-                        <a href="cookies.html#type-Cookie">Cookie</a>
+                        <a href="cookies.html#type-cookies.Cookie">cookies.Cookie</a>
                       </span>
                     </span>
                   )
@@ -1322,8 +1322,8 @@
             <h3 id="types">Types</h3>
             <!-- iterates over all types -->
             <div class="apiItem">
-              <a name="type-Cookie"></a>
-              <h4>Cookie</h4>
+              <a name="type-cookies.Cookie"></a>
+              <h4>cookies.Cookie</h4>
               <div>
           <dt>
               <em>
@@ -1582,8 +1582,8 @@
           <!-- FUNCTION PARAMETERS -->
         </div>
             </div><div class="apiItem">
-              <a name="type-CookieStore"></a>
-              <h4>CookieStore</h4>
+              <a name="type-cookies.CookieStore"></a>
+              <h4>cookies.CookieStore</h4>
               <div>
           <dt>
               <em>