| Index: chrome/common/extensions/docs/apps/socket.html
 | 
| diff --git a/chrome/common/extensions/docs/apps/experimental.socket.html b/chrome/common/extensions/docs/apps/socket.html
 | 
| similarity index 94%
 | 
| rename from chrome/common/extensions/docs/apps/experimental.socket.html
 | 
| rename to chrome/common/extensions/docs/apps/socket.html
 | 
| index b3dd71fd97bf60d3a7d274ed5fb7a2feee9f6024..a6a6fc61bece70fa19b8407cb247bb2d86a226e0 100644
 | 
| --- a/chrome/common/extensions/docs/apps/experimental.socket.html
 | 
| +++ b/chrome/common/extensions/docs/apps/socket.html
 | 
| @@ -17,7 +17,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>
 | 
| -  <meta name="description" content="Documentation for the chrome.experimental.socket module, which is part of the Google Chrome  extension APIs."><title>chrome.experimental.socket - Google Chrome Extensions - Google Code</title></head>
 | 
| +  <meta name="description" content="Documentation for the chrome.socket module, which is part of the Google Chrome  extension APIs."><title>chrome.socket - Google Chrome Extensions - Google Code</title></head>
 | 
|    <body doc-family="apps">  <link href="../css/ApiRefStyles_apps.css" rel="stylesheet" type="text/css">
 | 
|    <link href="../css/prettify.css" rel="stylesheet" type="text/css">
 | 
|    <link href="../css/shared.css" rel="stylesheet" type="text/css">
 | 
| @@ -157,14 +157,14 @@
 | 
|        </script>
 | 
|      <div class="g-unit" id="gc-pagecontent">
 | 
|        <div id="pageTitle">
 | 
| -        <h1 class="page_title">chrome.experimental.socket</h1>
 | 
| +        <h1 class="page_title">chrome.socket</h1>
 | 
|        </div>
 | 
|          <!-- TABLE OF CONTENTS -->
 | 
|          <div id="toc">
 | 
|            <h2>Contents</h2>
 | 
|            <ol>
 | 
|                <li>
 | 
| -                <a href="#apiReference">API reference: chrome.experimental.socket</a>
 | 
| +                <a href="#apiReference">API reference: chrome.socket</a>
 | 
|                  <ol>
 | 
|                    <li>
 | 
|              <a href="#global-methods">Methods</a>
 | 
| @@ -198,27 +198,27 @@
 | 
|              <a href="#types">Types</a>
 | 
|              <ol>
 | 
|                <li>
 | 
| -                <a href="#type-experimental.socket.SocketType">experimental.socket.SocketType</a>
 | 
| +                <a href="#type-socket.SocketType">socket.SocketType</a>
 | 
|                  <ol>
 | 
|                  </ol>
 | 
|                </li><li>
 | 
| -                <a href="#type-experimental.socket.CreateOptions">experimental.socket.CreateOptions</a>
 | 
| +                <a href="#type-socket.CreateOptions">socket.CreateOptions</a>
 | 
|                  <ol>
 | 
|                  </ol>
 | 
|                </li><li>
 | 
| -                <a href="#type-experimental.socket.CreateInfo">experimental.socket.CreateInfo</a>
 | 
| +                <a href="#type-socket.CreateInfo">socket.CreateInfo</a>
 | 
|                  <ol>
 | 
|                  </ol>
 | 
|                </li><li>
 | 
| -                <a href="#type-experimental.socket.ReadInfo">experimental.socket.ReadInfo</a>
 | 
| +                <a href="#type-socket.ReadInfo">socket.ReadInfo</a>
 | 
|                  <ol>
 | 
|                  </ol>
 | 
|                </li><li>
 | 
| -                <a href="#type-experimental.socket.WriteInfo">experimental.socket.WriteInfo</a>
 | 
| +                <a href="#type-socket.WriteInfo">socket.WriteInfo</a>
 | 
|                  <ol>
 | 
|                  </ol>
 | 
|                </li><li>
 | 
