Bug 1197420 Part 1 Schema groundwork for optional permissions r=kmag

MozReview-Commit-ID: JIfPYjxjFfM

--HG--
extra : rebase_source : 511dea13ceacc25a46505165962c1b01dfcc7b6e
extra : source : 4232cbc11710c9c9e9eb8757b54140e87307274f

browser/components/extensions/schemas/bookmarks.json

@@ -7,7 +7,7 @@
     "namespace": "manifest",
     "types": [
       {
-        "$extend": "Permission",
+        "$extend": "OptionalPermission",
         "choices": [{
           "type": "string",
           "enum": [

browser/components/extensions/schemas/history.json

@@ -7,7 +7,7 @@
     "namespace": "manifest",
     "types": [
       {
-        "$extend": "Permission",
+        "$extend": "OptionalPermission",
         "choices": [{
           "type": "string",
           "enum": [

browser/components/extensions/schemas/tabs.json

@@ -7,7 +7,7 @@
     "namespace": "manifest",
     "types": [
       {
-        "$extend": "Permission",
+        "$extend": "OptionalPermission",
         "choices": [{
           "type": "string",
           "enum": [

mobile/android/components/extensions/schemas/tabs.json

@@ -7,7 +7,7 @@
     "namespace": "manifest",
     "types": [
       {
-        "$extend": "Permission",
+        "$extend": "OptionalPermission",
         "choices": [{
           "type": "string",
           "enum": [

toolkit/components/extensions/schemas/cookies.json

@@ -7,7 +7,7 @@
     "namespace": "manifest",
     "types": [
       {
-        "$extend": "Permission",
+        "$extend": "OptionalPermission",
         "choices": [{
           "type": "string",
           "enum": [

toolkit/components/extensions/schemas/manifest.json

@@ -179,6 +179,12 @@
             "optional": true
           },
 
+          "optional_permissions": {
+            "type": "array",
+            "items": { "$ref": "OptionalPermission" },
+            "optional": true
+          },
+
           "web_accessible_resources": {
             "type": "array",
             "items": { "type": "string" },
@@ -207,23 +213,34 @@
         "additionalProperties": { "$ref": "UnrecognizedProperty" }
       },
       {
-        "id": "Permission",
+        "id": "OptionalPermission",
         "choices": [
           {
             "type": "string",
             "enum": [
-              "alarms",
               "clipboardRead",
               "clipboardWrite",
               "geolocation",
               "idle",
-              "notifications",
+              "notifications"
-              "storage"
             ]
           },
           { "$ref": "MatchPattern" }
         ]
       },
+      {
+        "id": "Permission",
+        "choices": [
+          { "$ref": "OptionalPermission" },
+          {
+            "type": "string",
+            "enum": [
+              "alarms",
+              "storage"
+            ]
+          }
+        ]
+      },
       {
         "id": "HttpURL",
         "type": "string",

toolkit/components/extensions/schemas/top_sites.json

@@ -7,7 +7,7 @@
     "namespace": "manifest",
     "types": [
       {
-        "$extend": "Permission",
+        "$extend": "OptionalPermission",
         "choices": [{
           "type": "string",
           "enum": [

toolkit/components/extensions/schemas/web_navigation.json

@@ -7,7 +7,7 @@
     "namespace": "manifest",
     "types": [
       {
-        "$extend": "Permission",
+        "$extend": "OptionalPermission",
         "choices": [{
           "type": "string",
           "enum": [

toolkit/components/extensions/schemas/web_request.json

@@ -7,7 +7,7 @@
     "namespace": "manifest",
     "types": [
       {
-        "$extend": "Permission",
+        "$extend": "OptionalPermission",
         "choices": [{
           "type": "string",
           "enum": [