Bug 1516208 - Part 2: Remove obsolete permissions from Data Manager. r=IanN
authorFrank-Rainer Grahl <frgrahl@gmx.net>
Sun, 06 Jan 2019 23:21:44 +0100
changeset 33276 3bad8af89b0e
parent 33275 c4e9d5d84940
child 33277 477951a3314a
push id2368
push userclokep@gmail.com
push dateMon, 28 Jan 2019 21:12:50 +0000
treeherdercomm-beta@56d23c07d815 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersIanN
bugs1516208
Bug 1516208 - Part 2: Remove obsolete permissions from Data Manager. r=IanN
suite/components/dataman/content/dataman.js
suite/components/dataman/tests/browser_dataman_basics.js
suite/locales/en-US/chrome/common/dataman/dataman.properties
--- a/suite/components/dataman/content/dataman.js
+++ b/suite/components/dataman/content/dataman.js
@@ -1432,18 +1432,18 @@ var gPerms = {
     gDataman.debugMsg("Add permissions button clicked!");
 
     if (this.addSelBox.hidden) {
       // Show addition box, disable button.
       this.addButton.disabled = true;
       this.addType.removeAllItems(); // Make sure list is clean.
       let permTypes = ["allowXULXBL", "cookie", "geo", "image", "indexedDB",
                        "install", "login-saving", "object", "offline-app",
-                       "plugins", "popup", "script", "sts/use", "sts/subd",
-                       "stylesheet", "trackingprotection"];
+                       "plugins", "popup", "script", "stylesheet",
+                       "trackingprotection"];
 
       // Look for a translation.
       for (let permType of permTypes) {
         let typeDesc = permType;
         try {
           typeDesc = gDataman.bundle.getString("perm." + permType + ".label");
         }
         catch (e) {
--- a/suite/components/dataman/tests/browser_dataman_basics.js
+++ b/suite/components/dataman/tests/browser_dataman_basics.js
@@ -333,26 +333,22 @@ function test_permissions_panel(aWin) {
   Services.perms.add(Services.io.newURI("http://indexedDB.getpersonas.com/"),
                      "indexedDB", Services.perms.ALLOW_ACTION);
   Services.perms.add(Services.io.newURI("http://install.getpersonas.com/"),
                      "install", Services.perms.ALLOW_ACTION);
   Services.perms.add(Services.io.newURI("http://offline.getpersonas.com/"),
                      "offline-app", Services.perms.ALLOW_ACTION);
   Services.perms.add(Services.io.newURI("http://popup.getpersonas.com/"),
                      "popup", Services.perms.ALLOW_ACTION);
-  Services.perms.add(Services.io.newURI("http://stsuse.getpersonas.com/"),
-                     "sts/use", Services.perms.ALLOW_ACTION);
-  Services.perms.add(Services.io.newURI("http://stssubd.getpersonas.com/"),
-                     "sts/subd", Services.perms.ALLOW_ACTION);
   Services.perms.add(Services.io.newURI("http://test.getpersonas.com/"),
                      "test", Services.perms.DENY_ACTION);
   Services.perms.add(Services.io.newURI("http://xul.getpersonas.com/"),
                      "allowXULXBL", Services.perms.ALLOW_ACTION);
   Services.logins.setLoginSavingEnabled("password.getpersonas.com", false);
-  is(aWin.gPerms.list.children.length, 14,
+  is(aWin.gPerms.list.children.length, 12,
      "The correct number of permissions is displayed in the list");
   for (let i = 1; i < aWin.gPerms.list.children.length; i++) {
     let perm = aWin.gPerms.list.children[i];
     switch (perm.type) {
       case "allowXULXBL":
         is(perm.getAttribute("label"), "Use XUL/XBL Markup",
            "Correct label for type: " + perm.type);
         is(perm.capability, 1,
@@ -428,35 +424,16 @@ function test_permissions_panel(aWin) {
         is(perm.getAttribute("label"), "Open Popup Windows",
            "Correct label for type: " + perm.type);
         is(perm.capability, 1,
            "Correct capability for: " + perm.host);
         perm.useDefault(true);
         is(perm.capability, 1,
            "Set back to correct default");
         break;
-      case "sts/use":
-        is(perm.getAttribute("label"), "Use Strict Transport Security",
-           "Correct label for type: " + perm.type);
-        is(perm.capability, 1,
-           "Correct capability for: " + perm.host);
-        perm.useDefault(true);
-        is(perm.capability, 0,
-           "Set back to correct default");
-        break;
-      case "sts/subd":
-        is(perm.getAttribute("label"), "Apply Strict Transport Security to subdomains",
-           "Correct label for type: " + perm.type);
-        is(perm.capability, 1,
-           "Correct capability for: " + perm.host);
-        perm.useDefault(true);
-        is(perm.capability, 0,
-           "Set back to correct default");
-        break;
-      default:
         is(perm.getAttribute("label"), perm.type,
            "Correct default label for type: " + perm.type);
         is(perm.capability, 2,
            "Correct capability for: " + perm.host);
         perm.useDefault(true);
         is(perm.capability, 0,
            "Set to correct default");
        break;
--- a/suite/locales/en-US/chrome/common/dataman/dataman.properties
+++ b/suite/locales/en-US/chrome/common/dataman/dataman.properties
@@ -12,31 +12,27 @@ cookies.anyConnection.all=Any type of co
 
 cookies.deleteSelected=Are you sure you want to delete the selected cookies?
 cookies.deleteSelectedTitle=Remove Selected Cookies
 cookies.deleteSelectedYes=&Remove
 
 # permissions
 perm.allowXULXBL.label=Use XUL/XBL Markup
 perm.cookie.label=Set Cookies
-perm.falsestart-rc4.label=TLS False Start using RC4
-perm.falsestart-rsa.label=TLS False Start using RSA
 perm.geo.label=Share Location
 perm.image.label=Load Images
 perm.indexedDB.label=Store Local Databases
 perm.install.label=Install Add-ons
 perm.offline-app.label=Offline Web Applications
 perm.object.label=Run Plugins
 perm.login-saving.label=Save Passwords
 perm.plugins.label=Activate Plugins
 perm.popup.label=Open Popup Windows
 perm.script.label=Run Scripts
 perm.stylesheet.label=Load Stylesheets
-perm.sts/use.label=Use Strict Transport Security
-perm.sts/subd.label=Apply Strict Transport Security to subdomains
 perm.trackingprotection.label=Tracking Activity
 
 perm.type.default=Select a type
 perm.validation.invalidurl=The url entered is not valid
 
 # passwords
 pwd.hidePasswords=Hide Passwords
 pwd.hidePasswords.accesskey=P