Bug 1516208 - Part 2: Remove obsolete permissions from Data Manager. r=IanN

suite/components/dataman/content/dataman.js

@@ -1437,8 +1437,8 @@ var gPerms = {
       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) {

suite/components/dataman/tests/browser_dataman_basics.js

@@ -338,16 +338,12 @@ function test_permissions_panel(aWin) {
                      "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];
@@ -433,25 +429,6 @@ function test_permissions_panel(aWin) {
         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,

suite/locales/en-US/chrome/common/dataman/dataman.properties

@@ -17,8 +17,6 @@ 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
@@ -30,8 +28,6 @@ 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