| -                <a href="#type-experimental.socket.RecvFromInfo">experimental.socket.RecvFromInfo</a>
 | 
| +                <a href="#type-socket.RecvFromInfo">socket.RecvFromInfo</a>
 | 
|                  <ol>
 | 
|                  </ol>
 | 
|                </li>
 | 
| @@ -230,15 +230,23 @@
 | 
|          </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 class="warning">
 | 
| +          <!-- Standard content lead-in for APIs that are not yet available on
 | 
| +          the stable channel. -->
 | 
| +          <em>Warning:</em> This API is still under development. It is only
 | 
| +          available for Chrome users on the
 | 
| +          <span>
 | 
| +            <strong>dev</strong>
 | 
| +              <a href="http://www.chromium.org/getting-involved/dev-channel">early
 | 
| +              release channel</a>.</span>
 | 
| +          <a href="TODO">Learn more</a>.
 | 
|          </p>
 | 
|          <!-- STATIC CONTENT PLACEHOLDER -->
 | 
|          <div id="static"></div>
 | 
|          <!-- API PAGE -->
 | 
|          <div class="apiPage">
 | 
|          <a name="apiReference"></a>
 | 
| -        <h2>API reference: chrome.experimental.socket</h2>
 | 
| +        <h2>API reference: chrome.socket</h2>
 | 
|            <!-- PROPERTIES -->
 | 
|             <!-- /apiGroup -->
 | 
|            <!-- METHODS -->
 | 
| @@ -251,7 +259,7 @@
 | 
|                <h4>bind</h4>
 | 
|                <div class="summary">
 | 
|                    <!-- Note: intentionally longer 80 columns -->
 | 
