From 4e721d14cd374916bad653a97d0e19712fb40caa Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@gmail.com>
Date: Fri, 30 Mar 2018 12:07:42 +0200
Subject: Remove MOZ_CRASHREPORTER_NO_REPORT except in /testing

---
 dom/plugins/test/mochitest/test_crash_notify_no_report.xul | 11 -----------
 dom/plugins/test/mochitest/test_crash_submit.xul           | 12 ------------
 dom/plugins/test/mochitest/test_hang_submit.xul            | 11 -----------
 3 files changed, 34 deletions(-)

(limited to 'dom/plugins/test')

diff --git a/dom/plugins/test/mochitest/test_crash_notify_no_report.xul b/dom/plugins/test/mochitest/test_crash_notify_no_report.xul
index a1344bf0f..ac2b878fb 100644
--- a/dom/plugins/test/mochitest/test_crash_notify_no_report.xul
+++ b/dom/plugins/test/mochitest/test_crash_notify_no_report.xul
@@ -83,21 +83,10 @@ function onPluginCrashed(aEvent) {
            getService(Components.interfaces.nsIObserverService);
   os.removeObserver(testObserver, "plugin-crashed");
 
-  // re-set MOZ_CRASHREPORTER_NO_REPORT
-  let env = Components.classes["@mozilla.org/process/environment;1"]
-                      .getService(Components.interfaces.nsIEnvironment);
-  env.set("MOZ_CRASHREPORTER_NO_REPORT", "1");
   SimpleTest.finish();
 }
 
 function runTests() {
-  // the test harness will have set MOZ_CRASHREPORTER_NO_REPORT,
-  // ensure that we can change the setting and have our minidumps
-  // wind up in Crash Reports/pending
-  let env = Components.classes["@mozilla.org/process/environment;1"]
-                      .getService(Components.interfaces.nsIEnvironment);
-  env.set("MOZ_CRASHREPORTER_NO_REPORT", "");
-
   var os = Components.classes["@mozilla.org/observer-service;1"].
            getService(Components.interfaces.nsIObserverService);
   os.addObserver(testObserver, "plugin-crashed", true);
diff --git a/dom/plugins/test/mochitest/test_crash_submit.xul b/dom/plugins/test/mochitest/test_crash_submit.xul
index 22f39384b..53b42b25c 100644
--- a/dom/plugins/test/mochitest/test_crash_submit.xul
+++ b/dom/plugins/test/mochitest/test_crash_submit.xul
@@ -70,11 +70,6 @@ var testObserver = {
              getService(Components.interfaces.nsIObserverService);
     os.removeObserver(testObserver, "crash-report-status");
 
-    // Then re-set MOZ_CRASHREPORTER_NO_REPORT
-    let env = Components.classes["@mozilla.org/process/environment;1"]
-                        .getService(Components.interfaces.nsIEnvironment);
-    env.set("MOZ_CRASHREPORTER_NO_REPORT", "1");
-
     // Finally re-set crashreporter URL
     crashReporter.serverURL = oldServerURL;
 
@@ -123,13 +118,6 @@ function onPluginCrashed(aEvent) {
 }
 
 function runTests() {
-  // the test harness will have set MOZ_CRASHREPORTER_NO_REPORT,
-  // ensure that we can change the setting and have our minidumps
-  // wind up in Crash Reports/pending
-  let env = Components.classes["@mozilla.org/process/environment;1"]
-                      .getService(Components.interfaces.nsIEnvironment);
-  env.set("MOZ_CRASHREPORTER_NO_REPORT", "");
-
   // Override the crash reporter URL to send to our fake server
   crashReporter.serverURL = NetUtil.newURI(SERVER_URL);
 
diff --git a/dom/plugins/test/mochitest/test_hang_submit.xul b/dom/plugins/test/mochitest/test_hang_submit.xul
index 6c037ecd4..52ed78c6b 100644
--- a/dom/plugins/test/mochitest/test_hang_submit.xul
+++ b/dom/plugins/test/mochitest/test_hang_submit.xul
@@ -78,10 +78,6 @@ var testObserver = {
     // Next unregister our observer
     Services.obs.removeObserver(testObserver, "crash-report-status");
 
-    // Then re-set MOZ_CRASHREPORTER_NO_REPORT
-    let env = Cc["@mozilla.org/process/environment;1"].getService(Ci.nsIEnvironment);
-    env.set("MOZ_CRASHREPORTER_NO_REPORT", "1");
-
     // Finally re-set prefs
     crashReporter.serverURL = oldServerURL;
     Services.prefs.setIntPref("dom.ipc.plugins.timeoutSecs", oldTimeoutPref);
@@ -133,13 +129,6 @@ function runTests() {
   // Default plugin hang timeout is too high for mochitests
   Services.prefs.setIntPref("dom.ipc.plugins.timeoutSecs", 1);
 
-  // the test harness will have set MOZ_CRASHREPORTER_NO_REPORT,
-  // ensure that we can change the setting and have our minidumps
-  // wind up in Crash Reports/pending
-  let env = Cc["@mozilla.org/process/environment;1"]
-                      .getService(Ci.nsIEnvironment);
-  env.set("MOZ_CRASHREPORTER_NO_REPORT", "");
-
   // Override the crash reporter URL to send to our fake server
   crashReporter.serverURL = NetUtil.newURI(SERVER_URL);
 
-- 
cgit v1.2.3