Resolve confusions between Flash and VLC plugins on permissions pages

browser/base/content/pageinfo/permissions.js

@@ -338,6 +338,9 @@ function initPluginsRow() {
       continue;
     }
     for (let mimeType of plugin.getMimeTypes()) {
+      if (mimeType == "application/x-shockwave-flash" && plugin.name != "Shockwave Flash") {
+        continue;
+      }
       let permString = pluginHost.getPermissionStringForType(mimeType);
       if (!permissionMap.has(permString)) {
         var name = makeNicePluginName(plugin.name) + " " + plugin.version;

browser/components/preferences/aboutPermissions.js

@@ -531,6 +531,9 @@ let AboutPermissions = {
     let XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
     for (let plugin of tags) {
       for (let mimeType of plugin.getMimeTypes()) {
+        if (mimeType == "application/x-shockwave-flash" && plugin.name != "Shockwave Flash") {
+          continue;
+        }
         let permString = pluginHost.getPermissionStringForType(mimeType);
         if (!permissionMap.has(permString)) {
           let permissionEntry = document.createElementNS(XUL_NS, "box");
@@ -1061,6 +1064,9 @@ let AboutPermissions = {
         AddonManager.getAddonsByTypes(["plugin"], function(addons) {
           for (let addon of addons) {
             for (let type of addon.pluginMimeTypes) {
+              if (type.type == "application/x-shockwave-flash" && addon.name != "Shockwave Flash") {
+                continue;
+              }
               if (type.type.toLowerCase() == permissionMimeType.toLowerCase()) {
                 addon.userDisabled = addonValue;
                 return;

toolkit/mozapps/extensions/internal/PluginProvider.jsm

@@ -196,7 +196,8 @@ var PluginProvider = {
       if (!(tag.description in seenPlugins[tag.name])) {
         let plugin = {
           id: getIDHashForString(tag.name + tag.description),
-          name: tag.name,
+          // XXX Flash name substitution like in browser-plugins.js, aboutPermissions.js, permissions.js
+          name: tag.name == "Shockwave Flash" ? "Adobe Flash" : tag.name,
           description: tag.description,
           tags: [tag]
         };