| -                  <span>chrome.experimental.socket.bind</span>(<span class="null"><span>integer</span>
 | 
| +                  <span>chrome.socket.bind</span>(<span class="null"><span>integer</span>
 | 
|                        <var><span>socketId</span></var></span><span class="null"><span>, </span><span>string</span>
 | 
|                        <var><span>address</span></var></span><span class="null"><span>, </span><span>integer</span>
 | 
|                        <var><span>port</span></var></span><span class="null"><span>, </span><span>function</span>
 | 
| @@ -401,7 +409,7 @@
 | 
|                <h4>connect</h4>
 | 
|                <div class="summary">
 | 
|                    <!-- Note: intentionally longer 80 columns -->
 | 
| -                  <span>chrome.experimental.socket.connect</span>(<span class="null"><span>integer</span>
 | 
| +                  <span>chrome.socket.connect</span>(<span class="null"><span>integer</span>
 | 
|                        <var><span>socketId</span></var></span><span class="null"><span>, </span><span>string</span>
 | 
|                        <var><span>hostname</span></var></span><span class="null"><span>, </span><span>integer</span>
 | 
|                        <var><span>port</span></var></span><span class="null"><span>, </span><span>function</span>
 | 
| @@ -551,8 +559,8 @@
 | 
|                <h4>create</h4>
 | 
|                <div class="summary">
 | 
|                    <!-- Note: intentionally longer 80 columns -->
 | 
| -                  <span>chrome.experimental.socket.create</span>(<span class="null"><span>experimental.socket.SocketType</span>
 | 
| -                      <var><span>type</span></var></span><span class="optional"><span>, </span><span>experimental.socket.CreateOptions</span>
 | 
| +                  <span>chrome.socket.create</span>(<span class="null"><span>socket.SocketType</span>
 | 
| +                      <var><span>type</span></var></span><span class="optional"><span>, </span><span>socket.CreateOptions</span>
 | 
|                        <var><span>options</span></var></span><span class="null"><span>, </span><span>function</span>
 | 
|                        <var><span>CreateCallback</span></var></span>)</div>
 | 
|                <div class="description">
 | 
| @@ -570,7 +578,7 @@
 | 
|                    (
 | 
|                      <span id="typeTemplate">
 | 
|                        <span>
 | 
| -                        <a href="experimental.socket.html#type-experimental.socket.SocketType">experimental.socket.SocketType</a>
 | 
| +                        <a href="socket.html#type-socket.SocketType">socket.SocketType</a>
 | 
|                        </span>
 | 
|                      </span>
 | 
|                    )
 | 
| @@ -594,7 +602,7 @@
 | 
|                      <span class="optional">optional</span>
 | 
|                      <span id="typeTemplate">
 | 
|                        <span>
 | 
| -                        <a href="experimental.socket.html#type-experimental.socket.CreateOptions">experimental.socket.CreateOptions</a>
 | 
| +                        <a href="socket.html#type-socket.CreateOptions">socket.CreateOptions</a>
 | 
|                        </span>
 | 
|                      </span>
 | 
|                    )
 | 
| @@ -645,7 +653,7 @@
 | 
|                    (
 | 
|                      <span id="typeTemplate">
 | 
|                        <span>
 | 
| -                        <a href="experimental.socket.html#type-experimental.socket.CreateInfo">experimental.socket.CreateInfo</a>
 | 
| +                        <a href="socket.html#type-socket.CreateInfo">socket.CreateInfo</a>
 | 
|                        </span>
 | 
|                      </span>
 | 
|                    )
 | 
| @@ -678,7 +686,7 @@
 | 
|                <h4>destroy</h4>
 | 
|                <div class="summary">
 | 
|                    <!-- Note: intentionally longer 80 columns -->
 | 
| -                  <span>chrome.experimental.socket.destroy</span>(<span class="null"><span>integer</span>
 | 
| +                  <span>chrome.socket.destroy</span>(<span class="null"><span>integer</span>
 | 
|                        <var><span>socketId</span></var></span>)</div>
 | 
|                <div class="description">
 | 
|                  <p>Destroys the socket. Each socket created should be destroyed after use.</p>
 | 
| @@ -721,7 +729,7 @@
 | 
|                <h4>disconnect</h4>
 | 
|                <div class="summary">
 | 
|                    <!-- Note: intentionally longer 80 columns -->
 | 
| -                  <span>chrome.experimental.socket.disconnect</span>(<span class="null"><span>integer</span>
 | 
| +                  <span>chrome.socket.disconnect</span>(<span class="null"><span>integer</span>
 | 
|                        <var><span>socketId</span></var></span>)</div>
 | 
|                <div class="description">
 | 
|                  <p>Disconnects the socket. For UDP sockets, <code>disconnect</code> is a non-operation but is safe to call.</p>
 | 
| @@ -764,7 +772,7 @@
 | 
|                <h4>read</h4>
 | 
|                <div class="summary">
 | 
|                    <!-- Note: intentionally longer 80 columns -->
 | 
| -                  <span>chrome.experimental.socket.read</span>(<span class="null"><span>integer</span>
 | 
| +                  <span>chrome.socket.read</span>(<span class="null"><span>integer</span>
 | 
|                        <var><span>socketId</span></var></span><span class="optional"><span>, </span><span>integer</span>
 | 
|                        <var><span>bufferSize</span></var></span><span class="null"><span>, </span><span>function</span>
 | 
|                        <var><span>ReadCallback</span></var></span>)</div>
 | 
| @@ -858,7 +866,7 @@
 | 
|                    (
 | 
|                      <span id="typeTemplate">
 | 
|                        <span>
 | 
| -                        <a href="experimental.socket.html#type-experimental.socket.ReadInfo">experimental.socket.ReadInfo</a>
 | 
| +                        <a href="socket.html#type-socket.ReadInfo">socket.ReadInfo</a>
 | 
|                        </span>
 | 
|                      </span>
 | 
|                    )
 | 
| @@ -891,7 +899,7 @@
 | 
|                <h4>recvFrom</h4>
 | 
|                <div class="summary">
 | 
|                    <!-- Note: intentionally longer 80 columns -->
 | 
| -                  <span>chrome.experimental.socket.recvFrom</span>(<span class="null"><span>integer</span>
 | 
| +                  <span>chrome.socket.recvFrom</span>(<span class="null"><span>integer</span>
 | 
|                        <var><span>socketId</span></var></span><span class="optional"><span>, </span><span>integer</span>
 | 
|                        <var><span>bufferSize</span></var></span><span class="null"><span>, </span><span>function</span>
 | 
|                        <var><span>RecvFromCallback</span></var></span>)</div>
 | 
| @@ -985,7 +993,7 @@
 | 
|                    (
 | 
|                      <span id="typeTemplate">
 | 
|                        <span>
 | 
| -                        <a href="experimental.socket.html#type-experimental.socket.RecvFromInfo">experimental.socket.RecvFromInfo</a>
 | 
| +                        <a href="socket.html#type-socket.RecvFromInfo">socket.RecvFromInfo</a>
 | 
|                        </span>
 | 
|                      </span>
 | 
|                    )
 | 
| @@ -1018,7 +1026,7 @@
 | 
|                <h4>sendTo</h4>
 | 
|                <div class="summary">
 | 
|                    <!-- Note: intentionally longer 80 columns -->
 | 
| -                  <span>chrome.experimental.socket.sendTo</span>(<span class="null"><span>integer</span>
 | 
| +                  <span>chrome.socket.sendTo</span>(<span class="null"><span>integer</span>
 | 
|                        <var><span>socketId</span></var></span><span class="null"><span>, </span><span>ArrayBuffer</span>
 | 
|                        <var><span>data</span></var></span><span class="null"><span>, </span><span>string</span>
 | 
|                        <var><span>address</span></var></span><span class="null"><span>, </span><span>integer</span>
 | 
| @@ -1159,7 +1167,7 @@
 | 
|                    (
 | 
|                      <span id="typeTemplate">
 | 
|                        <span>
 | 
| -                        <a href="experimental.socket.html#type-experimental.socket.WriteInfo">experimental.socket.WriteInfo</a>
 | 
| +                        <a href="socket.html#type-socket.WriteInfo">socket.WriteInfo</a>
 | 
|                        </span>
 | 
|                      </span>
 | 
|                    )
 | 
| @@ -1192,7 +1200,7 @@
 | 
|                <h4>setKeepAlive</h4>
 | 
|                <div class="summary">
 | 
|                    <!-- Note: intentionally longer 80 columns -->
 | 
| -                  <span>chrome.experimental.socket.setKeepAlive</span>(<span class="null"><span>integer</span>
 | 
| +                  <span>chrome.socket.setKeepAlive</span>(<span class="null"><span>integer</span>
 | 
|                        <var><span>socketId</span></var></span><span class="null"><span>, </span><span>boolean</span>
 | 
|                        <var><span>enable</span></var></span><span class="optional"><span>, </span><span>integer</span>
 | 
|                        <var><span>delay</span></var></span><span class="null"><span>, </span><span>function</span>
 | 
| @@ -1343,7 +1351,7 @@
 | 
|                <h4>setNoDelay</h4>
 | 
|                <div class="summary">
 | 
|                    <!-- Note: intentionally longer 80 columns -->
 | 
| -                  <span>chrome.experimental.socket.setNoDelay</span>(<span class="null"><span>integer</span>
 | 
| +                  <span>chrome.socket.setNoDelay</span>(<span class="null"><span>integer</span>
 | 
|                        <var><span>socketId</span></var></span><span class="null"><span>, </span><span>boolean</span>
 | 
|                        <var><span>noDelay</span></var></span><span class="null"><span>, </span><span>function</span>
 | 
|                        <var><span>SetNoDelayCallback</span></var></span>)</div>
 | 
| @@ -1469,7 +1477,7 @@
 | 
|                <h4>write</h4>
 | 
|                <div class="summary">
 | 
|                    <!-- Note: intentionally longer 80 columns -->
 | 
| -                  <span>chrome.experimental.socket.write</span>(<span class="null"><span>integer</span>
 | 
| +                  <span>chrome.socket.write</span>(<span class="null"><span>integer</span>
 | 
|                        <var><span>socketId</span></var></span><span class="null"><span>, </span><span>ArrayBuffer</span>
 | 
|                        <var><span>data</span></var></span><span class="null"><span>, </span><span>function</span>
 | 
|                        <var><span>WriteCallback</span></var></span>)</div>
 | 
| @@ -1562,7 +1570,7 @@
 | 
|                    (
 | 
|                      <span id="typeTemplate">
 | 
|                        <span>
 | 
| -                        <a href="experimental.socket.html#type-experimental.socket.WriteInfo">experimental.socket.WriteInfo</a>
 | 
| +                        <a href="socket.html#type-socket.WriteInfo">socket.WriteInfo</a>
 | 
|                        </span>
 | 
|                      </span>
 | 
|                    )
 | 
| @@ -1600,8 +1608,8 @@
 | 
|              <h3 id="types">Types</h3>
 | 
|              <!-- iterates over all types -->
 | 
|              <div class="apiItem">
 | 
| -              <a name="type-experimental.socket.SocketType"></a>
 | 
| -              <h4>experimental.socket.SocketType</h4>
 | 
| +              <a name="type-socket.SocketType"></a>
 | 
| +              <h4>socket.SocketType</h4>
 | 
|                <div>
 | 
|            <dt>
 | 
|                <em>
 | 
| @@ -1628,8 +1636,8 @@
 | 
|            <!-- FUNCTION PARAMETERS -->
 | 
|          </div>
 | 
|              </div><div class="apiItem">
 | 
| -              <a name="type-experimental.socket.CreateOptions"></a>
 | 
| -              <h4>experimental.socket.CreateOptions</h4>
 | 
| +              <a name="type-socket.CreateOptions"></a>
 | 
| +              <h4>socket.CreateOptions</h4>
 | 
|                <div>
 | 
|            <dt>
 | 
|                <em>
 | 
| @@ -1658,8 +1666,8 @@
 | 
|            <!-- FUNCTION PARAMETERS -->
 | 
|          </div>
 | 
|              </div><div class="apiItem">
 | 
| -              <a name="type-experimental.socket.CreateInfo"></a>
 | 
| -              <h4>experimental.socket.CreateInfo</h4>
 | 
| +              <a name="type-socket.CreateInfo"></a>
 | 
| +              <h4>socket.CreateInfo</h4>
 | 
|                <div>
 | 
|            <dt>
 | 
|                <em>
 | 
| @@ -1712,8 +1720,8 @@
 | 
|            <!-- FUNCTION PARAMETERS -->
 | 
|          </div>
 | 
|              </div><div class="apiItem">
 | 
| -              <a name="type-experimental.socket.ReadInfo"></a>
 | 
| -              <h4>experimental.socket.ReadInfo</h4>
 | 
| +              <a name="type-socket.ReadInfo"></a>
 | 
| +              <h4>socket.ReadInfo</h4>
 | 
|                <div>
 | 
|            <dt>
 | 
|                <em>
 | 
| @@ -1791,8 +1799,8 @@
 | 
|            <!-- FUNCTION PARAMETERS -->
 | 
|          </div>
 | 
|              </div><div class="apiItem">
 | 
| -              <a name="type-experimental.socket.WriteInfo"></a>
 | 
| -              <h4>experimental.socket.WriteInfo</h4>
 | 
| +              <a name="type-socket.WriteInfo"></a>
 | 
| +              <h4>socket.WriteInfo</h4>
 | 
|                <div>
 | 
|            <dt>
 | 
|                <em>
 | 
| @@ -1845,8 +1853,8 @@
 | 
|            <!-- FUNCTION PARAMETERS -->
 | 
|          </div>
 | 
|              </div><div class="apiItem">
 | 
| -              <a name="type-experimental.socket.RecvFromInfo"></a>
 | 
| -              <h4>experimental.socket.RecvFromInfo</h4>
 | 
| +              <a name="type-socket.RecvFromInfo"></a>
 | 
| +              <h4>socket.RecvFromInfo</h4>
 | 
|                <div>
 | 
|            <dt>
 | 
|                <em>
 | 
| 
 |