Revert 61347 - Take extension 'management' API out of experimental.

BUG=56399
TEST=You should be able to write an extension using the management API.

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

TBR=asargent@chromium.org

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

76 files changed, 77 insertions, 121 deletions

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index e83c673..4176d82 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -3481,9 +3481,6 @@ each locale. -->
       <message name="IDS_EXTENSION_PROMPT2_WARNING_GEOLOCATION" desc="Permisson string for access to geolocation.">
         Your physical location
       </message>
-      <message name="IDS_EXTENSION_PROMPT2_WARNING_MANAGEMENT" desc="Permisson string for access to extension management.">
-        Manage themes, extensions, and apps
-      </message>      
 
       <!-- Extension error messages -->
       <message name="IDS_EXTENSION_DIRECTORY_NO_EXISTS" desc="Warning displayed in pack dialog when the extension directory does not exist.">
diff --git a/chrome/browser/extensions/extension_event_names.cc b/chrome/browser/extensions/extension_event_names.cc
index a9b0e2f..a70f293 100644
--- a/chrome/browser/extensions/extension_event_names.cc
+++ b/chrome/browser/extensions/extension_event_names.cc
@@ -18,9 +18,9 @@ const char kOnWindowCreated[] = "windows.onCreated";
 const char kOnWindowFocusedChanged[] = "windows.onFocusChanged";
 const char kOnWindowRemoved[] = "windows.onRemoved";
 
-const char kOnExtensionInstalled[] = "management.onInstalled";
-const char kOnExtensionUninstalled[] = "management.onUninstalled";
-const char kOnExtensionEnabled[] = "management.onEnabled";
-const char kOnExtensionDisabled[] = "management.onDisabled";
+const char kOnExtensionInstalled[] = "experimental.management.onInstalled";
+const char kOnExtensionUninstalled[] = "experimental.management.onUninstalled";
+const char kOnExtensionEnabled[] = "experimental.management.onEnabled";
+const char kOnExtensionDisabled[] = "experimental.management.onDisabled";
 
 }  // namespace extension_event_names
