From 6fdc08bb18e35034b5dced2def4408dedc472867 Mon Sep 17 00:00:00 2001
From: Andreea Pavel <apavel@mozilla.com>
Date: Wed, 27 Jun 2018 20:24:23 +0300
Subject: [PATCH] Backed out changeset ce5b67578d0c (bug 1465950) for failing
 eslint at
 /builds/worker/checkouts/gecko/browser/components/enterprisepolicies/tests/browser/browser_policies_getActivePolicies.js
 on a CLOSED TREE

---
 .../enterprisepolicies/EnterprisePolicies.js  |  6 ---
 .../EnterprisePoliciesContent.js              |  4 --
 .../tests/browser/browser.ini                 |  1 -
 .../browser_policies_getActivePolicies.js     | 40 -------------------
 .../nsIEnterprisePolicies.idl                 |  8 ----
 5 files changed, 59 deletions(-)
 delete mode 100644 browser/components/enterprisepolicies/tests/browser/browser_policies_getActivePolicies.js

diff --git a/browser/components/enterprisepolicies/EnterprisePolicies.js b/browser/components/enterprisepolicies/EnterprisePolicies.js
index 07df44426c5e..6f86fcaa4cbf 100644
--- a/browser/components/enterprisepolicies/EnterprisePolicies.js
+++ b/browser/components/enterprisepolicies/EnterprisePolicies.js
@@ -90,7 +90,6 @@ EnterprisePoliciesManager.prototype = {
     }
 
     this.status = Ci.nsIEnterprisePolicies.ACTIVE;
-    this._parsedPolicies = {};
     this._activatePolicies(provider.policies);
   },
 
@@ -135,7 +134,6 @@ EnterprisePoliciesManager.prototype = {
         continue;
       }
 
-      this._parsedPolicies[policyName] = parsedParameters;
       let policyImpl = Policies[policyName];
 
       for (let timing of Object.keys(this._callbacks)) {
@@ -301,10 +299,6 @@ EnterprisePoliciesManager.prototype = {
   isAllowed: function BG_sanitize(feature) {
     return !(feature in DisallowedFeatures);
   },
-
-  getActivePolicies() {
-    return this._parsedPolicies;
-  },
 };
 
 let DisallowedFeatures = {};
diff --git a/browser/components/enterprisepolicies/EnterprisePoliciesContent.js b/browser/components/enterprisepolicies/EnterprisePoliciesContent.js
index 74e714af4854..dbc666f50f75 100644
--- a/browser/components/enterprisepolicies/EnterprisePoliciesContent.js
+++ b/browser/components/enterprisepolicies/EnterprisePoliciesContent.js
@@ -78,10 +78,6 @@ EnterprisePoliciesManagerContent.prototype = {
 
   isAllowed(feature) {
     return !this._disallowedFeatures.includes(feature);
-  },
-
-  getActivePolicies() {
-    throw Cr.NS_ERROR_NOT_AVAILABLE;
   }
 };
 
diff --git a/browser/components/enterprisepolicies/tests/browser/browser.ini b/browser/components/enterprisepolicies/tests/browser/browser.ini
index 42af0fad02e4..546baf329537 100644
--- a/browser/components/enterprisepolicies/tests/browser/browser.ini
+++ b/browser/components/enterprisepolicies/tests/browser/browser.ini
@@ -12,7 +12,6 @@ support-files =
 [browser_policies_basic_tests.js]
 [browser_policies_broken_json.js]
 [browser_policies_enterprise_only.js]
-[browser_policies_getActivePolicies.js]
 [browser_policies_notice_in_aboutpreferences.js]
 [browser_policies_popups_cookies_addons_flash.js]
 [browser_policies_runOnce_helper.js]
diff --git a/browser/components/enterprisepolicies/tests/browser/browser_policies_getActivePolicies.js b/browser/components/enterprisepolicies/tests/browser/browser_policies_getActivePolicies.js
deleted file mode 100644
index 81b628748ce7..000000000000
--- a/browser/components/enterprisepolicies/tests/browser/browser_policies_getActivePolicies.js
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/ */
-
-"use strict";
-
-add_task(async function test_active_policies() {
-  await setupPolicyEngineWithJson({
-    "policies": {
-      "DisablePrivateBrowsing": true
-    }
-  });
-
-  let expected = {
-    "DisablePrivateBrowsing": true
-  }
-
-  Assert.deepEqual(await Services.policies.getActivePolicies(), expected, "Active policies parsed correctly");
-});
-
-add_task(async function test_wrong_policies() {
-  await setupPolicyEngineWithJson({
-    "policies": {
-      "BlockAboutSupport": [true]
-    }
-  });
-
-  let expected = {};
-
-  Assert.deepEqual(await Services.policies.getActivePolicies(), expected, "Wrong policies ignored");
-});
-
-add_task(async function test_content_process() {
-  await ContentTask.spawn(gBrowser.selectedBrowser, null, function() {
-    try {
-      Services.policies.getActivePolicies();
-    } catch (ex) {
-      is(ex.result, Cr.NS_ERROR_NOT_AVAILABLE, "Function getActivePolicies() doesn't have a valid definition in the content process");
-    }
-  });
-});
diff --git a/toolkit/components/enterprisepolicies/nsIEnterprisePolicies.idl b/toolkit/components/enterprisepolicies/nsIEnterprisePolicies.idl
index 5b3b4584fbae..3db55c0eaa6e 100644
--- a/toolkit/components/enterprisepolicies/nsIEnterprisePolicies.idl
+++ b/toolkit/components/enterprisepolicies/nsIEnterprisePolicies.idl
@@ -15,12 +15,4 @@ interface nsIEnterprisePolicies : nsISupports
   readonly attribute short status;
 
   bool isAllowed(in ACString feature);
-
-  /**
-   * Get the active policies that have been successfully parsed.
-   *
-   * @returns A JS object that contains the policies names and
-   *          their corresponding parameters.
-   */
-  jsval getActivePolicies();
 };