From 91e924a5c7bdb4c53bdf8e938a0686ab80c4941c Mon Sep 17 00:00:00 2001
From: Will Kahn-Greene <willkg@mozilla.com>
Date: Mon, 22 Feb 2021 17:46:29 +0000
Subject: [PATCH] Bug 1691527 - remove email bits from content process crash
 dialog. r=mconley

We no longer want to collect email data in crash reports, so we no longer need
to potentially solicit the user for it in the content process crash dialog.
This removes the disabled code for collecting email data.

Differential Revision: https://phabricator.services.mozilla.com/D105496
---
 browser/base/content/aboutTabCrashed.js       | 41 -----------
 browser/base/content/aboutTabCrashed.xhtml    |  8 ---
 .../base/content/test/tabcrashed/browser.ini  |  1 -
 .../test/tabcrashed/browser_clearEmail.js     | 71 -------------------
 .../content/test/tabcrashed/browser_shown.js  | 64 +----------------
 .../locales/en-US/browser/aboutTabCrashed.ftl |  2 -
 browser/modules/ContentCrashHandlers.jsm      | 22 +-----
 7 files changed, 3 insertions(+), 206 deletions(-)
 delete mode 100644 browser/base/content/test/tabcrashed/browser_clearEmail.js

diff --git a/browser/base/content/aboutTabCrashed.js b/browser/base/content/aboutTabCrashed.js
index f1b1234c1aef..d5da1555f3fc 100644
--- a/browser/base/content/aboutTabCrashed.js
+++ b/browser/base/content/aboutTabCrashed.js
@@ -79,10 +79,6 @@ var AboutTabCrashed = {
         this.onClick(event);
         break;
       }
-      case "input": {
-        this.onInput(event);
-        break;
-      }
     }
   },
 
@@ -96,9 +92,6 @@ var AboutTabCrashed = {
       el.addEventListener("click", this);
     });
 
-    // For setting "emailMe" checkbox automatically on email value change.
-    document.getElementById("email").addEventListener("input", this);
-
     // Error pages are loaded as LOAD_BACKGROUND, so they don't get load events.
     let event = new CustomEvent("AboutTabCrashedLoad", { bubbles: true });
     document.dispatchEvent(event);
@@ -130,14 +123,6 @@ var AboutTabCrashed = {
     }
   },
 
-  onInput(event) {
-    switch (event.target.id) {
-      case "email": {
-        document.getElementById("emailMe").checked = !!event.target.value;
-        break;
-      }
-    }
-  },
   /**
    * After this page tells the parent that it has loaded, the parent
    * will respond with whether or not a crash report is available. This
@@ -158,13 +143,6 @@ var AboutTabCrashed = {
    *          Whether or not the user prefers to send the URL of
    *          the tab that crashed.
    *
-   *        emailMe (bool):
-   *          Whether or not to send the email address of the user
-   *          in the report.
-   *
-   *        email (String):
-   *          The email address of the user (empty if emailMe is false).
-   *
    *        requestAutoSubmit (bool):
    *          Whether or not we should ask the user to automatically
    *          submit backlogged crash reports.
@@ -180,14 +158,6 @@ var AboutTabCrashed = {
       document.getElementById("sendReport").checked = data.sendReport;
       document.getElementById("includeURL").checked = data.includeURL;
 
-      if (data.requestEmail) {
-        document.getElementById("requestEmail").hidden = false;
-        document.getElementById("emailMe").checked = data.emailMe;
-        if (data.emailMe) {
-          document.getElementById("email").value = data.email;
-        }
-      }
-
       this.showCrashReportUI(data.sendReport);
     } else {
       this.showCrashReportUI(false);
@@ -255,10 +225,8 @@ var AboutTabCrashed = {
    */
   sendMessage(messageName) {
     let comments = "";
-    let email = "";
     let URL = "";
     let sendReport = false;
-    let emailMe = false;
     let includeURL = false;
     let autoSubmit = false;
 
@@ -271,13 +239,6 @@ var AboutTabCrashed = {
         if (includeURL) {
           URL = this.pageData.URL.trim();
         }
-
-        if (!document.getElementById("requestEmail").hidden) {
-          emailMe = document.getElementById("emailMe").checked;
-          if (emailMe) {
-            email = document.getElementById("email").value.trim();
-          }
-        }
       }
     }
 
