From 4e368f8199a61c6319621ad1b9d6c352f0319f41 Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@gmail.com>
Date: Fri, 30 Mar 2018 08:50:58 +0200
Subject: Remove base conditional code for crash reporter and injector.

---
 browser/base/content/browser-plugins.js | 40 ++++-----------------------------
 1 file changed, 4 insertions(+), 36 deletions(-)

(limited to 'browser/base/content/browser-plugins.js')

diff --git a/browser/base/content/browser-plugins.js b/browser/base/content/browser-plugins.js
index ad070df12..c1bc65860 100644
--- a/browser/base/content/browser-plugins.js
+++ b/browser/base/content/browser-plugins.js
@@ -63,9 +63,7 @@ var gPluginHandler = {
                                            msg.data.pluginID);
         break;
       case "PluginContent:SubmitReport":
-        if (AppConstants.MOZ_CRASHREPORTER) {
-          this.submitReport(msg.data.runID, msg.data.keyVals, msg.data.submitURLOptIn);
-        }
+        // Nothing to do here
         break;
       case "PluginContent:LinkClickCallback":
         switch (msg.data.name) {
@@ -98,11 +96,8 @@ var gPluginHandler = {
   },
 
   submitReport: function submitReport(runID, keyVals, submitURLOptIn) {
-    if (!AppConstants.MOZ_CRASHREPORTER) {
-      return;
-    }
-    Services.prefs.setBoolPref("dom.ipc.plugins.reportCrashURL", submitURLOptIn);
-    PluginCrashReporter.submitCrashReport(runID, keyVals);
+    /*** STUB ***/
+    return;
   },
 
   // Callback for user clicking a "reload page" link
@@ -461,18 +456,7 @@ var gPluginHandler = {
 
     // If we don't have a minidumpID, we can't (or didn't) submit anything.
     // This can happen if the plugin is killed from the task manager.
-    let state;
-    if (!AppConstants.MOZ_CRASHREPORTER || !gCrashReporter.enabled) {
-      // This state tells the user that crash reporting is disabled, so we
-      // cannot send a report.
-      state = "noSubmit";
-    } else if (!pluginDumpID) {
-      // This state tells the user that there is no crash report available.
-      state = "noReport";
-    } else {
-      // This state asks the user to submit a crash report.
-      state = "please";
-    }
+    let state = "noSubmit";
 
     let mm = window.getGroupMessageManager("browsers");
     mm.broadcastAsyncMessage("BrowserPlugins:NPAPIPluginProcessCrashed",
@@ -513,22 +497,6 @@ var gPluginHandler = {
       callback: function() { browser.reload(); },
     }];
 
-    if (AppConstants.MOZ_CRASHREPORTER &&
-        PluginCrashReporter.hasCrashReport(pluginID)) {
-      let submitLabel = gNavigatorBundle.getString("crashedpluginsMessage.submitButton.label");
-      let submitKey   = gNavigatorBundle.getString("crashedpluginsMessage.submitButton.accesskey");
-      let submitButton = {
-        label: submitLabel,
-        accessKey: submitKey,
-        popup: null,
-        callback: () => {
-          PluginCrashReporter.submitCrashReport(pluginID);
-        },
-      };
-
-      buttons.push(submitButton);
-    }
-
     notification = notificationBox.appendNotification(messageString, "plugin-crashed",
                                                       iconURL, priority, buttons);
 
-- 
cgit v1.2.3