Backed out changeset 7bcb681545cb (bug 1653584) for failures on test_sorted_alphabetically.js. CLOSED TREE

browser/components/enterprisepolicies/Policies.jsm

@@ -1248,6 +1248,16 @@ var Policies = {
     },
   },
 
+  MasterPassword: {
+    onAllWindowsRestored(manager, param) {
+      if (param) {
+        manager.disallowFeature("removeMasterPassword");
+      } else {
+        manager.disallowFeature("createMasterPassword");
+      }
+    },
+  },
+
   NetworkPrediction: {
     onBeforeAddons(manager, param) {
       setAndLockPref("network.dns.disablePrefetch", !param);
@@ -1429,16 +1439,6 @@ var Policies = {
     },
   },
 
-  PrimaryPassword: {
-    onAllWindowsRestored(manager, param) {
-      if (param) {
-        manager.disallowFeature("removeMasterPassword");
-      } else {
-        manager.disallowFeature("createMasterPassword");
-      }
-    },
-  },
-
   PromptForDownloadLocation: {
     onBeforeAddons(manager, param) {
       setAndLockPref("browser.download.useDownloadDir", !param);

browser/components/enterprisepolicies/content/aboutPolicies.js

@@ -290,7 +290,6 @@ function generateDocumentation() {
     Certificates: "CertificatesDescription",
     SanitizeOnShutdown: "SanitizeOnShutdown2",
     Permissions: "Permissions2",
-    PrimaryPassword: "MasterPassword",
   };
 
   for (let policyName in schema.properties) {

browser/components/enterprisepolicies/schemas/policies-schema.json

@@ -645,6 +645,10 @@
       }
     },
 
+    "MasterPassword": {
+      "type": "boolean"
+    },
+
     "NetworkPrediction": {
       "type": "boolean"
     },
@@ -852,10 +856,6 @@
       }
     },
 
-    "PrimaryPassword": {
-      "type": "boolean"
-    },
-
     "PopupBlocking": {
       "type": "object",
       "properties": {

browser/components/enterprisepolicies/tests/browser/browser_policy_masterpassword.js

@@ -11,7 +11,7 @@ let { LoginTestUtils } = ChromeUtils.import(
 add_task(async function test_policy_masterpassword_set() {
   await setupPolicyEngineWithJson({
     policies: {
-      PrimaryPassword: true,
+      MasterPassword: true,
     },
   });
 
@@ -35,7 +35,7 @@ add_task(async function test_policy_masterpassword_set() {
 add_task(async function test_policy_nochangemp() {
   await setupPolicyEngineWithJson({
     policies: {
-      PrimaryPassword: true,
+      MasterPassword: true,
     },
   });
 
@@ -73,7 +73,7 @@ add_task(async function test_policy_nochangemp() {
 add_task(async function test_policy_admin() {
   await setupPolicyEngineWithJson({
     policies: {
-      PrimaryPassword: true,
+      MasterPassword: true,
     },
   });
 

browser/components/enterprisepolicies/tests/browser/browser_policy_masterpassword_aboutlogins.js

@@ -17,7 +17,7 @@ ChromeUtils.defineModuleGetter(
 add_task(async function test_policy_admin() {
   await setupPolicyEngineWithJson({
     policies: {
-      PrimaryPassword: true,
+      MasterPassword: true,
     },
   });
 

browser/components/enterprisepolicies/tests/browser/browser_policy_masterpassword_doorhanger.js

@@ -13,7 +13,7 @@ Services.scriptloader.loadSubScript(
 add_task(async function test_policy_masterpassword_doorhanger() {
   await setupPolicyEngineWithJson({
     policies: {
-      PrimaryPassword: true,
+      MasterPassword: true,
     },
   });