Private API for extensions like ssh-client that need access to TCP.

chrome/common/extensions/extension.cc

Index: chrome/common/extensions/extension.cc
diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc
index 0a5b92cce233704fa62c8c220d2a0d019f707dd8..e210d164d526e96ccf49ab70e8df1da8a0eee4f7 100644
--- a/chrome/common/extensions/extension.cc
+++ b/chrome/common/extensions/extension.cc
@@ -207,7 +207,7 @@ const char Extension::kBookmarkPermission[] = "bookmarks";
 const char Extension::kContextMenusPermission[] = "contextMenus";
 const char Extension::kContentSettingsPermission[] = "contentSettings";
 const char Extension::kCookiePermission[] = "cookies";
-const char Extension::kChromeosInfoPrivatePermissions[] = "chromeosInfoPrivate";
+const char Extension::kChromeosInfoPrivatePermission[] = "chromeosInfoPrivate";
 const char Extension::kDebuggerPermission[] = "debugger";
 const char Extension::kExperimentalPermission[] = "experimental";
 const char Extension::kFileSystemPermission[] = "fileSystem";
@@ -221,6 +221,7 @@ const char Extension::kProxyPermission[] = "proxy";
 const char Extension::kTabPermission[] = "tabs";
 const char Extension::kUnlimitedStoragePermission[] = "unlimitedStorage";
 const char Extension::kWebstorePrivatePermission[] = "webstorePrivate";
+const char Extension::kWebproxyPrivatePermission[] = "webproxyPrivate";
 
 // In general, all permissions should have an install message.
 // See ExtensionsTest.PermissionMessages for an explanation of each
@@ -228,7 +229,7 @@ const char Extension::kWebstorePrivatePermission[] = "webstorePrivate";
 const Extension::Permission Extension::kPermissions[] = {
   { kBackgroundPermission, 0 },
   { kBookmarkPermission, IDS_EXTENSION_PROMPT_WARNING_BOOKMARKS },
-  { kChromeosInfoPrivatePermissions, 0},
+  { kChromeosInfoPrivatePermission, 0},
   { kContentSettingsPermission, 0 },
   { kContextMenusPermission, 0 },
   { kCookiePermission, 0 },
@@ -245,6 +246,7 @@ const Extension::Permission Extension::kPermissions[] = {
   { kTabPermission, IDS_EXTENSION_PROMPT_WARNING_TABS },
   { kUnlimitedStoragePermission, 0 },
   { kWebstorePrivatePermission, 0 },
+  { kWebproxyPrivatePermission, 0 },
 };
 const size_t Extension::kNumPermissions =
     arraysize(Extension::kPermissions);
@@ -1928,14 +1930,11 @@ bool Extension::InitFromValue(const DictionaryValue& source, int flags,
       // fileBrowserPrivate APIs.
       // TODO(asargent) - We want a more general purpose mechanism for this,
       // and better error messages. (http://crbug.com/54013)
-      if ((permission_str == kWebstorePrivatePermission ||
-           permission_str == kFileBrowserPrivatePermission) &&
-          location_ != Extension::COMPONENT) {
-        continue;
-      }
-
-      if (permission_str == kChromeosInfoPrivatePermissions &&
-          location_ != Extension::COMPONENT) {
+      if (location_ != Extension::COMPONENT &&
+          (permission_str == kWebstorePrivatePermission ||
+           permission_str == kFileBrowserPrivatePermission ||
+           permission_str == kChromeosInfoPrivatePermission ||
+           permission_str == kWebproxyPrivatePermission)) {
         continue;
       }