From cdc7c1a8dd3334311d00ba49c51160def6669082 Mon Sep 17 00:00:00 2001
From: Gurzau Raul <rgurzau@mozilla.com>
Date: Wed, 9 Oct 2019 21:16:58 +0300
Subject: [PATCH] Backed out changeset 479097530e46 (bug 1586913) for failing
 at test_login_item.html on a CLOSED TREE.

---
 browser/components/aboutlogins/AboutLoginsChild.jsm       | 3 ---
 browser/components/aboutlogins/AboutLoginsParent.jsm      | 3 ---
 .../aboutlogins/content/components/login-item.js          | 8 --------
 browser/components/enterprisepolicies/Policies.jsm        | 8 --------
 .../enterprisepolicies/schemas/policies-schema.json       | 4 ----
 .../en-US/browser/policies/policies-descriptions.ftl      | 2 --
 6 files changed, 28 deletions(-)

diff --git a/browser/components/aboutlogins/AboutLoginsChild.jsm b/browser/components/aboutlogins/AboutLoginsChild.jsm
index a79ccda08118..f6f289f868c8 100644
--- a/browser/components/aboutlogins/AboutLoginsChild.jsm
+++ b/browser/components/aboutlogins/AboutLoginsChild.jsm
@@ -69,7 +69,6 @@ class AboutLoginsChild extends ActorChild {
           },
           // Default to enabled just in case a search is attempted before we get a response.
           masterPasswordEnabled: true,
-          passwordRevealVisible: true,
         };
         waivedContent.AboutLoginsUtils = Cu.cloneInto(
           AboutLoginsUtils,
@@ -227,8 +226,6 @@ class AboutLoginsChild extends ActorChild {
         this.sendToContent("Setup", message.data);
         Cu.waiveXrays(this.content).AboutLoginsUtils.masterPasswordEnabled =
           message.data.masterPasswordEnabled;
-        Cu.waiveXrays(this.content).AboutLoginsUtils.passwordRevealVisible =
-          message.data.passwordRevealVisible;
         break;
       case "AboutLogins:ShowLoginItemError":
         this.sendToContent("ShowLoginItemError", message.data);
diff --git a/browser/components/aboutlogins/AboutLoginsParent.jsm b/browser/components/aboutlogins/AboutLoginsParent.jsm
index 3106dad88c74..f5297f0a7a4c 100644
--- a/browser/components/aboutlogins/AboutLoginsParent.jsm
+++ b/browser/components/aboutlogins/AboutLoginsParent.jsm
@@ -411,9 +411,6 @@ var AboutLoginsParent = {
             syncState,
             selectedBadgeLanguages,
             masterPasswordEnabled: LoginHelper.isMasterPasswordSet(),
-            passwordRevealVisible: Services.policies.isAllowed(
-              "passwordReveal"
-            ),
           });
 
           await this._sendAllLoginRelatedObjects(logins, messageManager);
diff --git a/browser/components/aboutlogins/content/components/login-item.js b/browser/components/aboutlogins/content/components/login-item.js
index bf78cbe643c8..d4b0834ba7ca 100644
--- a/browser/components/aboutlogins/content/components/login-item.js
+++ b/browser/components/aboutlogins/content/components/login-item.js
@@ -727,14 +727,6 @@ export default class LoginItem extends HTMLElement {
   }
 
   _updatePasswordRevealState() {
-    if (
-      window.AboutLoginsUtils &&
-      !window.AboutLoginsUtils.passwordRevealVisible
-    ) {
-      this._revealCheckbox.hidden = true;
-      return;
-    }
-
     let titleId = this._revealCheckbox.checked
       ? "login-item-password-reveal-checkbox-hide"
       : "login-item-password-reveal-checkbox-show";
diff --git a/browser/components/enterprisepolicies/Policies.jsm b/browser/components/enterprisepolicies/Policies.jsm
index d95487848fb0..eba55ec75ff0 100644
--- a/browser/components/enterprisepolicies/Policies.jsm
+++ b/browser/components/enterprisepolicies/Policies.jsm
@@ -450,14 +450,6 @@ var Policies = {
     },
   },
 
-  DisablePasswordReveal: {
-    onBeforeUIStartup(manager, param) {
-      if (param) {
-        manager.disallowFeature("passwordReveal");
-      }
-    },
-  },
-
   DisablePocket: {
     onBeforeAddons(manager, param) {
       if (param) {
diff --git a/browser/components/enterprisepolicies/schemas/policies-schema.json b/browser/components/enterprisepolicies/schemas/policies-schema.json
index 23a7c150b17a..fb3d9d507c1b 100644
--- a/browser/components/enterprisepolicies/schemas/policies-schema.json
+++ b/browser/components/enterprisepolicies/schemas/policies-schema.json
@@ -211,10 +211,6 @@
       "type": "boolean"
     },
 
-    "DisablePasswordReveal": {
-      "type": "boolean"
-    },
-
     "DisablePocket": {
       "type": "boolean"
     },
diff --git a/browser/locales/en-US/browser/policies/policies-descriptions.ftl b/browser/locales/en-US/browser/policies/policies-descriptions.ftl
index dfee10e517f4..c0427c14a21b 100644
--- a/browser/locales/en-US/browser/policies/policies-descriptions.ftl
+++ b/browser/locales/en-US/browser/policies/policies-descriptions.ftl
@@ -54,8 +54,6 @@ policy-DisableFormHistory = Don’t remember search and form history.
 
 policy-DisableMasterPasswordCreation = If true, a master password can’t be created.
 
-policy-DisablePasswordReveal = Do not allow passwords to be revealed in saved logins.
-
 policy-DisablePocket = Disable the feature to save webpages to Pocket.
 
 policy-DisablePrivateBrowsing = Disable Private Browsing.