Move Proxy Settings API out of experimental

chrome/common/extensions/docs/samples.json

Index: chrome/common/extensions/docs/samples.json
diff --git a/chrome/common/extensions/docs/samples.json b/chrome/common/extensions/docs/samples.json
index 05b9462d704f53d1132ce75b1d9e99a67dd7330a..4446b13d507ea6c9e399c4f426eddca59ae0d65c 100644
--- a/chrome/common/extensions/docs/samples.json
+++ b/chrome/common/extensions/docs/samples.json
@@ -48,7 +48,6 @@
     "chrome.experimental.infobars.show": "experimental.infobars.html#method-show",
     "chrome.experimental.processes.getProcessIdForTab": "experimental.processes.html#method-getProcessIdForTab",
     "chrome.experimental.processes.onUpdated": "experimental.processes.html#event-onUpdated",
-    "chrome.experimental.proxy.onProxyError": "experimental.proxy.html#event-onProxyError",
     "chrome.experimental.sidebar.collapse": "experimental.sidebar.html#method-collapse",
     "chrome.experimental.sidebar.expand": "experimental.sidebar.html#method-expand",
     "chrome.experimental.sidebar.getState": "experimental.sidebar.html#method-getState",
@@ -128,6 +127,7 @@
     "chrome.pageAction.setPopup": "pageAction.html#method-setPopup",
     "chrome.pageAction.setTitle": "pageAction.html#method-setTitle",
     "chrome.pageAction.show": "pageAction.html#method-show",
+    "chrome.proxy.onProxyError": "proxy.html#event-onProxyError",
     "chrome.tabs.captureVisibleTab": "tabs.html#method-captureVisibleTab",
     "chrome.tabs.connect": "tabs.html#method-connect",
     "chrome.tabs.create": "tabs.html#method-create",
@@ -1496,17 +1496,16 @@
         "chrome.browserAction.setBadgeBackgroundColor",
         "chrome.browserAction.setBadgeText",
         "chrome.browserAction.setTitle",
-        "chrome.experimental.proxy.onProxyError",
         "chrome.extension.isAllowedIncognitoAccess",
         "chrome.extension.onRequest",
         "chrome.extension.sendRequest",
-        "chrome.i18n.getMessage"
+        "chrome.i18n.getMessage",
+        "chrome.proxy.onProxyError"
       ],
       "description": "Set Chrome-specific proxies; a demonstration of Chrome's Proxy API",
       "features": [
         "background_page",
         "browser_action",
-        "experimental",
         "popup",
         "proxy"
       ],
@@ -1515,7 +1514,7 @@
       "name": "Proxy Settings",
       "path": "examples\/extensions\/proxy_configuration\/",
       "protocols": [],
-      "search_string": "PROXY SETTINGS SET CHROME-SPECIFIC PROXIES; A DEMONSTRATION OF CHROMES PROXY API BACKGROUND_PAGE BROWSER_ACTION EXPERIMENTAL POPUP PROXY CHROME.BROWSERACTION.SETBADGEBACKGROUNDCOLOR CHROME.BROWSERACTION.SETBADGETEXT CHROME.BROWSERACTION.SETTITLE CHROME.EXPERIMENTAL.PROXY.ONPROXYERROR CHROME.EXTENSION.ISALLOWEDINCOGNITOACCESS CHROME.EXTENSION.ONREQUEST CHROME.EXTENSION.SENDREQUEST CHROME.I18N.GETMESSAGE",
+      "search_string": "PROXY SETTINGS SET CHROME-SPECIFIC PROXIES; A DEMONSTRATION OF CHROMES PROXY API BACKGROUND_PAGE BROWSER_ACTION POPUP PROXY CHROME.BROWSERACTION.SETBADGEBACKGROUNDCOLOR CHROME.BROWSERACTION.SETBADGETEXT CHROME.BROWSERACTION.SETTITLE CHROME.EXTENSION.ISALLOWEDINCOGNITOACCESS CHROME.EXTENSION.ONREQUEST CHROME.EXTENSION.SENDREQUEST CHROME.I18N.GETMESSAGE CHROME.PROXY.ONPROXYERROR",
       "source_files": [
         "_locales\/en\/messages.json",
         "background.html",
@@ -1528,7 +1527,7 @@
         "test\/proxy_form_controller_test.js",
         "test\/unittest.css"
       ],
-      "source_hash": "41824e8c2ff0748a8db0ff20932c83306c4ed856",
+      "source_hash": "55d6ca0f234d93e7db769610a3738f998d094eaf",
       "zip_path": "examples\/extensions\/proxy_configuration.zip"
     },
     {