diff --git a/chrome/browser/extensions/extension_management_api.h b/chrome/browser/extensions/extension_management_api.h
index 3176aef..4109886 100644
--- a/chrome/browser/extensions/extension_management_api.h
+++ b/chrome/browser/extensions/extension_management_api.h
@@ -21,25 +21,25 @@ class ExtensionManagementFunction : public SyncExtensionFunction {
 class GetAllExtensionsFunction : public ExtensionManagementFunction {
   ~GetAllExtensionsFunction() {}
   virtual bool RunImpl();
-  DECLARE_EXTENSION_FUNCTION_NAME("management.getAll");
+  DECLARE_EXTENSION_FUNCTION_NAME("experimental.management.getAll");
 };
 
 class LaunchAppFunction : public ExtensionManagementFunction {
   ~LaunchAppFunction() {}
   virtual bool RunImpl();
-  DECLARE_EXTENSION_FUNCTION_NAME("management.launchApp");
+  DECLARE_EXTENSION_FUNCTION_NAME("experimental.management.launchApp");
 };
 
 class SetEnabledFunction : public ExtensionManagementFunction {
   ~SetEnabledFunction() {}
   virtual bool RunImpl();
-  DECLARE_EXTENSION_FUNCTION_NAME("management.setEnabled");
+  DECLARE_EXTENSION_FUNCTION_NAME("experimental.management.setEnabled");
 };
 
 class UninstallFunction : public ExtensionManagementFunction {
   ~UninstallFunction() {}
   virtual bool RunImpl();
-  DECLARE_EXTENSION_FUNCTION_NAME("management.uninstall");
+  DECLARE_EXTENSION_FUNCTION_NAME("experimental.management.uninstall");
 };
 
 class ExtensionManagementEventRouter : public NotificationObserver {
diff --git a/chrome/browser/extensions/extension_management_api_browsertest.cc b/chrome/browser/extensions/extension_management_api_browsertest.cc
index 7061637..643072d 100644
--- a/chrome/browser/extensions/extension_management_api_browsertest.cc
+++ b/chrome/browser/extensions/extension_management_api_browsertest.cc
@@ -4,8 +4,16 @@
 
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
+#include "chrome/common/chrome_switches.h"
 
-class ExtensionManagementApiBrowserTest : public ExtensionBrowserTest {};
+
+class ExtensionManagementApiBrowserTest : public ExtensionBrowserTest {
+  virtual void SetUpCommandLine(CommandLine* command_line) {
+    ExtensionBrowserTest::SetUpCommandLine(command_line);
+    command_line->AppendSwitch(
+        switches::kEnableExperimentalExtensionApis);
+  }
+};
 
 // We test this here instead of in an ExtensionApiTest because normal extensions
 // are not allowed to call the install function.
diff --git a/chrome/browser/extensions/extension_management_apitest.cc b/chrome/browser/extensions/extension_management_apitest.cc
index 75b0880..8d734cf 100644
--- a/chrome/browser/extensions/extension_management_apitest.cc
+++ b/chrome/browser/extensions/extension_management_apitest.cc
@@ -2,13 +2,22 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "base/command_line.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/profile.h"
+#include "chrome/common/chrome_switches.h"
 
 class ExtensionManagementApiTest : public ExtensionApiTest {
  public:
+
+  virtual void SetUpCommandLine(CommandLine* command_line) {
+    ExtensionApiTest::SetUpCommandLine(command_line);
+    command_line->AppendSwitch(
+        switches::kEnableExperimentalExtensionApis);
+  }
+
   virtual void InstallExtensions() {
     FilePath basedir = test_data_dir_.AppendASCII("management");
 
diff --git a/chrome/common/extensions/api/extension_api.json b/chrome/common/extensions/api/extension_api.json
index 732f417..a566716d 100644
--- a/chrome/common/extensions/api/extension_api.json
+++ b/chrome/common/extensions/api/extension_api.json
@@ -3915,7 +3915,7 @@
     ]
   },
   {
-    "namespace":"management",
+    "namespace":"experimental.management",
     "types": [
       {
         "id": "IconInfo",
diff --git a/chrome/common/extensions/docs/a11y.html b/chrome/common/extensions/docs/a11y.html
index 7447813..92c6f6b 100644
--- a/chrome/common/extensions/docs/a11y.html
+++ b/chrome/common/extensions/docs/a11y.html
@@ -177,7 +177,6 @@
                   <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>
diff --git a/chrome/common/extensions/docs/api_index.html b/chrome/common/extensions/docs/api_index.html
index 46ddd6e..ac8d54c 100644
--- a/chrome/common/extensions/docs/api_index.html
+++ b/chrome/common/extensions/docs/api_index.html
@@ -177,7 +177,6 @@
                   <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>
@@ -319,7 +318,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="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="pageAction.html" js="">pageAction</a></li><li><a href="tabs.html" js="">tabs</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="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="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="pageAction.html" js="">pageAction</a></li><li><a href="tabs.html" js="">tabs</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/api_other.html b/chrome/common/extensions/docs/api_other.html
index c1ef26b..3b1f2bb 100644
--- a/chrome/common/extensions/docs/api_other.html
+++ b/chrome/common/extensions/docs/api_other.html
@@ -177,7 +177,6 @@
                   <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>
diff --git a/chrome/common/extensions/docs/autoupdate.html b/chrome/common/extensions/docs/autoupdate.html
index f474abb..3ea1162 100644
--- a/chrome/common/extensions/docs/autoupdate.html
+++ b/chrome/common/extensions/docs/autoupdate.html
@@ -177,7 +177,6 @@
                   <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>
diff --git a/chrome/common/extensions/docs/background_pages.html b/chrome/common/extensions/docs/background_pages.html
index 5227b51..be3085a 100644
--- a/chrome/common/extensions/docs/background_pages.html
+++ b/chrome/common/extensions/docs/background_pages.html
@@ -177,7 +177,6 @@
                   <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>
diff --git a/chrome/common/extensions/docs/bookmarks.html b/chrome/common/extensions/docs/bookmarks.html
index 8283626..2d99ba5 100644
--- a/chrome/common/extensions/docs/bookmarks.html
+++ b/chrome/common/extensions/docs/bookmarks.html
@@ -177,7 +177,6 @@
                   <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>
diff --git a/chrome/common/extensions/docs/browserAction.html b/chrome/common/extensions/docs/browserAction.html
index 77c2b6c..ce1b362 100644
--- a/chrome/common/extensions/docs/browserAction.html
+++ b/chrome/common/extensions/docs/browserAction.html
@@ -177,7 +177,6 @@
                   <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>
diff --git a/chrome/common/extensions/docs/content_scripts.html b/chrome/common/extensions/docs/content_scripts.html
index 7d48d56..d15aa5b 100644
--- a/chrome/common/extensions/docs/content_scripts.html
+++ b/chrome/common/extensions/docs/content_scripts.html
@@ -177,7 +177,6 @@
                   <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>
diff --git a/chrome/common/extensions/docs/contextMenus.html b/chrome/common/extensions/docs/contextMenus.html
index a7b2cdb..919e449 100644
--- a/chrome/common/extensions/docs/contextMenus.html
+++ b/chrome/common/extensions/docs/contextMenus.html
@@ -177,7 +177,6 @@
                   <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>
diff --git a/chrome/common/extensions/docs/cookies.html b/chrome/common/extensions/docs/cookies.html
index ea79e4c..12278d9 100644
--- a/chrome/common/extensions/docs/cookies.html
+++ b/chrome/common/extensions/docs/cookies.html
@@ -177,7 +177,6 @@
                   <li class="leftNavSelected">Cookies</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>
diff --git a/chrome/common/extensions/docs/devguide.html b/chrome/common/extensions/docs/devguide.html
index e5a801b..86c56ef 100644
--- a/chrome/common/extensions/docs/devguide.html
+++ b/chrome/common/extensions/docs/devguide.html
@@ -177,7 +177,6 @@
                   <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>
diff --git a/chrome/common/extensions/docs/docs.html b/chrome/common/extensions/docs/docs.html
index 2a81648..abc9102 100644
--- a/chrome/common/extensions/docs/docs.html
+++ b/chrome/common/extensions/docs/docs.html
@@ -177,7 +177,6 @@
                   <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>
diff --git a/chrome/common/extensions/docs/events.html b/chrome/common/extensions/docs/events.html
index 7fbf71e..ad86e44 100644
--- a/chrome/common/extensions/docs/events.html
+++ b/chrome/common/extensions/docs/events.html
@@ -177,7 +177,6 @@
                   <li><a href="cookies.html">Cookies</a></li>
                   <li class="leftNavSelected">Events</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>
diff --git a/chrome/common/extensions/docs/experimental.clipboard.html b/chrome/common/extensions/docs/experimental.clipboard.html
index 0bf145d..f159755 100644
--- a/chrome/common/extensions/docs/experimental.clipboard.html
+++ b/chrome/common/extensions/docs/experimental.clipboard.html
@@ -177,7 +177,6 @@
                   <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>
diff --git a/chrome/common/extensions/docs/experimental.contextMenus.html b/chrome/common/extensions/docs/experimental.contextMenus.html
index db22bb4..aec0f4f 100644
--- a/chrome/common/extensions/docs/experimental.contextMenus.html
+++ b/chrome/common/extensions/docs/experimental.contextMenus.html
@@ -177,7 +177,6 @@
                   <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>
diff --git a/chrome/common/extensions/docs/experimental.cookies.html b/chrome/common/extensions/docs/experimental.cookies.html
index 1eaeee9..8694366 100644
--- a/chrome/common/extensions/docs/experimental.cookies.html
+++ b/chrome/common/extensions/docs/experimental.cookies.html
@@ -177,7 +177,6 @@
                   <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>
diff --git a/chrome/common/extensions/docs/experimental.history.html b/chrome/common/extensions/docs/experimental.history.html
index 5b1b412..f1db1ad 100644
--- a/chrome/common/extensions/docs/experimental.history.html
+++ b/chrome/common/extensions/docs/experimental.history.html
@@ -177,7 +177,6 @@
                   <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>
diff --git a/chrome/common/extensions/docs/experimental.html b/chrome/common/extensions/docs/experimental.html
index 08480af..b5a7420 100644
--- a/chrome/common/extensions/docs/experimental.html
+++ b/chrome/common/extensions/docs/experimental.html
@@ -177,7 +177,6 @@
                   <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>
@@ -300,6 +299,7 @@ on the following experimental APIs:
   <li>
   <a href="experimental.clipboard.html">experimental.clipboard</a></li><li>
   <a href="experimental.infobars.html">experimental.infobars</a></li><li>
+  <a href="experimental.management.html">experimental.management</a></li><li>
   <a href="experimental.omnibox.html">experimental.omnibox</a></li><li>
   <a href="experimental.processes.html">experimental.processes</a></li><li>
   <a href="experimental.proxy.html">experimental.proxy</a></li><li>
diff --git a/chrome/common/extensions/docs/experimental.idle.html b/chrome/common/extensions/docs/experimental.idle.html
index d7b2d80..4c14a2f 100644
--- a/chrome/common/extensions/docs/experimental.idle.html
+++ b/chrome/common/extensions/docs/experimental.idle.html
@@ -177,7 +177,6 @@
                   <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>
diff --git a/chrome/common/extensions/docs/experimental.infobars.html b/chrome/common/extensions/docs/experimental.infobars.html
index 97d859d..cd72c10 100644
--- a/chrome/common/extensions/docs/experimental.infobars.html
+++ b/chrome/common/extensions/docs/experimental.infobars.html
@@ -177,7 +177,6 @@
                   <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>
diff --git a/chrome/common/extensions/docs/management.html b/chrome/common/extensions/docs/experimental.management.html
index 8fb7add..5f316c9 100644
--- a/chrome/common/extensions/docs/management.html
+++ b/chrome/common/extensions/docs/experimental.management.html
@@ -15,7 +15,7 @@
     </script>
     <script type="text/javascript" src="js/api_page_generator.js"></script>
     <script type="text/javascript" src="js/bootstrap.js"></script>
-  <title>Management - Google Chrome Extensions - Google Code</title></head>
+  <title>chrome.experimental.management - 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.
@@ -177,7 +177,6 @@
                   <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 class="leftNavSelected">Management</li>
                   <li><a href="tabs.html">Tabs</a></li>
                   <li><a href="windows.html">Windows</a></li>
                 </ul>
@@ -228,7 +227,7 @@
 
     <div class="g-unit" id="gc-pagecontent">
       <div id="pageTitle">
-        <h1 class="page_title">Management</h1>
+        <h1 class="page_title">chrome.experimental.management</h1>
       </div>
         <!-- TABLE OF CONTENTS -->
         <div id="toc">
@@ -243,7 +242,7 @@
               </ol>
             </li>
               <li>
-                <a href="#apiReference">API reference: chrome.management</a>
+                <a href="#apiReference">API reference: chrome.experimental.management</a>
                 <ol>
                   <li style="display: none; ">
                     <a href="#properties">Properties</a>
@@ -298,23 +297,19 @@
         <!-- /TABLE OF CONTENTS -->
 
         <!-- Standard content lead-in for experimental API pages -->
-        <p id="classSummary" style="display: none; ">
+        <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 id="pageData-name" class="pageData">Management</div>
-<!-- BEGIN AUTHORED CONTENT -->
-<p id="classSummary">
-The <code>chrome.management</code> module provides ways to manage the list of extensions/apps that are installed and running. It is particularly useful for extensions that <a href="override.html">override</a> the built-in New Tab page.
-</p>
+        <div id="static"><!-- BEGIN AUTHORED CONTENT -->
 <!-- END AUTHORED CONTENT -->
 </div>
 
         <!-- API PAGE -->
         <div class="apiPage">
         <a name="apiReference"></a>
-        <h2>API reference: chrome.management</h2>
+        <h2>API reference: chrome.experimental.management</h2>
 
           <!-- PROPERTIES -->
           <div class="apiGroup" style="display: none; ">
@@ -346,7 +341,7 @@ The <code>chrome.management</code> module provides ways to manage the list of ex
 
               <div class="summary"><span style="display: none; ">void</span>
                   <!-- Note: intentionally longer 80 columns -->
-                  <span>chrome.management.getAll</span>(<span class="optional"><span style="display: none; ">, </span><span>function</span>
+                  <span>chrome.experimental.management.getAll</span>(<span class="optional"><span style="display: none; ">, </span><span>function</span>
                       <var><span>callback</span></var></span>)</div>
 
               <div class="description">
@@ -463,7 +458,7 @@ The <code>chrome.management</code> module provides ways to manage the list of ex
                         <span>
                           array of <span><span>
                       <span>
-                        <a href="management.html#type-ExtensionInfo">ExtensionInfo</a>
+                        <a href="experimental.management.html#type-ExtensionInfo">ExtensionInfo</a>
                       </span>
                       <span style="display: none; ">
                         <span>
@@ -535,7 +530,7 @@ The <code>chrome.management</code> module provides ways to manage the list of ex
 
               <div class="summary"><span style="display: none; ">void</span>
                   <!-- Note: intentionally longer 80 columns -->
-                  <span>chrome.management.launchApp</span>(<span class="null"><span style="display: none; ">, </span><span>string</span>
+                  <span>chrome.experimental.management.launchApp</span>(<span class="null"><span style="display: none; ">, </span><span>string</span>
                       <var><span>id</span></var></span><span class="optional"><span>, </span><span>function</span>
                       <var><span>callback</span></var></span>)</div>
 
@@ -715,7 +710,7 @@ The <code>chrome.management</code> module provides ways to manage the list of ex
 
               <div class="summary"><span style="display: none; ">void</span>
                   <!-- Note: intentionally longer 80 columns -->
-                  <span>chrome.management.setEnabled</span>(<span class="null"><span style="display: none; ">, </span><span>string</span>
+                  <span>chrome.experimental.management.setEnabled</span>(<span class="null"><span style="display: none; ">, </span><span>string</span>
                       <var><span>id</span></var></span><span class="null"><span>, </span><span>boolean</span>
                       <var><span>enabled</span></var></span><span class="optional"><span>, </span><span>function</span>
                       <var><span>callback</span></var></span>)</div>
@@ -758,7 +753,7 @@ The <code>chrome.management</code> module provides ways to manage the list of ex
           <dd class="todo" style="display: none; ">
             Undocumented.
           </dd>
-          <dd>This should be the id from an item of <a href="management.html#type-ExtensionInfo">ExtensionInfo</a>.</dd>
+          <dd>This should be the id from an item of <a href="experimental.management.html#type-ExtensionInfo">ExtensionInfo</a>.</dd>
           <dd style="display: none; ">
             This parameter was added in version
             <b><span></span></b>.
@@ -954,7 +949,7 @@ The <code>chrome.management</code> module provides ways to manage the list of ex
 
               <div class="summary"><span style="display: none; ">void</span>
                   <!-- Note: intentionally longer 80 columns -->
-                  <span>chrome.management.uninstall</span>(<span class="null"><span style="display: none; ">, </span><span>string</span>
+                  <span>chrome.experimental.management.uninstall</span>(<span class="null"><span style="display: none; ">, </span><span>string</span>
                       <var><span>id</span></var></span><span class="optional"><span>, </span><span>function</span>
                       <var><span>callback</span></var></span>)</div>
 
@@ -996,7 +991,7 @@ The <code>chrome.management</code> module provides ways to manage the list of ex
           <dd class="todo" style="display: none; ">
             Undocumented.
           </dd>
-          <dd>This should be the id from an item of <a href="management.html#type-ExtensionInfo">ExtensionInfo</a>.</dd>
+          <dd>This should be the id from an item of <a href="experimental.management.html#type-ExtensionInfo">ExtensionInfo</a>.</dd>
           <dd style="display: none; ">
             This parameter was added in version
             <b><span></span></b>.
@@ -1144,7 +1139,7 @@ The <code>chrome.management</code> module provides ways to manage the list of ex
 
               <div class="summary">
                 <!-- Note: intentionally longer 80 columns -->
-                <span class="subdued">chrome.management.</span><span>onDisabled</span><span class="subdued">.addListener</span>(function(<span>ExtensionInfo info</span>) <span class="subdued">{...}</span>);
+                <span class="subdued">chrome.experimental.management.</span><span>onDisabled</span><span class="subdued">.addListener</span>(function(<span>ExtensionInfo info</span>) <span class="subdued">{...}</span>);
               </div>
 
               <div class="description">
@@ -1167,7 +1162,7 @@ The <code>chrome.management</code> module provides ways to manage the list of ex
                     <span class="enum" style="display: none; ">enumerated</span>
                     <span id="typeTemplate">
                       <span>
-                        <a href="management.html#type-ExtensionInfo">ExtensionInfo</a>
+                        <a href="experimental.management.html#type-ExtensionInfo">ExtensionInfo</a>
                       </span>
                       <span style="display: none; ">
                         <span>
@@ -1225,7 +1220,7 @@ The <code>chrome.management</code> module provides ways to manage the list of ex
 
               <div class="summary">
                 <!-- Note: intentionally longer 80 columns -->
-                <span class="subdued">chrome.management.</span><span>onEnabled</span><span class="subdued">.addListener</span>(function(<span>ExtensionInfo info</span>) <span class="subdued">{...}</span>);
+                <span class="subdued">chrome.experimental.management.</span><span>onEnabled</span><span class="subdued">.addListener</span>(function(<span>ExtensionInfo info</span>) <span class="subdued">{...}</span>);
               </div>
 
               <div class="description">
@@ -1248,7 +1243,7 @@ The <code>chrome.management</code> module provides ways to manage the list of ex
                     <span class="enum" style="display: none; ">enumerated</span>
                     <span id="typeTemplate">
                       <span>
-                        <a href="management.html#type-ExtensionInfo">ExtensionInfo</a>
+                        <a href="experimental.management.html#type-ExtensionInfo">ExtensionInfo</a>
                       </span>
                       <span style="display: none; ">
                         <span>
@@ -1306,7 +1301,7 @@ The <code>chrome.management</code> module provides ways to manage the list of ex
 
               <div class="summary">
                 <!-- Note: intentionally longer 80 columns -->
-                <span class="subdued">chrome.management.</span><span>onInstalled</span><span class="subdued">.addListener</span>(function(<span>ExtensionInfo info</span>) <span class="subdued">{...}</span>);
+                <span class="subdued">chrome.experimental.management.</span><span>onInstalled</span><span class="subdued">.addListener</span>(function(<span>ExtensionInfo info</span>) <span class="subdued">{...}</span>);
               </div>
 
               <div class="description">
@@ -1329,7 +1324,7 @@ The <code>chrome.management</code> module provides ways to manage the list of ex
                     <span class="enum" style="display: none; ">enumerated</span>
                     <span id="typeTemplate">
                       <span>
-                        <a href="management.html#type-ExtensionInfo">ExtensionInfo</a>
+                        <a href="experimental.management.html#type-ExtensionInfo">ExtensionInfo</a>
                       </span>
                       <span style="display: none; ">
                         <span>
@@ -1387,7 +1382,7 @@ The <code>chrome.management</code> module provides ways to manage the list of ex
 
               <div class="summary">
                 <!-- Note: intentionally longer 80 columns -->
-                <span class="subdued">chrome.management.</span><span>onUninstalled</span><span class="subdued">.addListener</span>(function(<span>string id</span>) <span class="subdued">{...}</span>);
+                <span class="subdued">chrome.experimental.management.</span><span>onUninstalled</span><span class="subdued">.addListener</span>(function(<span>string id</span>) <span class="subdued">{...}</span>);
               </div>
 
               <div class="description">
@@ -2118,7 +2113,7 @@ The <code>chrome.management</code> module provides ways to manage the list of ex
                         <span>
                           array of <span><span>
                       <span>
-                        <a href="management.html#type-IconInfo">IconInfo</a>
+                        <a href="experimental.management.html#type-IconInfo">IconInfo</a>
                       </span>
                       <span style="display: none; ">
                         <span>
diff --git a/chrome/common/extensions/docs/experimental.omnibox.html b/chrome/common/extensions/docs/experimental.omnibox.html
index 995f838..9d037b3 100644
--- a/chrome/common/extensions/docs/experimental.omnibox.html
+++ b/chrome/common/extensions/docs/experimental.omnibox.html
@@ -177,7 +177,6 @@
                   <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>
diff --git a/chrome/common/extensions/docs/experimental.processes.html b/chrome/common/extensions/docs/experimental.processes.html
index 5e0fbc9..0a3f3dc 100644
--- a/chrome/common/extensions/docs/experimental.processes.html
+++ b/chrome/common/extensions/docs/experimental.processes.html
@@ -177,7 +177,6 @@
                   <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>
diff --git a/chrome/common/extensions/docs/experimental.proxy.html b/chrome/common/extensions/docs/experimental.proxy.html
index 57d48f5..c392afe 100644
--- a/chrome/common/extensions/docs/experimental.proxy.html
+++ b/chrome/common/extensions/docs/experimental.proxy.html
@@ -177,7 +177,6 @@
                   <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>
diff --git a/chrome/common/extensions/docs/experimental.sidebar.html b/chrome/common/extensions/docs/experimental.sidebar.html
index eb9493b..fb092eb 100644
--- a/chrome/common/extensions/docs/experimental.sidebar.html
+++ b/chrome/common/extensions/docs/experimental.sidebar.html
@@ -177,7 +177,6 @@
                   <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>
diff --git a/chrome/common/extensions/docs/experimental.webNavigation.html b/chrome/common/extensions/docs/experimental.webNavigation.html
index 8ab76fc..b71aac33 100644
--- a/chrome/common/extensions/docs/experimental.webNavigation.html
+++ b/chrome/common/extensions/docs/experimental.webNavigation.html
@@ -177,7 +177,6 @@
                   <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>
diff --git a/chrome/common/extensions/docs/experimental.webRequest.html b/chrome/common/extensions/docs/experimental.webRequest.html
index 9615bcc..45f8d34 100644
--- a/chrome/common/extensions/docs/experimental.webRequest.html
+++ b/chrome/common/extensions/docs/experimental.webRequest.html
@@ -177,7 +177,6 @@
                   <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>
diff --git a/chrome/common/extensions/docs/extension.html b/chrome/common/extensions/docs/extension.html
index b361568..593984f 100644
--- a/chrome/common/extensions/docs/extension.html
+++ b/chrome/common/extensions/docs/extension.html
@@ -177,7 +177,6 @@
                   <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>
diff --git a/chrome/common/extensions/docs/external_extensions.html b/chrome/common/extensions/docs/external_extensions.html
index 6bf9e4f..357da72 100644
--- a/chrome/common/extensions/docs/external_extensions.html
+++ b/chrome/common/extensions/docs/external_extensions.html
@@ -177,7 +177,6 @@
                   <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>
diff --git a/chrome/common/extensions/docs/faq.html b/chrome/common/extensions/docs/faq.html
index 94ec93b..f6cc0d3 100644
--- a/chrome/common/extensions/docs/faq.html
+++ b/chrome/common/extensions/docs/faq.html
@@ -177,7 +177,6 @@
                   <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>
diff --git a/chrome/common/extensions/docs/getstarted.html b/chrome/common/extensions/docs/getstarted.html
index a3a10fc..ceacddf 100644
--- a/chrome/common/extensions/docs/getstarted.html
+++ b/chrome/common/extensions/docs/getstarted.html
@@ -177,7 +177,6 @@
                   <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>
diff --git a/chrome/common/extensions/docs/history.html b/chrome/common/extensions/docs/history.html
index 41b93ab..6a629ba 100644
--- a/chrome/common/extensions/docs/history.html
+++ b/chrome/common/extensions/docs/history.html
@@ -177,7 +177,6 @@
                   <li><a href="cookies.html">Cookies</a></li>
                   <li><a href="events.html">Events</a></li>
                   <li class="leftNavSelected">History</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>
diff --git a/chrome/common/extensions/docs/hosting.html b/chrome/common/extensions/docs/hosting.html
index 20267e7..85ed1867 100644
--- a/chrome/common/extensions/docs/hosting.html
+++ b/chrome/common/extensions/docs/hosting.html
@@ -177,7 +177,6 @@
                   <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>
diff --git a/chrome/common/extensions/docs/i18n-messages.html b/chrome/common/extensions/docs/i18n-messages.html
index 7ff4c33..d2f0f6b 100644
--- a/chrome/common/extensions/docs/i18n-messages.html
+++ b/chrome/common/extensions/docs/i18n-messages.html
@@ -177,7 +177,6 @@
                   <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>
diff --git a/chrome/common/extensions/docs/i18n.html b/chrome/common/extensions/docs/i18n.html
index 3b5c702..7ce891d 100644
--- a/chrome/common/extensions/docs/i18n.html
+++ b/chrome/common/extensions/docs/i18n.html
@@ -177,7 +177,6 @@
                   <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>
diff --git a/chrome/common/extensions/docs/idle.html b/chrome/common/extensions/docs/idle.html
index 2fd5dd8..1a2dedc 100644
--- a/chrome/common/extensions/docs/idle.html
+++ b/chrome/common/extensions/docs/idle.html
@@ -177,7 +177,6 @@
                   <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>
diff --git a/chrome/common/extensions/docs/index.html b/chrome/common/extensions/docs/index.html
index 826d74b..5b27cbf 100644
--- a/chrome/common/extensions/docs/index.html
+++ b/chrome/common/extensions/docs/index.html
@@ -177,7 +177,6 @@
                   <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>
diff --git a/chrome/common/extensions/docs/manifest.html b/chrome/common/extensions/docs/manifest.html
index d8bd4f4..07a06d0 100644
--- a/chrome/common/extensions/docs/manifest.html
+++ b/chrome/common/extensions/docs/manifest.html
@@ -177,7 +177,6 @@
                   <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>
diff --git a/chrome/common/extensions/docs/match_patterns.html b/chrome/common/extensions/docs/match_patterns.html
index 5e511b3..0965342 100644
--- a/chrome/common/extensions/docs/match_patterns.html
+++ b/chrome/common/extensions/docs/match_patterns.html
@@ -177,7 +177,6 @@
                   <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>
@@ -496,7 +495,7 @@ Here are some examples of <em>invalid</em> pattern matches:
 </tr>
 
 <tr>
-  <td><code>http://www.google.com</code></td>
+  <td><code>http://*</code></td>
   <td>No <em>path</em></td>
 </tr>
 
diff --git a/chrome/common/extensions/docs/messaging.html b/chrome/common/extensions/docs/messaging.html
index 120a03c..6cc3bd7 100644
--- a/chrome/common/extensions/docs/messaging.html
+++ b/chrome/common/extensions/docs/messaging.html
@@ -177,7 +177,6 @@
                   <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>
diff --git a/chrome/common/extensions/docs/notifications.html b/chrome/common/extensions/docs/notifications.html
index fd0567a..9e95058 100644
--- a/chrome/common/extensions/docs/notifications.html
+++ b/chrome/common/extensions/docs/notifications.html
@@ -177,7 +177,6 @@
                   <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>
diff --git a/chrome/common/extensions/docs/npapi.html b/chrome/common/extensions/docs/npapi.html
index 5190257..be509e5 100644
--- a/chrome/common/extensions/docs/npapi.html
+++ b/chrome/common/extensions/docs/npapi.html
@@ -177,7 +177,6 @@
                   <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>
diff --git a/chrome/common/extensions/docs/options.html b/chrome/common/extensions/docs/options.html
index 94dbfcf..000a81b 100644
--- a/chrome/common/extensions/docs/options.html
+++ b/chrome/common/extensions/docs/options.html
@@ -177,7 +177,6 @@
                   <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>
diff --git a/chrome/common/extensions/docs/override.html b/chrome/common/extensions/docs/override.html
index d1236c9..bb2253a 100644
--- a/chrome/common/extensions/docs/override.html
+++ b/chrome/common/extensions/docs/override.html
@@ -177,7 +177,6 @@
                   <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>
diff --git a/chrome/common/extensions/docs/overview.html b/chrome/common/extensions/docs/overview.html
index 2d9f9a1..66ec6eb 100644
--- a/chrome/common/extensions/docs/overview.html
+++ b/chrome/common/extensions/docs/overview.html
@@ -177,7 +177,6 @@
                   <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>
diff --git a/chrome/common/extensions/docs/packaging.html b/chrome/common/extensions/docs/packaging.html
index 5cbc1cc..79d8d7f 100644
--- a/chrome/common/extensions/docs/packaging.html
+++ b/chrome/common/extensions/docs/packaging.html
@@ -177,7 +177,6 @@
                   <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>
diff --git a/chrome/common/extensions/docs/pageAction.html b/chrome/common/extensions/docs/pageAction.html
index 9bd9388..a012cfb 100644
--- a/chrome/common/extensions/docs/pageAction.html
+++ b/chrome/common/extensions/docs/pageAction.html
@@ -177,7 +177,6 @@
                   <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>
diff --git a/chrome/common/extensions/docs/samples.html b/chrome/common/extensions/docs/samples.html
index 385b931..6882945 100644
--- a/chrome/common/extensions/docs/samples.html
+++ b/chrome/common/extensions/docs/samples.html
@@ -177,7 +177,6 @@
                   <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>
@@ -324,8 +323,6 @@
       </span><span>
         <a href="javascript:void(0);" onclick="setFilter('chrome.idle', this)">chrome.idle</a><span>, </span>
       </span><span>
-        <a href="javascript:void(0);" onclick="setFilter('chrome.management', this)">chrome.management</a><span>, </span>
-      </span><span>
         <a href="javascript:void(0);" onclick="setFilter('chrome.pageAction', this)">chrome.pageAction</a><span>, </span>
       </span><span>
         <a href="javascript:void(0);" onclick="setFilter('chrome.tabs', this)">chrome.tabs</a><span>, </span>
diff --git a/chrome/common/extensions/docs/samples.json b/chrome/common/extensions/docs/samples.json
index 9dd8085..f86db3f 100644
--- a/chrome/common/extensions/docs/samples.json
+++ b/chrome/common/extensions/docs/samples.json
@@ -22,8 +22,10 @@
     "chrome.extension.sendRequest": "extension.html#method-sendRequest", 
     "chrome.windows.getAll": "windows.html#method-getAll", 
     "chrome.tabs.captureVisibleTab": "tabs.html#method-captureVisibleTab", 
+    "chrome.experimental.management.onUninstalled": "experimental.management.html#event-onUninstalled", 
     "chrome.idle.onStateChanged": "idle.html#event-onStateChanged", 
     "chrome.i18n.getMessage": "i18n.html#method-getMessage", 
+    "chrome.experimental.management.onEnabled": "experimental.management.html#event-onEnabled", 
     "chrome.bookmarks.import": "bookmarks.html#method-import", 
     "chrome.extension.onConnect": "extension.html#event-onConnect", 
     "chrome.bookmarks.removeTree": "bookmarks.html#method-removeTree", 
@@ -36,14 +38,11 @@
     "chrome.bookmarks.onChanged": "bookmarks.html#event-onChanged", 
     "chrome.tabs.detectLanguage": "tabs.html#method-detectLanguage", 
     "chrome.windows.onRemoved": "windows.html#event-onRemoved", 
-    "chrome.management.uninstall": "management.html#method-uninstall", 
     "chrome.experimental.clipboard.executePaste": "experimental.clipboard.html#method-executePaste", 
     "chrome.experimental.webNavigation.onCompleted": "experimental.webNavigation.html#event-onCompleted", 
-    "chrome.management.setEnabled": "management.html#method-setEnabled", 
     "chrome.tabs.update": "tabs.html#method-update", 
     "chrome.history.deleteRange": "history.html#method-deleteRange", 
     "chrome.tabs.connect": "tabs.html#method-connect", 
-    "chrome.management.onEnabled": "management.html#event-onEnabled", 
     "chrome.cookies.set": "cookies.html#method-set", 
     "chrome.experimental.sidebar.setBadgeText": "experimental.sidebar.html#method-setBadgeText", 
     "chrome.experimental.webNavigation.onBeforeNavigate": "experimental.webNavigation.html#event-onBeforeNavigate", 
@@ -53,7 +52,6 @@
     "chrome.experimental.webRequest.onBeforeRedirect": "experimental.webRequest.html#event-onBeforeRedirect", 
     "chrome.tabs.getCurrent": "tabs.html#method-getCurrent", 
     "chrome.experimental.sidebar.getState": "experimental.sidebar.html#method-getState", 
-    "chrome.management.launchApp": "management.html#method-launchApp", 
     "chrome.browserAction.setTitle": "browserAction.html#method-setTitle", 
     "chrome.contextMenus.remove": "contextMenus.html#method-remove", 
     "chrome.experimental.omnibox.onInputStarted": "experimental.omnibox.html#event-onInputStarted", 
@@ -61,7 +59,6 @@
     "chrome.tabs.create": "tabs.html#method-create", 
     "chrome.cookies.get": "cookies.html#method-get", 
     "chrome.experimental.webRequest.onBeforeRequest": "experimental.webRequest.html#event-onBeforeRequest", 
-    "chrome.management.onDisabled": "management.html#event-onDisabled", 
     "chrome.windows.onCreated": "windows.html#event-onCreated", 
     "chrome.experimental.webNavigation.onCommitted": "experimental.webNavigation.html#event-onCommitted", 
     "chrome.bookmarks.create": "bookmarks.html#method-create", 
@@ -74,10 +71,10 @@
     "chrome.experimental.webRequest.onCompleted": "experimental.webRequest.html#event-onCompleted", 
     "chrome.bookmarks.onCreated": "bookmarks.html#event-onCreated", 
     "chrome.pageAction.show": "pageAction.html#method-show", 
-    "chrome.management.onInstalled": "management.html#event-onInstalled", 
     "chrome.bookmarks.search": "bookmarks.html#method-search", 
     "chrome.extension.onRequest": "extension.html#event-onRequest", 
     "chrome.extension.getBackgroundPage": "extension.html#method-getBackgroundPage", 
+    "chrome.experimental.management.launchApp": "experimental.management.html#method-launchApp", 
     "chrome.pageAction.hide": "pageAction.html#method-hide", 
     "chrome.experimental.omnibox.styleMatch": "experimental.omnibox.html#method-styleMatch", 
     "chrome.experimental.sidebar.expand": "experimental.sidebar.html#method-expand", 
@@ -94,6 +91,7 @@
     "chrome.cookies.getAll": "cookies.html#method-getAll", 
     "chrome.extension.onRequestExternal": "extension.html#event-onRequestExternal", 
     "chrome.bookmarks.onRemoved": "bookmarks.html#event-onRemoved", 
+    "chrome.experimental.management.onDisabled": "experimental.management.html#event-onDisabled", 
     "chrome.contextMenus.update": "contextMenus.html#method-update", 
     "chrome.experimental.sidebar.setTitle": "experimental.sidebar.html#method-setTitle", 
     "chrome.bookmarks.export": "bookmarks.html#method-export", 
@@ -102,8 +100,7 @@
     "chrome.experimental.sidebar.show": "experimental.sidebar.html#method-show", 
     "chrome.tabs.onSelectionChanged": "tabs.html#event-onSelectionChanged", 
     "chrome.cookies.onChanged": "cookies.html#event-onChanged", 
-    "chrome.management.getAll": "management.html#method-getAll", 
-    "chrome.management.onUninstalled": "management.html#event-onUninstalled", 
+    "chrome.experimental.management.uninstall": "experimental.management.html#method-uninstall", 
     "chrome.windows.update": "windows.html#method-update", 
     "chrome.extension.getURL": "extension.html#method-getURL", 
     "chrome.idle.queryState": "idle.html#method-queryState", 
@@ -123,14 +120,17 @@
     "chrome.experimental.proxy.useCustomProxySettings": "experimental.proxy.html#method-useCustomProxySettings", 
     "chrome.browserAction.setPopup": "browserAction.html#method-setPopup", 
     "chrome.bookmarks.onChildrenReordered": "bookmarks.html#event-onChildrenReordered", 
+    "chrome.experimental.management.onInstalled": "experimental.management.html#event-onInstalled", 
     "chrome.experimental.webRequest.onRequestSent": "experimental.webRequest.html#event-onRequestSent", 
     "chrome.extension.getToolstrips": "extension.html#method-getToolstrips", 
     "chrome.history.onVisited": "history.html#event-onVisited", 
     "chrome.tabs.onUpdated": "tabs.html#event-onUpdated", 
+    "chrome.experimental.management.setEnabled": "experimental.management.html#method-setEnabled", 
     "chrome.history.deleteAll": "history.html#method-deleteAll", 
     "chrome.experimental.webNavigation.onDOMContentLoaded": "experimental.webNavigation.html#event-onDOMContentLoaded", 
     "chrome.tabs.getAllInWindow": "tabs.html#method-getAllInWindow", 
     "chrome.contextMenus.create": "contextMenus.html#method-create", 
+    "chrome.experimental.management.getAll": "experimental.management.html#method-getAll", 
     "chrome.tabs.getSelected": "tabs.html#method-getSelected", 
     "chrome.tabs.onAttached": "tabs.html#event-onAttached", 
     "chrome.tabs.remove": "tabs.html#method-remove", 
diff --git a/chrome/common/extensions/docs/static/experimental.management.html b/chrome/common/extensions/docs/static/experimental.management.html
new file mode 100644
index 0000000..aa2fafb5
--- /dev/null
+++ b/chrome/common/extensions/docs/static/experimental.management.html
@@ -0,0 +1,2 @@
+<!-- BEGIN AUTHORED CONTENT -->
+<!-- END AUTHORED CONTENT -->
diff --git a/chrome/common/extensions/docs/static/management.html b/chrome/common/extensions/docs/static/management.html
deleted file mode 100644
index 11bdc96..0000000
--- a/chrome/common/extensions/docs/static/management.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<div id="pageData-name" class="pageData">Management</div>
-<!-- BEGIN AUTHORED CONTENT -->
-<p id="classSummary">
-The <code>chrome.management</code> module provides ways to manage the list of extensions/apps that are installed and running. It is particularly useful for extensions that <a href="override.html">override</a> the built-in New Tab page.
-</p>
-<!-- END AUTHORED CONTENT -->
diff --git a/chrome/common/extensions/docs/tabs.html b/chrome/common/extensions/docs/tabs.html
index 6bf0999..17799d1 100644
--- a/chrome/common/extensions/docs/tabs.html
+++ b/chrome/common/extensions/docs/tabs.html
@@ -177,7 +177,6 @@
                   <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 class="leftNavSelected">Tabs</li>
                   <li><a href="windows.html">Windows</a></li>
                 </ul>
diff --git a/chrome/common/extensions/docs/template/api_template.html b/chrome/common/extensions/docs/template/api_template.html
index 75f089d..adfc0b1 100644
--- a/chrome/common/extensions/docs/template/api_template.html
+++ b/chrome/common/extensions/docs/template/api_template.html
@@ -164,7 +164,6 @@
                   <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>
diff --git a/chrome/common/extensions/docs/themes.html b/chrome/common/extensions/docs/themes.html
index 0f4912d..dfac356 100644
--- a/chrome/common/extensions/docs/themes.html
+++ b/chrome/common/extensions/docs/themes.html
@@ -177,7 +177,6 @@
                   <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>
diff --git a/chrome/common/extensions/docs/tut_analytics.html b/chrome/common/extensions/docs/tut_analytics.html
index 6f6dafd..b38b7ae 100644
--- a/chrome/common/extensions/docs/tut_analytics.html
+++ b/chrome/common/extensions/docs/tut_analytics.html
@@ -177,7 +177,6 @@
                   <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>
diff --git a/chrome/common/extensions/docs/tut_debugging.html b/chrome/common/extensions/docs/tut_debugging.html
index 9d62494..7336438 100644
--- a/chrome/common/extensions/docs/tut_debugging.html
+++ b/chrome/common/extensions/docs/tut_debugging.html
@@ -177,7 +177,6 @@
                   <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>
diff --git a/chrome/common/extensions/docs/tut_oauth.html b/chrome/common/extensions/docs/tut_oauth.html
index bab5072..2a66618 100644
--- a/chrome/common/extensions/docs/tut_oauth.html
+++ b/chrome/common/extensions/docs/tut_oauth.html
@@ -177,7 +177,6 @@
                   <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>
diff --git a/chrome/common/extensions/docs/tutorials.html b/chrome/common/extensions/docs/tutorials.html
index c7bc92d..7ab350c 100644
--- a/chrome/common/extensions/docs/tutorials.html
+++ b/chrome/common/extensions/docs/tutorials.html
@@ -177,7 +177,6 @@
                   <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>
diff --git a/chrome/common/extensions/docs/whats_new.html b/chrome/common/extensions/docs/whats_new.html
index 2bc0633..fd7a196a 100644
--- a/chrome/common/extensions/docs/whats_new.html
+++ b/chrome/common/extensions/docs/whats_new.html
@@ -177,7 +177,6 @@
                   <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>
diff --git a/chrome/common/extensions/docs/windows.html b/chrome/common/extensions/docs/windows.html
index 0ed4523..9e928e2c 100644
--- a/chrome/common/extensions/docs/windows.html
+++ b/chrome/common/extensions/docs/windows.html
@@ -177,7 +177,6 @@
                   <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 class="leftNavSelected">Windows</li>
                 </ul>
diff --git a/chrome/common/extensions/docs/xhr.html b/chrome/common/extensions/docs/xhr.html
index 5c0176f..c304f6f4 100644
--- a/chrome/common/extensions/docs/xhr.html
+++ b/chrome/common/extensions/docs/xhr.html
@@ -177,7 +177,6 @@
                   <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>
diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc
index 4668c45..b88e7c1 100644
--- a/chrome/common/extensions/extension.cc
+++ b/chrome/common/extensions/extension.cc
@@ -200,7 +200,6 @@ const char Extension::kExperimentalPermission[] = "experimental";
 const char Extension::kGeolocationPermission[] = "geolocation";
 const char Extension::kHistoryPermission[] = "history";
 const char Extension::kIdlePermission[] = "idle";
-const char Extension::kManagementPermission[] = "management";
 const char Extension::kNotificationPermission[] = "notifications";
 const char Extension::kProxyPermission[] = "proxy";
 const char Extension::kTabPermission[] = "tabs";
@@ -219,7 +218,6 @@ const Extension::Permission Extension::kPermissions[] = {
   { kGeolocationPermission, IDS_EXTENSION_PROMPT2_WARNING_GEOLOCATION },
   { kIdlePermission, 0 },
   { kHistoryPermission, IDS_EXTENSION_PROMPT2_WARNING_BROWSING_HISTORY },
-  { kManagementPermission, IDS_EXTENSION_PROMPT2_WARNING_MANAGEMENT },
   { kNotificationPermission, 0 },
   { kProxyPermission, 0 },
   { kTabPermission, IDS_EXTENSION_PROMPT2_WARNING_BROWSING_HISTORY },
diff --git a/chrome/common/extensions/extension.h b/chrome/common/extensions/extension.h
index 9172b4f..f55ffe0 100644
--- a/chrome/common/extensions/extension.h
+++ b/chrome/common/extensions/extension.h
@@ -179,7 +179,6 @@ class Extension {
   static const char kGeolocationPermission[];
   static const char kHistoryPermission[];
   static const char kIdlePermission[];
-  static const char kManagementPermission[];
   static const char kNotificationPermission[];
   static const char kProxyPermission[];
   static const char kTabPermission[];
diff --git a/chrome/renderer/resources/renderer_extension_bindings.js b/chrome/renderer/resources/renderer_extension_bindings.js
index 79a20d2..90a68bc 100644
--- a/chrome/renderer/resources/renderer_extension_bindings.js
+++ b/chrome/renderer/resources/renderer_extension_bindings.js
@@ -260,6 +260,7 @@ var chrome = chrome || {};
       "experimental.extension",
       "experimental.infobars",
       "experimental.input",
+      "experimental.management",
       "experimental.metrics",
       "experimental.omnibox",
       "experimental.popup",
@@ -272,7 +273,6 @@ var chrome = chrome || {};
       "experimental.webRequest",
       "history",
       "idle",
-      "management",
       "pageAction",
       "pageActions",
       "tabs",
diff --git a/chrome/test/data/extensions/api_test/management/test/common.js b/chrome/test/data/extensions/api_test/management/test/common.js
index c1ae52e..744ced4 100644
--- a/chrome/test/data/extensions/api_test/management/test/common.js
+++ b/chrome/test/data/extensions/api_test/management/test/common.js
@@ -2,6 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+if (!chrome.management) {
+  chrome.management = chrome.experimental.management;
+}
+
 var assertEq = chrome.test.assertEq;
 var assertFalse = chrome.test.assertFalse;
 var assertNoLastError = chrome.test.assertNoLastError;
diff --git a/chrome/test/data/extensions/api_test/management/test/manifest.json b/chrome/test/data/extensions/api_test/management/test/manifest.json
index 4c25179..a5915d4 100644
--- a/chrome/test/data/extensions/api_test/management/test/manifest.json
+++ b/chrome/test/data/extensions/api_test/management/test/manifest.json
@@ -1,5 +1,5 @@
 {
   "name": "Extension Management API Test",
   "version": "0.1",
-  "permissions": ["management"]
+  "permissions": ["experimental"]
 }
diff --git a/chrome/test/data/extensions/management/install_event/manifest.json b/chrome/test/data/extensions/management/install_event/manifest.json
index 7bbe8af..79a5831 100644
--- a/chrome/test/data/extensions/management/install_event/manifest.json
+++ b/chrome/test/data/extensions/management/install_event/manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "Install event test",
   "version": "0.1",
-  "permissions": ["management"],
+  "permissions": ["experimental"],
   "background_page": "background.html"
 }
 
diff --git a/chrome/test/data/extensions/management/install_event/test.js b/chrome/test/data/extensions/management/install_event/test.js
index afdf6f8..09ef1c4 100644
--- a/chrome/test/data/extensions/management/install_event/test.js
+++ b/chrome/test/data/extensions/management/install_event/test.js
@@ -2,6 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+if (!chrome.management) {
+  chrome.management = chrome.experimental.management;
+}
+
 chrome.management.onInstalled.addListener(function(info) {
   if (info.name == "enabled_extension") {
     chrome.test.sendMessage("got_event");
diff --git a/chrome/test/data/extensions/management/launch_app/manifest.json b/chrome/test/data/extensions/management/launch_app/manifest.json
index ebbae31..a4813de 100644
--- a/chrome/test/data/extensions/management/launch_app/manifest.json
+++ b/chrome/test/data/extensions/management/launch_app/manifest.json
@@ -1,6 +1,6 @@
 {
   "name": "Launch App test extension",
   "version": "1",
-  "permissions": ["management"],
+  "permissions": ["experimental"],
   "background_page": "background.html"
 }
\ No newline at end of file
diff --git a/chrome/test/data/extensions/management/launch_app/test.js b/chrome/test/data/extensions/management/launch_app/test.js
index ee2e2c5..dad2be4 100644
--- a/chrome/test/data/extensions/management/launch_app/test.js
+++ b/chrome/test/data/extensions/management/launch_app/test.js
@@ -2,6 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+if (!chrome.management) {
+  chrome.management = chrome.experimental.management;
+}
+
 window.onload = function() {
   chrome.management.getAll(function(items) {
     for (var i in items) {