From a0b7f79b3c4e24e34fb7418bea2fd03e20b73da6 Mon Sep 17 00:00:00 2001
From: Sebastian Hengst <archaeopteryx@coole-files.de>
Date: Fri, 24 Mar 2017 20:56:54 +0100
Subject: [PATCH] Backed out changeset 6c4c29c0b05a (bug 1197420) for failing
 test_ext_all_apis.html. r=backout

---
 .../extensions/schemas/bookmarks.json         |  2 +-
 .../extensions/schemas/history.json           |  2 +-
 .../components/extensions/schemas/tabs.json   |  2 +-
 .../components/extensions/schemas/tabs.json   |  2 +-
 .../extensions/schemas/cookies.json           |  2 +-
 .../extensions/schemas/manifest.json          | 31 +++++--------------
 .../extensions/schemas/top_sites.json         |  2 +-
 .../extensions/schemas/web_navigation.json    |  2 +-
 .../extensions/schemas/web_request.json       |  2 +-
 9 files changed, 15 insertions(+), 32 deletions(-)

diff --git a/browser/components/extensions/schemas/bookmarks.json b/browser/components/extensions/schemas/bookmarks.json
index 3f16f115791a..fb74c633e36b 100644
--- a/browser/components/extensions/schemas/bookmarks.json
+++ b/browser/components/extensions/schemas/bookmarks.json
@@ -7,7 +7,7 @@
     "namespace": "manifest",
     "types": [
       {
-        "$extend": "OptionalPermission",
+        "$extend": "Permission",
         "choices": [{
           "type": "string",
           "enum": [
diff --git a/browser/components/extensions/schemas/history.json b/browser/components/extensions/schemas/history.json
index 5161177d948b..e05569e38403 100644
--- a/browser/components/extensions/schemas/history.json
+++ b/browser/components/extensions/schemas/history.json
@@ -7,7 +7,7 @@
     "namespace": "manifest",
     "types": [
       {
-        "$extend": "OptionalPermission",
+        "$extend": "Permission",
         "choices": [{
           "type": "string",
           "enum": [
diff --git a/browser/components/extensions/schemas/tabs.json b/browser/components/extensions/schemas/tabs.json
index df16c9a7af63..23ce33a4b310 100644
--- a/browser/components/extensions/schemas/tabs.json
+++ b/browser/components/extensions/schemas/tabs.json
@@ -7,7 +7,7 @@
     "namespace": "manifest",
     "types": [
       {
-        "$extend": "OptionalPermission",
+        "$extend": "Permission",
         "choices": [{
           "type": "string",
           "enum": [
diff --git a/mobile/android/components/extensions/schemas/tabs.json b/mobile/android/components/extensions/schemas/tabs.json
index c18ec3aa4955..ac513768fc74 100644
--- a/mobile/android/components/extensions/schemas/tabs.json
+++ b/mobile/android/components/extensions/schemas/tabs.json
@@ -7,7 +7,7 @@
     "namespace": "manifest",
     "types": [
       {
-        "$extend": "OptionalPermission",
+        "$extend": "Permission",
         "choices": [{
           "type": "string",
           "enum": [
diff --git a/toolkit/components/extensions/schemas/cookies.json b/toolkit/components/extensions/schemas/cookies.json
index 1a26407719a0..a7de6eb42682 100644
--- a/toolkit/components/extensions/schemas/cookies.json
+++ b/toolkit/components/extensions/schemas/cookies.json
@@ -7,7 +7,7 @@
     "namespace": "manifest",
     "types": [
       {
-        "$extend": "OptionalPermission",
+        "$extend": "Permission",
         "choices": [{
           "type": "string",
           "enum": [
diff --git a/toolkit/components/extensions/schemas/manifest.json b/toolkit/components/extensions/schemas/manifest.json
index 386de6dab5f0..7b4f0e2eb58b 100644
--- a/toolkit/components/extensions/schemas/manifest.json
+++ b/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" }
         ]
       },
       {
diff --git a/toolkit/components/extensions/schemas/top_sites.json b/toolkit/components/extensions/schemas/top_sites.json
index bcf60aa5bf73..fbfbc4b6245c 100644
--- a/toolkit/components/extensions/schemas/top_sites.json
+++ b/toolkit/components/extensions/schemas/top_sites.json
@@ -7,7 +7,7 @@
     "namespace": "manifest",
     "types": [
       {
-        "$extend": "OptionalPermission",
+        "$extend": "Permission",
         "choices": [{
           "type": "string",
           "enum": [
diff --git a/toolkit/components/extensions/schemas/web_navigation.json b/toolkit/components/extensions/schemas/web_navigation.json
index b9204d34eb85..3fda550e9125 100644
--- a/toolkit/components/extensions/schemas/web_navigation.json
+++ b/toolkit/components/extensions/schemas/web_navigation.json
@@ -7,7 +7,7 @@
     "namespace": "manifest",
     "types": [
       {
-        "$extend": "OptionalPermission",
+        "$extend": "Permission",
         "choices": [{
           "type": "string",
           "enum": [
diff --git a/toolkit/components/extensions/schemas/web_request.json b/toolkit/components/extensions/schemas/web_request.json
index 1554896ec1e5..e884f8b70b35 100644
--- a/toolkit/components/extensions/schemas/web_request.json
+++ b/toolkit/components/extensions/schemas/web_request.json
@@ -7,7 +7,7 @@
     "namespace": "manifest",
     "types": [
       {
-        "$extend": "OptionalPermission",
+        "$extend": "Permission",
         "choices": [{
           "type": "string",
           "enum": [