Backed out 2 changesets (bug 1619658) for xpc and linting failures.
authorCosmin Sabou <csabou@mozilla.com>
Fri, 22 May 2020 00:10:20 +0300
changeset 531516 4b31e67c062b80e9091476fe0b4582c3ae5995f3
parent 531515 95be09f031e4928ef5808f9b05ff54b48afd6438
child 531517 fac6421d395d012e28c736a9035fed13fe0e598b
push id37440
push userabutkovits@mozilla.com
push dateFri, 22 May 2020 09:43:16 +0000
treeherdermozilla-central@fbf71e4d2e21 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1619658
milestone78.0a1
backs outa5c5a7a3cf833a1b08d97cd7ebbbadf75be9a20c
fdfb16cb82a6fd84f0ebc11e1545c429a7852989
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out 2 changesets (bug 1619658) for xpc and linting failures. Backed out changeset a5c5a7a3cf83 (bug 1619658) Backed out changeset fdfb16cb82a6 (bug 1619658)
browser/components/enterprisepolicies/Policies.jsm
browser/components/enterprisepolicies/schemas/policies-schema.json
browser/components/enterprisepolicies/tests/xpcshell/test_simple_pref_policies.js
browser/locales/en-US/browser/policies/policies-descriptions.ftl
--- a/browser/components/enterprisepolicies/Policies.jsm
+++ b/browser/components/enterprisepolicies/Policies.jsm
@@ -1277,48 +1277,16 @@ var Policies = {
           param.Notifications.Allow,
           param.Notifications.Block
         );
         setDefaultPermission("desktop-notification", param.Notifications);
       }
     },
   },
 
-  PictureInPicture: {
-    onBeforeAddons(manager, param) {
-      if ("Enabled" in param) {
-        setDefaultPref(
-          "media.videocontrols.picture-in-picture.video-toggle.enabled",
-          param.Enabled
-        );
-      }
-      if (param.Locked) {
-        Services.prefs.lockPref(
-          "media.videocontrols.picture-in-picture.video-toggle.enabled"
-        );
-      }
-    },
-  },
-
-  PictureInPicture: {
-    onBeforeAddons(manager, param) {
-      if ("Enabled" in param) {
-        setDefaultPref(
-          "media.videocontrols.picture-in-picture.video-toggle.enabled",
-          param.Enabled
-        );
-      }
-      if (param.Locked) {
-        Services.prefs.lockPref(
-          "media.videocontrols.picture-in-picture.video-toggle.enabled"
-        );
-      }
-    },
-  },
-
   PopupBlocking: {
     onBeforeUIStartup(manager, param) {
       addAllowDenyPermissions("popup", param.Allow, null);
 
       if (param.Locked) {
         let blockValue = true;
         if (param.Default !== undefined && !param.Default) {
           blockValue = false;
--- a/browser/components/enterprisepolicies/schemas/policies-schema.json
+++ b/browser/components/enterprisepolicies/schemas/policies-schema.json
@@ -630,28 +630,16 @@
           "type": "boolean"
         },
         "EnablePermissions": {
           "type": "boolean"
         }
       }
     },
 
-    "PictureInPicture": {
-      "type": "object",
-      "properties": {
-        "Enabled": {
-          "type": "boolean"
-        },
-        "Locked": {
-          "type": "boolean"
-        }
-      }
-    },
-
     "Permissions": {
       "type": "object",
       "properties": {
         "Camera": {
           "type": "object",
           "properties": {
             "Allow": {
               "type": "array",
@@ -793,28 +781,16 @@
             "Locked": {
               "type": "boolean"
             }
           }
         }
       }
     },
 
-    "PictureInPicture": {
-      "type": "object",
-      "properties": {
-        "Enabled": {
-          "type": "boolean"
-        },
-        "Locked": {
-          "type": "boolean"
-        }
-      }
-    },
-
     "PopupBlocking": {
       "type": "object",
       "properties": {
         "Allow": {
           "type": "array",
           "strict": false,
           "items": {
             "type": "origin"
--- a/browser/components/enterprisepolicies/tests/xpcshell/test_simple_pref_policies.js
+++ b/browser/components/enterprisepolicies/tests/xpcshell/test_simple_pref_policies.js
@@ -695,44 +695,16 @@ const POLICIES_TESTS = [
         EnablePermissions: true,
       },
     },
     lockedPrefs: {
       "pdfjs.disabled": true,
       "pdfjs.enablePermissions": true,
     },
   },
-
-  // POLICY: PictureInPicture
-
-  {
-    policies: {
-      PictureInPicture: {
-        Enabled: false,
-        Locked: true,
-      },
-    },
-    lockedPrefs: {
-      "media.videocontrols.picture-in-picture.video-toggle.enabled": false,
-    },
-  },
-
-  // POLICY: PictureInPicture
-
-  {
-    policies: {
-      PictureInPicture: {
-        Enabled: false,
-        Locked: true,
-      },
-    },
-    lockedPrefs: {
-      "media.videocontrols.picture-in-picture.video-toggle.enabled": false,
-    },
-  },
 ];
 
 add_task(async function test_policy_simple_prefs() {
   for (let test of POLICIES_TESTS) {
     await setupPolicyEngineWithJson({
       policies: test.policies,
     });
 
--- a/browser/locales/en-US/browser/policies/policies-descriptions.ftl
+++ b/browser/locales/en-US/browser/policies/policies-descriptions.ftl
@@ -144,20 +144,16 @@ policy-OverridePostUpdatePage = Override the post-update “What’s New” page. Set this policy to blank if you want to disable the post-update page.
 
 policy-PasswordManagerEnabled = Enable saving passwords to the password manager.
 
 # PDF.js and PDF should not be translated
 policy-PDFjs = Disable or configure PDF.js, the built-in PDF viewer in { -brand-short-name }.
 
 policy-Permissions2 = Configure permissions for camera, microphone, location, notifications, and autoplay.
 
-policy-PictureInPicture = Enable or disable Picture-in-Picture.
-
-policy-PictureInPicture = Enable or disable Picture-in-Picture.
-
 policy-PopupBlocking = Allow certain websites to display popups by default.
 
 policy-Preferences = Set and lock the value for a subset of preferences.
 
 policy-PromptForDownloadLocation = Ask where to save files when downloading.
 
 policy-Proxy = Configure proxy settings.