Move webNavigation out of experimental.

BUG=60100
TEST=none


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

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

20 files changed, 83 insertions, 115 deletions

diff --git a/chrome/browser/extensions/extension_webnavigation_api.h b/chrome/browser/extensions/extension_webnavigation_api.h
index bc5c8c9..92d0985 100644
--- a/chrome/browser/extensions/extension_webnavigation_api.h
+++ b/chrome/browser/extensions/extension_webnavigation_api.h
@@ -225,14 +225,14 @@ class ExtensionWebNavigationEventRouter : public NotificationObserver {
 class GetFrameFunction : public SyncExtensionFunction {
   virtual ~GetFrameFunction() {}
   virtual bool RunImpl() OVERRIDE;
-  DECLARE_EXTENSION_FUNCTION_NAME("experimental.webNavigation.getFrame")
+  DECLARE_EXTENSION_FUNCTION_NAME("webNavigation.getFrame")
 };
 
 // API function that returns the states of all frames in a given tab.
 class GetAllFramesFunction : public SyncExtensionFunction {
   virtual ~GetAllFramesFunction() {}
   virtual bool RunImpl() OVERRIDE;
-  DECLARE_EXTENSION_FUNCTION_NAME("experimental.webNavigation.getAllFrames")
+  DECLARE_EXTENSION_FUNCTION_NAME("webNavigation.getAllFrames")
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_WEBNAVIGATION_API_H_
diff --git a/chrome/browser/extensions/extension_webnavigation_api_constants.cc b/chrome/browser/extensions/extension_webnavigation_api_constants.cc
index ed47e3c..e57ebd5 100644
--- a/chrome/browser/extensions/extension_webnavigation_api_constants.cc
+++ b/chrome/browser/extensions/extension_webnavigation_api_constants.cc
@@ -17,15 +17,15 @@ const char kTransitionTypeKey[] = "transitionType";
 const char kTransitionQualifiersKey[] = "transitionQualifiers";
 const char kUrlKey[] = "url";
 
-const char kOnBeforeNavigate[] = "experimental.webNavigation.onBeforeNavigate";
-const char kOnCommitted[] = "experimental.webNavigation.onCommitted";
-const char kOnCompleted[] = "experimental.webNavigation.onCompleted";
+const char kOnBeforeNavigate[] = "webNavigation.onBeforeNavigate";
+const char kOnCommitted[] = "webNavigation.onCommitted";
+const char kOnCompleted[] = "webNavigation.onCompleted";
 const char kOnCreatedNavigationTarget[] =
-    "experimental.webNavigation.onCreatedNavigationTarget";
+    "webNavigation.onCreatedNavigationTarget";
 const char kOnDOMContentLoaded[] =
-    "experimental.webNavigation.onDOMContentLoaded";
-const char kOnErrorOccurred[] = "experimental.webNavigation.onErrorOccurred";
+    "webNavigation.onDOMContentLoaded";
+const char kOnErrorOccurred[] = "webNavigation.onErrorOccurred";
 const char kOnReferenceFragmentUpdated[] =
-    "experimental.webNavigation.onReferenceFragmentUpdated";
+    "webNavigation.onReferenceFragmentUpdated";
 
 }  // namespace extension_webnavigation_api_constants
diff --git a/chrome/browser/extensions/extension_webnavigation_apitest.cc b/chrome/browser/extensions/extension_webnavigation_apitest.cc
index f7a6fa64..1996e28 100644
--- a/chrome/browser/extensions/extension_webnavigation_apitest.cc
+++ b/chrome/browser/extensions/extension_webnavigation_apitest.cc
@@ -39,9 +39,6 @@ class TestRenderViewContextMenu : public RenderViewContextMenu {
 }  // namespace
 
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigation) {
-  CommandLine::ForCurrentProcess()->AppendSwitch(
-      switches::kEnableExperimentalExtensionApis);
-
   FrameNavigationState::set_allow_extension_scheme(true);
 
   ASSERT_TRUE(
@@ -49,9 +46,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigation) {
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigationGetFrame) {
-  CommandLine::ForCurrentProcess()->AppendSwitch(
-      switches::kEnableExperimentalExtensionApis);
-
   FrameNavigationState::set_allow_extension_scheme(true);
 
   ASSERT_TRUE(
@@ -59,9 +53,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigationGetFrame) {
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigationClientRedirect) {
-  CommandLine::ForCurrentProcess()->AppendSwitch(
-      switches::kEnableExperimentalExtensionApis);
-
   FrameNavigationState::set_allow_extension_scheme(true);
 
   ASSERT_TRUE(
@@ -70,9 +61,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigationClientRedirect) {
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigationServerRedirect) {
-  CommandLine::ForCurrentProcess()->AppendSwitch(
-      switches::kEnableExperimentalExtensionApis);
-
   FrameNavigationState::set_allow_extension_scheme(true);
   host_resolver()->AddRule("*", "127.0.0.1");
   ASSERT_TRUE(StartTestServer());
@@ -83,9 +71,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigationServerRedirect) {
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigationForwardBack) {
-  CommandLine::ForCurrentProcess()->AppendSwitch(
-      switches::kEnableExperimentalExtensionApis);
-
   FrameNavigationState::set_allow_extension_scheme(true);
 
   ASSERT_TRUE(
@@ -94,9 +79,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigationForwardBack) {
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigationIFrame) {
-  CommandLine::ForCurrentProcess()->AppendSwitch(
-      switches::kEnableExperimentalExtensionApis);
-
   FrameNavigationState::set_allow_extension_scheme(true);
 
   ASSERT_TRUE(
@@ -104,9 +86,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigationIFrame) {
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigationOpenTab) {
-  CommandLine::ForCurrentProcess()->AppendSwitch(
-      switches::kEnableExperimentalExtensionApis);
-
   FrameNavigationState::set_allow_extension_scheme(true);
 
   ASSERT_TRUE(
@@ -114,9 +93,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigationOpenTab) {
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigationReferenceFragment) {
-  CommandLine::ForCurrentProcess()->AppendSwitch(
-      switches::kEnableExperimentalExtensionApis);
-
   FrameNavigationState::set_allow_extension_scheme(true);
 
   ASSERT_TRUE(
@@ -125,9 +101,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigationReferenceFragment) {
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigationSimpleLoad) {
-  CommandLine::ForCurrentProcess()->AppendSwitch(
-      switches::kEnableExperimentalExtensionApis);
-
   FrameNavigationState::set_allow_extension_scheme(true);
 
   ASSERT_TRUE(
@@ -135,9 +108,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigationSimpleLoad) {
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigationFailures) {
-  CommandLine::ForCurrentProcess()->AppendSwitch(
-      switches::kEnableExperimentalExtensionApis);
-
   FrameNavigationState::set_allow_extension_scheme(true);
 
   ASSERT_TRUE(
@@ -145,9 +115,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigationFailures) {
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigationUserAction) {
-  CommandLine::ForCurrentProcess()->AppendSwitch(
-      switches::kEnableExperimentalExtensionApis);
-
   FrameNavigationState::set_allow_extension_scheme(true);
 
   // Wait for the extension to set itself up and return control to us.
diff --git a/chrome/common/extensions/api/extension_api.json b/chrome/common/extensions/api/extension_api.json
index ce80470..d2a00b9 100644
--- a/chrome/common/extensions/api/extension_api.json
+++ b/chrome/common/extensions/api/extension_api.json
@@ -5553,7 +5553,7 @@
     "events": []
   },
   {
-    "namespace": "experimental.webNavigation",
+    "namespace": "webNavigation",
     "types": [],
     "functions": [
       {
diff --git a/chrome/common/extensions/docs/api_index.html b/chrome/common/extensions/docs/api_index.html
index aa74244..25f43f8 100644
--- a/chrome/common/extensions/docs/api_index.html
+++ b/chrome/common/extensions/docs/api_index.html
@@ -341,7 +341,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="fileBrowserHandler.html" js="">fileBrowserHandler</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="omnibox.html" js="">omnibox</a></li><li><a href="pageAction.html" js="">pageAction</a></li><li><a href="proxy.html" js="">proxy</a></li><li><a href="tabs.html" js="">tabs</a></li><li><a href="tts.html" js="">tts</a></li><li><a href="ttsEngine.html" js="">ttsEngine</a></li><li><a href="types.html" js="">types</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="fileBrowserHandler.html" js="">fileBrowserHandler</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="omnibox.html" js="">omnibox</a></li><li><a href="pageAction.html" js="">pageAction</a></li><li><a href="proxy.html" js="">proxy</a></li><li><a href="tabs.html" js="">tabs</a></li><li><a href="tts.html" js="">tts</a></li><li><a href="ttsEngine.html" js="">ttsEngine</a></li><li><a href="types.html" js="">types</a></li><li><a href="webNavigation.html" js="">webNavigation</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/examples/api/webNavigation/basic/background.html b/chrome/common/extensions/docs/examples/api/webNavigation/basic/background.html
index 21d7624..8fd010d 100644
--- a/chrome/common/extensions/docs/examples/api/webNavigation/basic/background.html
+++ b/chrome/common/extensions/docs/examples/api/webNavigation/basic/background.html
@@ -18,7 +18,7 @@
           'onErrorOccurred', 'onReferenceFragmentUpdated'];
 
       eventList.forEach(function(e) {
-        chrome.experimental.webNavigation[e].addListener(function(data) {
+        chrome.webNavigation[e].addListener(function(data) {
           if (typeof data)
             console.log(chrome.i18n.getMessage('inHandler'), e, data);
           else
diff --git a/chrome/common/extensions/docs/examples/api/webNavigation/basic/manifest.json b/chrome/common/extensions/docs/examples/api/webNavigation/basic/manifest.json
index 538417e..fbacce1 100644
--- a/chrome/common/extensions/docs/examples/api/webNavigation/basic/manifest.json
+++ b/chrome/common/extensions/docs/examples/api/webNavigation/basic/manifest.json
@@ -10,7 +10,6 @@
   },
   "permissions":    [
     "extension",
-    "experimental",
     "webNavigation"
   ]
 }
diff --git a/chrome/common/extensions/docs/examples/api/webNavigation/basic/navigation_collector.js b/chrome/common/extensions/docs/examples/api/webNavigation/basic/navigation_collector.js
index 466cee9..15b7fa1 100644
--- a/chrome/common/extensions/docs/examples/api/webNavigation/basic/navigation_collector.js
+++ b/chrome/common/extensions/docs/examples/api/webNavigation/basic/navigation_collector.js
@@ -48,17 +48,17 @@ function NavigationCollector() {
   // Bind handlers to the 'webNavigation' events that we're interested
   // in handling in order to build up a complete picture of the whole
   // navigation event.
-  chrome.experimental.webNavigation.onCreatedNavigationTarget.addListener(
+  chrome.webNavigation.onCreatedNavigationTarget.addListener(
       this.onCreatedNavigationTargetListener_.bind(this));
-  chrome.experimental.webNavigation.onBeforeNavigate.addListener(
+  chrome.webNavigation.onBeforeNavigate.addListener(
       this.onBeforeNavigateListener_.bind(this));
-  chrome.experimental.webNavigation.onCompleted.addListener(
+  chrome.webNavigation.onCompleted.addListener(
       this.onCompletedListener_.bind(this));
-  chrome.experimental.webNavigation.onCommitted.addListener(
+  chrome.webNavigation.onCommitted.addListener(
       this.onCommittedListener_.bind(this));
-  chrome.experimental.webNavigation.onErrorOccurred.addListener(
+  chrome.webNavigation.onErrorOccurred.addListener(
       this.onErrorOccurredListener_.bind(this));
-  chrome.experimental.webNavigation.onReferenceFragmentUpdated.addListener(
+  chrome.webNavigation.onReferenceFragmentUpdated.addListener(
       this.onReferenceFragmentUpdatedListener_.bind(this));
 
   // Bind handler to extension messages for communication from popup.
diff --git a/chrome/common/extensions/docs/experimental.html b/chrome/common/extensions/docs/experimental.html
index d00dc75..ef0ed5b 100644
--- a/chrome/common/extensions/docs/experimental.html
+++ b/chrome/common/extensions/docs/experimental.html
@@ -374,7 +374,6 @@ on the following experimental APIs:
   <a href="experimental.savePage.html">experimental.savePage</a></li><li>
   <a href="experimental.settings.html">experimental.settings</a></li><li>
   <a href="experimental.speechInput.html">experimental.speechInput</a></li><li>
-  <a href="experimental.webNavigation.html">experimental.webNavigation</a></li><li>
   <a href="experimental.webRequest.html">experimental.webRequest</a></li>
 </ul>
 
diff --git a/chrome/common/extensions/docs/samples.html b/chrome/common/extensions/docs/samples.html
index e028164..fdc3aa0 100644
--- a/chrome/common/extensions/docs/samples.html
+++ b/chrome/common/extensions/docs/samples.html
@@ -370,7 +370,7 @@
   "230463f2d5c3d4d0ca13c230e1f00f2aae0a8a64": "TAB INSPECTOR UTILITY FOR WORKING WITH THE EXTENSION TABS API BACKGROUND_PAGE BROWSER_ACTION TABS CHROME.BROWSERACTION.ONCLICKED CHROME.EXTENSION.GETURL CHROME.TABS.CREATE CHROME.TABS.GET CHROME.TABS.GETALLINWINDOW CHROME.TABS.GETSELECTED CHROME.TABS.MOVE CHROME.TABS.ONATTACHED CHROME.TABS.ONCREATED CHROME.TABS.ONDETACHED CHROME.TABS.ONMOVED CHROME.TABS.ONREMOVED CHROME.TABS.ONSELECTIONCHANGED CHROME.TABS.ONUPDATED CHROME.TABS.REMOVE CHROME.TABS.UPDATE CHROME.WINDOWS.CREATE CHROME.WINDOWS.GET CHROME.WINDOWS.GETALL CHROME.WINDOWS.GETCURRENT CHROME.WINDOWS.GETLASTFOCUSED CHROME.WINDOWS.ONCREATED CHROME.WINDOWS.ONFOCUSCHANGED CHROME.WINDOWS.ONREMOVED CHROME.WINDOWS.REMOVE CHROME.WINDOWS.UPDATE",
   "e1697cacebad05218798bf3e8a0f724517f0e8c3": "TEST SCREENSHOT EXTENSION DEMONSTRATE SCREENSHOT FUNCTIONALITY IN THE CHROME.TABS API. NOTE: ONLY WORKS FOR CODE.GOOGLE.COM BACKGROUND_PAGE BROWSER_ACTION TABS CHROME.BROWSERACTION.ONCLICKED CHROME.EXTENSION.GETURL CHROME.EXTENSION.GETVIEWS CHROME.TABS.CAPTUREVISIBLETAB CHROME.TABS.CREATE CHROME.TABS.ONUPDATED",
   "b3de91ab04b7d7a2670ca7ee9d740eb42cead0b6": "TYPED URL HISTORY READS YOUR HISTORY, AND SHOWS THE TOP TEN PAGES YOU GO TO BY TYPING THE URL. BROWSER_ACTION HISTORY TABS CHROME.HISTORY.GETVISITS CHROME.HISTORY.SEARCH CHROME.TABS.CREATE",
-  "a3c674f7eb93621c590562ad3fa04de4f03f53a0": "WEBNAVIGATION TECH DEMO DEMONSTRATION OF THE WEBNAVIGATION EXTENSION API. BACKGROUND_PAGE BROWSER_ACTION EXPERIMENTAL EXTENSION POPUP WEBNAVIGATION CHROME.EXPERIMENTAL.WEBNAVIGATION.ONBEFORENAVIGATE CHROME.EXPERIMENTAL.WEBNAVIGATION.ONCOMMITTED CHROME.EXPERIMENTAL.WEBNAVIGATION.ONCOMPLETED CHROME.EXPERIMENTAL.WEBNAVIGATION.ONCREATEDNAVIGATIONTARGET CHROME.EXPERIMENTAL.WEBNAVIGATION.ONERROROCCURRED CHROME.EXPERIMENTAL.WEBNAVIGATION.ONREFERENCEFRAGMENTUPDATED CHROME.EXTENSION.ONREQUEST CHROME.EXTENSION.SENDREQUEST CHROME.I18N.GETMESSAGE",
+  "a3c674f7eb93621c590562ad3fa04de4f03f53a0": "WEBNAVIGATION TECH DEMO DEMONSTRATION OF THE WEBNAVIGATION EXTENSION API. BACKGROUND_PAGE BROWSER_ACTION EXTENSION POPUP WEBNAVIGATION CHROME.EXTENSION.ONREQUEST CHROME.EXTENSION.SENDREQUEST CHROME.I18N.GETMESSAGE CHROME.WEBNAVIGATION.ONBEFORENAVIGATE CHROME.WEBNAVIGATION.ONCOMMITTED CHROME.WEBNAVIGATION.ONCOMPLETED CHROME.WEBNAVIGATION.ONCREATEDNAVIGATIONTARGET CHROME.WEBNAVIGATION.ONERROROCCURRED CHROME.WEBNAVIGATION.ONREFERENCEFRAGMENTUPDATED",
   "0fa4abe6545f0316fea7cfa07c53aa48c4f3d018": "`EXTENSION.ISALLOWED???ACCESS` EXAMPLE DEMONSTRATES THE `EXTENSION.ISALLOWED???ACCESS` APIS BROWSER_ACTION CHROME.EXTENSION.ISALLOWEDFILESCHEMEACCESS CHROME.EXTENSION.ISALLOWEDINCOGNITOACCESS"
 };
 </script>
@@ -425,6 +425,8 @@
       </span><span>
         <a href="javascript:void(0);" onclick="setFilter('chrome.types', this)">chrome.types</a><span>, </span>
       </span><span>
+        <a href="javascript:void(0);" onclick="setFilter('chrome.webNavigation', this)">chrome.webNavigation</a><span>, </span>
+      </span><span>
         <a href="javascript:void(0);" onclick="setFilter('chrome.windows', this)">chrome.windows</a><span style="display: none; ">, </span>
       </span>
     </span>
@@ -3801,9 +3803,6 @@
       <strong>browser_action</strong><span>, </span>
       <span style="display: none; "> and</span>
     </span><span>
-      <strong>experimental</strong><span>, </span>
-      <span style="display: none; "> and</span>
-    </span><span>
       <strong>extension</strong><span>, </span>
       <span style="display: none; "> and</span>
     </span><span>
@@ -3818,23 +3817,23 @@
   <div class="apicalls"><strong>Calls:</strong>
     <ul>
       <li>
-        <code><a href="experimental.webNavigation.html#event-onBeforeNavigate">chrome.experimental.webNavigation.onBeforeNavigate</a></code>
+        <code><a href="extension.html#event-onRequest">chrome.extension.onRequest</a></code>
       </li><li>
-        <code><a href="experimental.webNavigation.html#event-onCommitted">chrome.experimental.webNavigation.onCommitted</a></code>
+        <code><a href="extension.html#method-sendRequest">chrome.extension.sendRequest</a></code>
       </li><li>
-        <code><a href="experimental.webNavigation.html#event-onCompleted">chrome.experimental.webNavigation.onCompleted</a></code>
+        <code><a href="i18n.html#method-getMessage">chrome.i18n.getMessage</a></code>
       </li><li>
-        <code><a href="experimental.webNavigation.html#event-onCreatedNavigationTarget">chrome.experimental.webNavigation.onCreatedNavigationTarget</a></code>
+        <code><a href="webNavigation.html#event-onBeforeNavigate">chrome.webNavigation.onBeforeNavigate</a></code>
       </li><li>
-        <code><a href="experimental.webNavigation.html#event-onErrorOccurred">chrome.experimental.webNavigation.onErrorOccurred</a></code>
+        <code><a href="webNavigation.html#event-onCommitted">chrome.webNavigation.onCommitted</a></code>
       </li><li>
-        <code><a href="experimental.webNavigation.html#event-onReferenceFragmentUpdated">chrome.experimental.webNavigation.onReferenceFragmentUpdated</a></code>
+        <code><a href="webNavigation.html#event-onCompleted">chrome.webNavigation.onCompleted</a></code>
       </li><li>
-        <code><a href="extension.html#event-onRequest">chrome.extension.onRequest</a></code>
+        <code><a href="webNavigation.html#event-onCreatedNavigationTarget">chrome.webNavigation.onCreatedNavigationTarget</a></code>
       </li><li>
-        <code><a href="extension.html#method-sendRequest">chrome.extension.sendRequest</a></code>
+        <code><a href="webNavigation.html#event-onErrorOccurred">chrome.webNavigation.onErrorOccurred</a></code>
       </li><li>
-        <code><a href="i18n.html#method-getMessage">chrome.i18n.getMessage</a></code>
+        <code><a href="webNavigation.html#event-onReferenceFragmentUpdated">chrome.webNavigation.onReferenceFragmentUpdated</a></code>
       </li>
     </ul>
   </div>
diff --git a/chrome/common/extensions/docs/samples.json b/chrome/common/extensions/docs/samples.json
index 4d68155..222c5f2 100644
--- a/chrome/common/extensions/docs/samples.json
+++ b/chrome/common/extensions/docs/samples.json
@@ -85,15 +85,6 @@
     "chrome.experimental.speechInput.onSoundStart": "experimental.speechInput.html#event-onSoundStart",
     "chrome.experimental.speechInput.start": "experimental.speechInput.html#method-start",
     "chrome.experimental.speechInput.stop": "experimental.speechInput.html#method-stop",
-    "chrome.experimental.webNavigation.getAllFrames": "experimental.webNavigation.html#method-getAllFrames",
-    "chrome.experimental.webNavigation.getFrame": "experimental.webNavigation.html#method-getFrame",
-    "chrome.experimental.webNavigation.onBeforeNavigate": "experimental.webNavigation.html#event-onBeforeNavigate",
-    "chrome.experimental.webNavigation.onCommitted": "experimental.webNavigation.html#event-onCommitted",
-    "chrome.experimental.webNavigation.onCompleted": "experimental.webNavigation.html#event-onCompleted",
-    "chrome.experimental.webNavigation.onCreatedNavigationTarget": "experimental.webNavigation.html#event-onCreatedNavigationTarget",
-    "chrome.experimental.webNavigation.onDOMContentLoaded": "experimental.webNavigation.html#event-onDOMContentLoaded",
-    "chrome.experimental.webNavigation.onErrorOccurred": "experimental.webNavigation.html#event-onErrorOccurred",
-    "chrome.experimental.webNavigation.onReferenceFragmentUpdated": "experimental.webNavigation.html#event-onReferenceFragmentUpdated",
     "chrome.experimental.webRequest.addEventListener": "experimental.webRequest.html#method-addEventListener",
     "chrome.experimental.webRequest.eventHandled": "experimental.webRequest.html#method-eventHandled",
     "chrome.experimental.webRequest.handlerBehaviorChanged": "experimental.webRequest.html#method-handlerBehaviorChanged",
@@ -190,6 +181,15 @@
     "chrome.ttsEngine.onSpeak": "ttsEngine.html#event-onSpeak",
     "chrome.ttsEngine.onStop": "ttsEngine.html#event-onStop",
     "chrome.ttsEngine.sendTtsEvent": "ttsEngine.html#method-sendTtsEvent",
+    "chrome.webNavigation.getAllFrames": "webNavigation.html#method-getAllFrames",
+    "chrome.webNavigation.getFrame": "webNavigation.html#method-getFrame",
+    "chrome.webNavigation.onBeforeNavigate": "webNavigation.html#event-onBeforeNavigate",
+    "chrome.webNavigation.onCommitted": "webNavigation.html#event-onCommitted",
+    "chrome.webNavigation.onCompleted": "webNavigation.html#event-onCompleted",
+    "chrome.webNavigation.onCreatedNavigationTarget": "webNavigation.html#event-onCreatedNavigationTarget",
+    "chrome.webNavigation.onDOMContentLoaded": "webNavigation.html#event-onDOMContentLoaded",
+    "chrome.webNavigation.onErrorOccurred": "webNavigation.html#event-onErrorOccurred",
+    "chrome.webNavigation.onReferenceFragmentUpdated": "webNavigation.html#event-onReferenceFragmentUpdated",
     "chrome.windows.create": "windows.html#method-create",
     "chrome.windows.get": "windows.html#method-get",
     "chrome.windows.getAll": "windows.html#method-getAll",
@@ -2079,22 +2079,21 @@
     },
     {
       "api_calls": [
-        "chrome.experimental.webNavigation.onBeforeNavigate",
-        "chrome.experimental.webNavigation.onCommitted",
-        "chrome.experimental.webNavigation.onCompleted",
-        "chrome.experimental.webNavigation.onCreatedNavigationTarget",
-        "chrome.experimental.webNavigation.onErrorOccurred",
-        "chrome.experimental.webNavigation.onReferenceFragmentUpdated",
         "chrome.extension.onRequest",
         "chrome.extension.sendRequest",
-        "chrome.i18n.getMessage"
+        "chrome.i18n.getMessage",
+        "chrome.webNavigation.onBeforeNavigate",
+        "chrome.webNavigation.onCommitted",
+        "chrome.webNavigation.onCompleted",
+        "chrome.webNavigation.onCreatedNavigationTarget",
+        "chrome.webNavigation.onErrorOccurred",
+        "chrome.webNavigation.onReferenceFragmentUpdated"
       ],
       "crx_path": null,
       "description": "Demonstration of the WebNavigation extension API.",
       "features": [
         "background_page",
         "browser_action",
-        "experimental",
         "extension",
         "popup",
         "webNavigation"
@@ -2104,7 +2103,7 @@
       "name": "WebNavigation Tech Demo",
       "path": "examples\/api\/webNavigation\/basic\/",
       "protocols": [],
-      "search_string": "WEBNAVIGATION TECH DEMO DEMONSTRATION OF THE WEBNAVIGATION EXTENSION API. BACKGROUND_PAGE BROWSER_ACTION EXPERIMENTAL EXTENSION POPUP WEBNAVIGATION CHROME.EXPERIMENTAL.WEBNAVIGATION.ONBEFORENAVIGATE CHROME.EXPERIMENTAL.WEBNAVIGATION.ONCOMMITTED CHROME.EXPERIMENTAL.WEBNAVIGATION.ONCOMPLETED CHROME.EXPERIMENTAL.WEBNAVIGATION.ONCREATEDNAVIGATIONTARGET CHROME.EXPERIMENTAL.WEBNAVIGATION.ONERROROCCURRED CHROME.EXPERIMENTAL.WEBNAVIGATION.ONREFERENCEFRAGMENTUPDATED CHROME.EXTENSION.ONREQUEST CHROME.EXTENSION.SENDREQUEST CHROME.I18N.GETMESSAGE",
+      "search_string": "WEBNAVIGATION TECH DEMO DEMONSTRATION OF THE WEBNAVIGATION EXTENSION API. BACKGROUND_PAGE BROWSER_ACTION EXTENSION POPUP WEBNAVIGATION CHROME.EXTENSION.ONREQUEST CHROME.EXTENSION.SENDREQUEST CHROME.I18N.GETMESSAGE CHROME.WEBNAVIGATION.ONBEFORENAVIGATE CHROME.WEBNAVIGATION.ONCOMMITTED CHROME.WEBNAVIGATION.ONCOMPLETED CHROME.WEBNAVIGATION.ONCREATEDNAVIGATIONTARGET CHROME.WEBNAVIGATION.ONERROROCCURRED CHROME.WEBNAVIGATION.ONREFERENCEFRAGMENTUPDATED",
       "source_files": [
         "_locales\/en\/messages.json",
         "background.html",
@@ -2112,7 +2111,7 @@
         "navigation_collector.js",
         "popup.html"
       ],
-      "source_hash": "457f91b9f0a9d41ee9a16aee6be2a194cef558c5",
+      "source_hash": "b6cda534937998343a093fdb74313a85edbc771e",
       "zip_path": "examples\/api\/webNavigation\/basic.zip"
     },
     {
diff --git a/chrome/common/extensions/docs/static/experimental.webNavigation.html b/chrome/common/extensions/docs/static/webNavigation.html
index b823e03..b823e03 100644
--- a/chrome/common/extensions/docs/static/experimental.webNavigation.html
+++ b/chrome/common/extensions/docs/static/webNavigation.html
diff --git a/chrome/common/extensions/docs/experimental.webNavigation.html b/chrome/common/extensions/docs/webNavigation.html
index 259923a..f197530 100644
--- a/chrome/common/extensions/docs/experimental.webNavigation.html
+++ b/chrome/common/extensions/docs/webNavigation.html
@@ -279,7 +279,7 @@
               </ol>
             </li>
               <li>
-                <a href="#apiReference">API reference: chrome.experimental.webNavigation</a>
+                <a href="#apiReference">API reference: chrome.webNavigation</a>
                 <ol>
                   <li style="display: none; ">
                     <a href="#properties">Properties</a>
@@ -405,7 +405,7 @@ unexpected results.
         <!-- API PAGE -->
         <div class="apiPage">
         <a name="apiReference"></a>
-        <h2>API reference: chrome.experimental.webNavigation</h2>
+        <h2>API reference: chrome.webNavigation</h2>
 
           <!-- PROPERTIES -->
           <div class="apiGroup" style="display: none; ">
@@ -437,7 +437,7 @@ unexpected results.
 
               <div class="summary"><span style="display: none; ">void</span>
                   <!-- Note: intentionally longer 80 columns -->
-                  <span>chrome.experimental.webNavigation.getAllFrames</span>(<span class="null"><span style="display: none; ">, </span><span>object</span>
+                  <span>chrome.webNavigation.getAllFrames</span>(<span class="null"><span style="display: none; ">, </span><span>object</span>
                       <var><span>details</span></var></span><span class="null"><span>, </span><span>function</span>
                       <var><span>callback</span></var></span>)</div>
 
@@ -778,7 +778,7 @@ unexpected results.
 
               <div class="summary"><span style="display: none; ">void</span>
                   <!-- Note: intentionally longer 80 columns -->
-                  <span>chrome.experimental.webNavigation.getFrame</span>(<span class="null"><span style="display: none; ">, </span><span>object</span>
+                  <span>chrome.webNavigation.getFrame</span>(<span class="null"><span style="display: none; ">, </span><span>object</span>
                       <var><span>details</span></var></span><span class="null"><span>, </span><span>function</span>
                       <var><span>callback</span></var></span>)</div>
 
@@ -1318,7 +1318,7 @@ unexpected results.
 
               <div class="summary">
                 <!-- Note: intentionally longer 80 columns -->
-                <span class="subdued">chrome.experimental.webNavigation.</span><span>onBeforeNavigate</span><span class="subdued">.addListener</span>(function(<span>object details</span>) <span class="subdued">{...}</span><span></span>);
+                <span class="subdued">chrome.webNavigation.</span><span>onBeforeNavigate</span><span class="subdued">.addListener</span>(function(<span>object details</span>) <span class="subdued">{...}</span><span></span>);
               </div>
 
               <div class="description">
@@ -1701,7 +1701,7 @@ unexpected results.
 
               <div class="summary">
                 <!-- Note: intentionally longer 80 columns -->
-                <span class="subdued">chrome.experimental.webNavigation.</span><span>onCommitted</span><span class="subdued">.addListener</span>(function(<span>object details</span>) <span class="subdued">{...}</span><span></span>);
+                <span class="subdued">chrome.webNavigation.</span><span>onCommitted</span><span class="subdued">.addListener</span>(function(<span>object details</span>) <span class="subdued">{...}</span><span></span>);
               </div>
 
               <div class="description">
@@ -2220,7 +2220,7 @@ unexpected results.
 
               <div class="summary">
                 <!-- Note: intentionally longer 80 columns -->
-                <span class="subdued">chrome.experimental.webNavigation.</span><span>onCompleted</span><span class="subdued">.addListener</span>(function(<span>object details</span>) <span class="subdued">{...}</span><span></span>);
+                <span class="subdued">chrome.webNavigation.</span><span>onCompleted</span><span class="subdued">.addListener</span>(function(<span>object details</span>) <span class="subdued">{...}</span><span></span>);
               </div>
 
               <div class="description">
@@ -2603,7 +2603,7 @@ unexpected results.
 
               <div class="summary">
                 <!-- Note: intentionally longer 80 columns -->
-                <span class="subdued">chrome.experimental.webNavigation.</span><span>onCreatedNavigationTarget</span><span class="subdued">.addListener</span>(function(<span>object details</span>) <span class="subdued">{...}</span><span></span>);
+                <span class="subdued">chrome.webNavigation.</span><span>onCreatedNavigationTarget</span><span class="subdued">.addListener</span>(function(<span>object details</span>) <span class="subdued">{...}</span><span></span>);
               </div>
 
               <div class="description">
@@ -3052,7 +3052,7 @@ unexpected results.
 
               <div class="summary">
                 <!-- Note: intentionally longer 80 columns -->
-                <span class="subdued">chrome.experimental.webNavigation.</span><span>onDOMContentLoaded</span><span class="subdued">.addListener</span>(function(<span>object details</span>) <span class="subdued">{...}</span><span></span>);
+                <span class="subdued">chrome.webNavigation.</span><span>onDOMContentLoaded</span><span class="subdued">.addListener</span>(function(<span>object details</span>) <span class="subdued">{...}</span><span></span>);
               </div>
 
               <div class="description">
@@ -3435,7 +3435,7 @@ unexpected results.
 
               <div class="summary">
                 <!-- Note: intentionally longer 80 columns -->
-                <span class="subdued">chrome.experimental.webNavigation.</span><span>onErrorOccurred</span><span class="subdued">.addListener</span>(function(<span>object details</span>) <span class="subdued">{...}</span><span></span>);
+                <span class="subdued">chrome.webNavigation.</span><span>onErrorOccurred</span><span class="subdued">.addListener</span>(function(<span>object details</span>) <span class="subdued">{...}</span><span></span>);
               </div>
 
               <div class="description">
@@ -3886,7 +3886,7 @@ unexpected results.
 
               <div class="summary">
                 <!-- Note: intentionally longer 80 columns -->
-                <span class="subdued">chrome.experimental.webNavigation.</span><span>onReferenceFragmentUpdated</span><span class="subdued">.addListener</span>(function(<span>object details</span>) <span class="subdued">{...}</span><span></span>);
+                <span class="subdued">chrome.webNavigation.</span><span>onReferenceFragmentUpdated</span><span class="subdued">.addListener</span>(function(<span>object details</span>) <span class="subdued">{...}</span><span></span>);
               </div>
 
               <div class="description">
diff --git a/chrome/common/extensions/extension_permission_set.cc b/chrome/common/extensions/extension_permission_set.cc
index 142d576..ee15ac8 100644
--- a/chrome/common/extensions/extension_permission_set.cc
+++ b/chrome/common/extensions/extension_permission_set.cc
@@ -310,6 +310,10 @@ ExtensionPermissionsInfo::ExtensionPermissionsInfo()
       IDS_EXTENSION_PROMPT_WARNING_TTS_ENGINE,
       ExtensionPermissionMessage::kTtsEngine, none);
   RegisterPermission(
+      ExtensionAPIPermission::kWebNavigation, "webNavigation",
+      IDS_EXTENSION_PROMPT_WARNING_TABS,
+      ExtensionPermissionMessage::kTabs, none);
+  RegisterPermission(
       ExtensionAPIPermission::kWebSocketProxyPrivate,
       "webSocketProxyPrivate", 0,
       ExtensionPermissionMessage::kNone, none);
diff --git a/chrome/common/extensions/extension_permission_set.h b/chrome/common/extensions/extension_permission_set.h
index f95fa48..a4d6358 100644
--- a/chrome/common/extensions/extension_permission_set.h
+++ b/chrome/common/extensions/extension_permission_set.h
@@ -121,6 +121,7 @@ class ExtensionAPIPermission {
     kTts,
     kTtsEngine,
     kUnlimitedStorage,
+    kWebNavigation,
     kWebSocketProxyPrivate,
     kWebstorePrivate,
     kEnumBoundary
diff --git a/chrome/renderer/resources/extensions/renderer_process_bindings.js b/chrome/renderer/resources/extensions/renderer_process_bindings.js
index 1e63948..5c5ba0c 100644
--- a/chrome/renderer/resources/extensions/renderer_process_bindings.js
+++ b/chrome/renderer/resources/extensions/renderer_process_bindings.js
@@ -327,7 +327,6 @@ var chrome = chrome || {};
       "experimental.savePage",
       "experimental.sidebar",
       "experimental.speechInput",
-      "experimental.webNavigation",
       "experimental.webRequest",
       "fileBrowserHandler",
       "fileBrowserPrivate",
@@ -347,6 +346,7 @@ var chrome = chrome || {};
       "tts",
       "ttsEngine",
       "types",
+      "webNavigation",
       "webSocketProxyPrivate",
       "webstorePrivate",
       "windows",
diff --git a/chrome/test/data/extensions/api_test/webnavigation/framework.js b/chrome/test/data/extensions/api_test/webnavigation/framework.js
index cf5a58c..7090c39 100644
--- a/chrome/test/data/extensions/api_test/webnavigation/framework.js
+++ b/chrome/test/data/extensions/api_test/webnavigation/framework.js
@@ -125,31 +125,31 @@ function initListeners() {
   if (initialized)
     return;
   initialized = true;
-  chrome.experimental.webNavigation.onBeforeNavigate.addListener(
+  chrome.webNavigation.onBeforeNavigate.addListener(
       function(details) {
     captureEvent("onBeforeNavigate", details);
   });
-  chrome.experimental.webNavigation.onCommitted.addListener(
+  chrome.webNavigation.onCommitted.addListener(
       function(details) {
     captureEvent("onCommitted", details);
   });
-  chrome.experimental.webNavigation.onDOMContentLoaded.addListener(
+  chrome.webNavigation.onDOMContentLoaded.addListener(
       function(details) {
     captureEvent("onDOMContentLoaded", details);
   });
-  chrome.experimental.webNavigation.onCompleted.addListener(
+  chrome.webNavigation.onCompleted.addListener(
       function(details) {
     captureEvent("onCompleted", details);
   });
-  chrome.experimental.webNavigation.onCreatedNavigationTarget.addListener(
+  chrome.webNavigation.onCreatedNavigationTarget.addListener(
       function(details) {
     captureEvent("onCreatedNavigationTarget", details);
   });
-  chrome.experimental.webNavigation.onReferenceFragmentUpdated.addListener(
+  chrome.webNavigation.onReferenceFragmentUpdated.addListener(
       function(details) {
     captureEvent("onReferenceFragmentUpdated", details);
   });
-  chrome.experimental.webNavigation.onErrorOccurred.addListener(
+  chrome.webNavigation.onErrorOccurred.addListener(
       function(details) {
     captureEvent("onErrorOccurred", details);
   });
diff --git a/chrome/test/data/extensions/api_test/webnavigation/manifest.json b/chrome/test/data/extensions/api_test/webnavigation/manifest.json
index f9ed942..0b64814 100644
--- a/chrome/test/data/extensions/api_test/webnavigation/manifest.json
+++ b/chrome/test/data/extensions/api_test/webnavigation/manifest.json
@@ -2,5 +2,5 @@
   "name": "webNavigation",
   "version": "1.0",
   "description": "Tests the webNavigation API events.",
-  "permissions": ["experimental", "tabs"]
+  "permissions": ["webNavigation", "tabs"]
 }
diff --git a/chrome/test/data/extensions/api_test/webnavigation/test_api.html b/chrome/test/data/extensions/api_test/webnavigation/test_api.html
index 1cc5ed8..3e0f4ca 100644
--- a/chrome/test/data/extensions/api_test/webnavigation/test_api.html
+++ b/chrome/test/data/extensions/api_test/webnavigation/test_api.html
@@ -1,15 +1,15 @@
 <script>
-chrome.experimental.webNavigation.onBeforeNavigate.addListener(
+chrome.webNavigation.onBeforeNavigate.addListener(
     function(details) {});
-chrome.experimental.webNavigation.onCommitted.addListener(
+chrome.webNavigation.onCommitted.addListener(
     function(details) {});
-chrome.experimental.webNavigation.onDOMContentLoaded.addListener(
+chrome.webNavigation.onDOMContentLoaded.addListener(
     function(details) {});
-chrome.experimental.webNavigation.onCompleted.addListener(
+chrome.webNavigation.onCompleted.addListener(
     function(details) {});
-chrome.experimental.webNavigation.onErrorOccurred.addListener(
+chrome.webNavigation.onErrorOccurred.addListener(
     function(details) {});
-chrome.experimental.webNavigation.onCreatedNavigationTarget.addListener(
+chrome.webNavigation.onCreatedNavigationTarget.addListener(
     function(details) {});
 chrome.test.notifyPass();
 </script>
diff --git a/chrome/test/data/extensions/api_test/webnavigation/test_getFrame.html b/chrome/test/data/extensions/api_test/webnavigation/test_getFrame.html
index d2bc0b8..24886f8 100644
--- a/chrome/test/data/extensions/api_test/webnavigation/test_getFrame.html
+++ b/chrome/test/data/extensions/api_test/webnavigation/test_getFrame.html
@@ -7,13 +7,13 @@ chrome.test.runTests([
     chrome.tabs.create({"url": "about:blank"}, function(tab) {
       tabId = tab.id;
       var done = chrome.test.listenForever(
-        chrome.experimental.webNavigation.onBeforeNavigate,
+        chrome.webNavigation.onBeforeNavigate,
         function (details) {
           if (details.tabId != tabId)
             return;
           if (details.url != URL)
             return;
-          chrome.experimental.webNavigation.getFrame(
+          chrome.webNavigation.getFrame(
               {tabId: tabId, frameId: 0},
               function(details) {
             chrome.test.assertEq({errorOccurred: false, url: URL},
@@ -26,7 +26,7 @@ chrome.test.runTests([
   },
 
   function testGetInvalidFrame() {
-    chrome.experimental.webNavigation.getFrame(
+    chrome.webNavigation.getFrame(
         {tabId: tabId, frameId: 1},
       function (details) {
         chrome.test.assertEq(null, details);
@@ -35,7 +35,7 @@ chrome.test.runTests([
   },
 
   function testGetAllFrames() {
-    chrome.experimental.webNavigation.getAllFrames(
+    chrome.webNavigation.getAllFrames(
         {tabId: tabId},
       function (details) {
         chrome.test.assertEq([{errorOccurred: false, frameId: 0, url: URL}],