Implementation of getCurrentProxySettings for proxy settings API.

chrome/common/extensions/api/extension_api.json

Index: chrome/common/extensions/api/extension_api.json
diff --git a/chrome/common/extensions/api/extension_api.json b/chrome/common/extensions/api/extension_api.json
index 4fc7492dc31c881e5cc682518c7d23d800ae3337..57bec3955df39e689710ce9676fbb8425ee3b632 100644
--- a/chrome/common/extensions/api/extension_api.json
+++ b/chrome/common/extensions/api/extension_api.json
@@ -3735,7 +3735,7 @@
         "type": "object",
         "description": "An object encapsulating a single proxy server's specification.",
         "properties": {
-          "scheme": {"type": "string", "optional": true, "enum": ["http", "socks", "socks4", "socks5"], "description": "The scheme (protocol) of the proxy server itself."},
+          "scheme": {"type": "string", "optional": true, "enum": ["http", "https", "socks", "socks4", "socks5"], "description": "The scheme (protocol) of the proxy server itself."},
           "host": {"type": "string", "description": "The URI of the proxy server."},
           "port": {"type": "integer", "optional": true, "description": "The port of the proxy server."}
         }
@@ -3805,6 +3805,29 @@
             "optional": true
           }
         ]
+      },
+      {
+        "name": "getCurrentProxySettings",
+        "type": "function",
+        "description": "Returns the currently effective proxy settings. These can originate from default values, command line options, the extension settings API, policies and possibly other sources in the future.",
+        "parameters": [
+          {
+            "name": "incognito",
+            "type": "boolean",
+            "description": "See incognito parameter of useCustomProxySettings."
+          },
+          {
+            "name": "callback",
+            "type": "function",
+            "parameters": [
+              {
+                "name": "config",
+                "$ref": "ProxyConfig",
+                "description": "Configuration, not necessarily a literal copy of the configuration passed to useCustomProxySettings."
+              }
+            ]
+          }
+        ]
       }
     ]
   },