Backed out changeset 6c4c29c0b05a (bug 1197420) for failing test_ext_all_apis.html. r=backout

browser/components/extensions/schemas/bookmarks.json

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

browser/components/extensions/schemas/history.json

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

browser/components/extensions/schemas/tabs.json

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

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

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

toolkit/components/extensions/schemas/cookies.json

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

toolkit/components/extensions/schemas/manifest.json

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

toolkit/components/extensions/schemas/top_sites.json

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

toolkit/components/extensions/schemas/web_navigation.json

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

toolkit/components/extensions/schemas/web_request.json

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