@@ -293,8 +254,6 @@ var AboutTabCrashed = {
     RPMSendAsyncMessage(messageName, {
       sendReport,
       comments,
-      email,
-      emailMe,
       includeURL,
       URL,
       autoSubmit,
diff --git a/browser/base/content/aboutTabCrashed.xhtml b/browser/base/content/aboutTabCrashed.xhtml
index 87b33a1fe06c..df42de4ad363 100644
--- a/browser/base/content/aboutTabCrashed.xhtml
+++ b/browser/base/content/aboutTabCrashed.xhtml
@@ -56,14 +56,6 @@
               <span data-l10n-id="crashed-include-URL-2"></span>
             </label>
           </li>
-
-          <li id="requestEmail" hidden="true">
-            <label class="toggle-container-with-text">
-              <input type="checkbox" id="emailMe" role="checkbox"/>
-              <span data-l10n-id="crashed-email-me"></span>
-            </label>
-            <input type="text" id="email" data-l10n-id="crashed-email-placeholder"/>
-          </li>
         </ul>
 
         <div id="requestAutoSubmit" hidden="true">
diff --git a/browser/base/content/test/tabcrashed/browser.ini b/browser/base/content/test/tabcrashed/browser.ini
index e9d618925cba..3e5130bca4a5 100644
--- a/browser/base/content/test/tabcrashed/browser.ini
+++ b/browser/base/content/test/tabcrashed/browser.ini
@@ -6,7 +6,6 @@ support-files =
   file_iframe.html
 
 [browser_autoSubmitRequest.js]
-[browser_clearEmail.js]
 [browser_launchFail.js]
 [browser_multipleCrashedTabs.js]
 [browser_noPermanentKey.js]
diff --git a/browser/base/content/test/tabcrashed/browser_clearEmail.js b/browser/base/content/test/tabcrashed/browser_clearEmail.js
deleted file mode 100644
index 5bfa67db8025..000000000000
--- a/browser/base/content/test/tabcrashed/browser_clearEmail.js
+++ /dev/null
@@ -1,71 +0,0 @@
-"use strict";
-
-const PAGE =
-  "data:text/html,<html><body>A%20regular,%20everyday,%20normal%20page.";
-const EMAIL = "foo@privacy.com";
-
-add_task(async function setup() {
-  await setupLocalCrashReportServer();
-  // By default, requesting the email address of the user is disabled.
-  // For the purposes of this test, we turn it back on.
-  await SpecialPowers.pushPrefEnv({
-    set: [["browser.tabs.crashReporting.requestEmail", true]],
-  });
-});
-
-/**
- * Test that if we have an email address stored in prefs, and we decide
- * not to submit the email address in the next crash report, that we
- * clear the email address.
- */
-add_task(async function test_clear_email() {
-  return BrowserTestUtils.withNewTab(
-    {
-      gBrowser,
-      url: PAGE,
-    },
-    async function(browser) {
-      let prefs = TabCrashHandler.prefs;
-      let originalSendReport = prefs.getBoolPref("sendReport");
-      let originalEmailMe = prefs.getBoolPref("emailMe");
-      let originalIncludeURL = prefs.getBoolPref("includeURL");
-      let originalEmail = prefs.getCharPref("email");
-
-      // Pretend that we stored an email address from the previous
-      // crash
-      prefs.setCharPref("email", EMAIL);
-      prefs.setBoolPref("emailMe", true);
-
-      let tab = gBrowser.getTabForBrowser(browser);
-      await BrowserTestUtils.crashFrame(
-        browser,
-        /* shouldShowTabCrashPage */ true,
-        /* shouldClearMinidumps */ false
-      );
-      let doc = browser.contentDocument;
-
-      // Since about:tabcrashed will run in the parent process, we can safely
-      // manipulate its DOM nodes directly
-      let emailMe = doc.getElementById("emailMe");
-      emailMe.checked = false;
-
-      let crashReport = promiseCrashReport({
-        Email: "",
-      });
-
-      let restoreTab = browser.contentDocument.getElementById("restoreTab");
-      restoreTab.click();
-      await BrowserTestUtils.waitForEvent(tab, "SSTabRestored");
-      await crashReport;
-
-      is(prefs.getCharPref("email"), "", "No email address should be stored");
-
-      // Submitting the crash report may have set some prefs regarding how to
-      // send tab crash reports. Let's reset them for the next test.
-      prefs.setBoolPref("sendReport", originalSendReport);
-      prefs.setBoolPref("emailMe", originalEmailMe);
-      prefs.setBoolPref("includeURL", originalIncludeURL);
-      prefs.setCharPref("email", originalEmail);
-    }
-  );
-});
diff --git a/browser/base/content/test/tabcrashed/browser_shown.js b/browser/base/content/test/tabcrashed/browser_shown.js
index 16e698c5a68f..16e6a54feece 100644
--- a/browser/base/content/test/tabcrashed/browser_shown.js
+++ b/browser/base/content/test/tabcrashed/browser_shown.js
@@ -3,7 +3,6 @@
 const PAGE =
   "data:text/html,<html><body>A%20regular,%20everyday,%20normal%20page.";
 const COMMENTS = "Here's my test comment!";
-const EMAIL = "foo@privacy.com";
 
 // Avoid timeouts, as in bug 1325530
 requestLongerTimeout(2);
@@ -30,10 +29,6 @@ add_task(async function setup() {
  *
  *        comments (String)
  *          The comments to put in the comment textarea
- *        email (String)
- *          The email address to put in the email address input
- *        emailMe (bool)
- *          The checked value of the "Email me" checkbox
  *        includeURL (bool)
  *          The checked value of the "Include URL" checkbox
  *
@@ -53,9 +48,7 @@ function crashTabTestHelper(fieldValues, expectedExtra) {
     async function(browser) {
       let prefs = TabCrashHandler.prefs;
       let originalSendReport = prefs.getBoolPref("sendReport");
-      let originalEmailMe = prefs.getBoolPref("emailMe");
       let originalIncludeURL = prefs.getBoolPref("includeURL");
-      let originalEmail = prefs.getCharPref("email");
 
       let tab = gBrowser.getTabForBrowser(browser);
       await BrowserTestUtils.crashFrame(browser);
@@ -64,22 +57,12 @@ function crashTabTestHelper(fieldValues, expectedExtra) {
       // Since about:tabcrashed will run in the parent process, we can safely
       // manipulate its DOM nodes directly
       let comments = doc.getElementById("comments");
-      let email = doc.getElementById("email");
-      let emailMe = doc.getElementById("emailMe");
       let includeURL = doc.getElementById("includeURL");
 
       if (fieldValues.hasOwnProperty("comments")) {
         comments.value = fieldValues.comments;
       }
 
-      if (fieldValues.hasOwnProperty("email")) {
-        email.value = fieldValues.email;
-      }
-
-      if (fieldValues.hasOwnProperty("emailMe")) {
-        emailMe.checked = fieldValues.emailMe;
-      }
-
       if (fieldValues.hasOwnProperty("includeURL")) {
         includeURL.checked = fieldValues.includeURL;
       }
@@ -93,17 +76,14 @@ function crashTabTestHelper(fieldValues, expectedExtra) {
       // Submitting the crash report may have set some prefs regarding how to
       // send tab crash reports. Let's reset them for the next test.
       prefs.setBoolPref("sendReport", originalSendReport);
-      prefs.setBoolPref("emailMe", originalEmailMe);
       prefs.setBoolPref("includeURL", originalIncludeURL);
-      prefs.setCharPref("email", originalEmail);
     }
   );
 }
 
 /**
  * Tests what we send with the crash report by default. By default, we do not
- * send any comments, the URL of the crashing page, or the email address of
- * the user.
+ * send any comments or the URL of the crashing page.
  */
 add_task(async function test_default() {
   await crashTabTestHelper(
@@ -111,7 +91,6 @@ add_task(async function test_default() {
     {
       Comments: null,
       URL: "",
-      Email: null,
     }
   );
 });
@@ -127,41 +106,6 @@ add_task(async function test_just_a_comment() {
     {
       Comments: COMMENTS,
       URL: "",
-      Email: null,
-    }
-  );
-});
-
-/**
- * Test that we don't send email if emailMe is unchecked
- */
-add_task(async function test_no_email() {
-  await crashTabTestHelper(
-    {
-      email: EMAIL,
-      emailMe: false,
-    },
-    {
-      Comments: null,
-      URL: "",
-      Email: null,
-    }
-  );
-});
-
-/**
- * Test that we can send an email address if emailMe is checked
- */
-add_task(async function test_yes_email() {
-  await crashTabTestHelper(
-    {
-      email: EMAIL,
-      emailMe: true,
-    },
-    {
-      Comments: null,
-      URL: "",
-      Email: EMAIL,
     }
   );
 });
@@ -177,26 +121,22 @@ add_task(async function test_send_URL() {
     {
       Comments: null,
       URL: PAGE,
-      Email: null,
     }
   );
 });
 
 /**
- * Test that we can send comments, the email address, and the URL
+ * Test that we can send comments and the URL
  */
 add_task(async function test_send_all() {
   await crashTabTestHelper(
     {
       includeURL: true,
-      emailMe: true,
-      email: EMAIL,
       comments: COMMENTS,
     },
     {
       Comments: COMMENTS,
       URL: PAGE,
-      Email: EMAIL,
     }
   );
 });
diff --git a/browser/locales/en-US/browser/aboutTabCrashed.ftl b/browser/locales/en-US/browser/aboutTabCrashed.ftl
index b0f2481222e1..33f5098de49a 100644
--- a/browser/locales/en-US/browser/aboutTabCrashed.ftl
+++ b/browser/locales/en-US/browser/aboutTabCrashed.ftl
@@ -17,8 +17,6 @@ crashed-send-report-2 = Send an automated crash report so we can fix issues like
 crashed-comment =
     .placeholder = Optional comments (comments are publicly visible)
 crashed-include-URL-2 = Include the URLs of the sites you were on when { -brand-short-name } crashed
-crashed-email-placeholder = Enter your email address here
-crashed-email-me = Email me when more information is available
 crashed-report-sent = Crash report already submitted; thank you for helping make { -brand-short-name } better!
 crashed-request-auto-submit-title = Report background tabs
 crashed-auto-submit-checkbox-2 = Update preferences to automatically submit reports when { -brand-short-name } crashes
diff --git a/browser/modules/ContentCrashHandlers.jsm b/browser/modules/ContentCrashHandlers.jsm
index 67405374a280..ae90eb0f92a1 100644
--- a/browser/modules/ContentCrashHandlers.jsm
+++ b/browser/modules/ContentCrashHandlers.jsm
@@ -612,11 +612,6 @@ var TabCrashHandler = {
    *        URL (String)
    *          The URL that the user was on in the crashed tab
    *          before the crash occurred.
-   *        emailMe (bool):
-   *          Whether or not to include the user's email address
-   *          in the crash report.
-   *        email (String):
-   *          The email address of the user.
    *        comments (String):
    *          Any additional comments from the user.
    *
@@ -653,11 +648,10 @@ var TabCrashHandler = {
       return;
     }
 
-    let { includeURL, comments, email, emailMe, URL } = message.data;
+    let { includeURL, comments, URL } = message.data;
 
     let extraExtraKeyVals = {
       Comments: comments,
-      Email: email,
       URL,
     };
 
@@ -684,12 +678,6 @@ var TabCrashHandler = {
 
     this.prefs.setBoolPref("sendReport", true);
     this.prefs.setBoolPref("includeURL", includeURL);
-    this.prefs.setBoolPref("emailMe", emailMe);
-    if (emailMe) {
-      this.prefs.setCharPref("email", email);
-    } else {
-      this.prefs.setCharPref("email", "");
-    }
 
     this.childMap.set(childID, null); // Avoid resubmission.
     this.removeSubmitCheckboxesForSameCrash(childID);
@@ -758,24 +746,16 @@ var TabCrashHandler = {
     }
 
     let requestAutoSubmit = !UnsubmittedCrashHandler.autoSubmit;
-    let requestEmail = this.prefs.getBoolPref("requestEmail");
     let sendReport = this.prefs.getBoolPref("sendReport");
     let includeURL = this.prefs.getBoolPref("includeURL");
-    let emailMe = this.prefs.getBoolPref("emailMe");
 
     let data = {
       hasReport: true,
       sendReport,
       includeURL,
-      emailMe,
       requestAutoSubmit,
-      requestEmail,
     };
 
-    if (emailMe) {
-      data.email = this.prefs.getCharPref("email");
-    }
-
     return data;
   },