Issue %3015 - Part 3: Remove GMP code from addons, crash handler and tests.

3 files changed, 2 insertions, 27 deletions

diff --git a/components/addons/content/extensions.js b/components/addons/content/extensions.js
index fe84bc460..11c853524 100644
--- a/components/addons/content/extensions.js
+++ b/components/addons/content/extensions.js
@@ -1014,7 +1014,7 @@ var gViewController = {
     cmd_showItemPreferences: {
       isEnabled: function cmd_showItemPreferences_isEnabled(aAddon) {
         if (!aAddon ||
-            (!aAddon.isActive && !aAddon.isGMPlugin) ||
+            !aAddon.isActive ||
             !aAddon.optionsURL) {
           return false;
         }
@@ -2753,15 +2753,7 @@ var gDetailView = {
 
     var fullDesc = document.getElementById("detail-fulldesc");
     if (aAddon.fullDescription) {
-      // The following is part of an awful hack to include the licenses for GMP
-      // plugins without having bug 624602 fixed yet, and intentionally ignores
-      // localisation.
-      if (aAddon.isGMPlugin) {
-        fullDesc.innerHTML = aAddon.fullDescription;
-      } else {
-        fullDesc.textContent = aAddon.fullDescription;
-      }
-
+      fullDesc.textContent = aAddon.fullDescription;
       fullDesc.hidden = false;
     } else {
       fullDesc.hidden = true;
@@ -3036,13 +3028,6 @@ var gDetailView = {
         errorLink.value = gStrings.ext.GetStringFromName("details.notification.vulnerableNoUpdate.link");
         errorLink.href = this._addon.blocklistURL;
         errorLink.hidden = false;
-      } else if (this._addon.isGMPlugin && !this._addon.isInstalled &&
-                 this._addon.isActive) {
-        this.node.setAttribute("notification", "warning");
-        let warning = document.getElementById("detail-warning");
-        warning.textContent =
-          gStrings.ext.formatStringFromName("details.notification.gmpPending",
-                                            [this._addon.name], 1);
       } else {
         this.node.removeAttribute("notification");
       }
diff --git a/components/addons/content/extensions.xml b/components/addons/content/extensions.xml
index a3246e220..47f0b400d 100644
--- a/components/addons/content/extensions.xml
+++ b/components/addons/content/extensions.xml
@@ -1344,12 +1344,6 @@
               this._errorLink.value = gStrings.ext.GetStringFromName("notification.vulnerableNoUpdate.link");
               this._errorLink.href = this.mAddon.blocklistURL;
               this._errorLink.hidden = false;
-            } else if (this.mAddon.isGMPlugin && !this.mAddon.isInstalled &&
-                       this.mAddon.isActive) {
-              this.setAttribute("notification", "warning");
-              this._warning.textContent =
-                gStrings.ext.formatStringFromName("notification.gmpPending",
-                                                  [this.mAddon.name], 1);
             } else {
               this.removeAttribute("notification");
             }
diff --git a/components/addons/locale/extensions.properties b/components/addons/locale/extensions.properties
index 370198f56..51baa739b 100644
--- a/components/addons/locale/extensions.properties
+++ b/components/addons/locale/extensions.properties
@@ -57,8 +57,6 @@ notification.downloadError.retry.tooltip=Try downloading this add-on again
 notification.installError=There was an error installing %1$S.
 notification.installError.retry=Try again
 notification.installError.retry.tooltip=Try downloading and installing this add-on again
-#LOCALIZATION NOTE (notification.gmpPending) %1$S is the add-on name.
-notification.gmpPending=%1$S will be installed shortly.
 
 #LOCALIZATION NOTE (contributionAmount2) %S is the currency amount recommended for contributions
 contributionAmount2=Suggested Contribution: %S
@@ -100,8 +98,6 @@ details.notification.install=%1$S will be installed after you restart %2$S.
 details.notification.uninstall=%1$S will be uninstalled after you restart %2$S.
 #LOCALIZATION NOTE (details.notification.upgrade) %1$S is the add-on name, %2$S is brand name
 details.notification.upgrade=%1$S will be updated after you restart %2$S.
-#LOCALIZATION NOTE (details.notification.gmpPending) %1$S is the add-on name
-details.notification.gmpPending=%1$S will be installed shortly.
 
 # LOCALIZATION NOTE (details.experiment.time.daysRemaining):
 # Semicolon-separated list of plural forms.