Revert "Bug 1948752 - Part 1: Throw TypeError when failing to create notification r=asuth" for causing mochitest failures @ test_notification_browser_failure.html

This reverts commit ab35f7e.

Author: Alexandru Marc

dom/notification/NotificationParent.cpp

@@ -183,14 +183,9 @@ nsresult NotificationParent::HandleAlertTopic(AlertTopic aTopic) {
       // alertshow happens first before alertfinished, and it should have
       // nullified mResolver. If not it means it failed to show and is bailing
       // out.
-      // NOTE(krosylight): The spec does not define what to do when a
-      // permission-granted notification fails to open, we throw TypeError here
-      // as that's the error for when permission is denied.
-      CopyableErrorResult rv;
-      rv.ThrowTypeError(
-          "Failed to show notification, potentially because the browser did "
-          "not have the corresponding OS-level permission."_ns);
-      mResolver.take().value()(rv);
+      // XXX: Apparently XUL manual do not disturb mode does this without firing
+      // alertshow at all.
+      mResolver.take().value()(CopyableErrorResult(NS_ERROR_FAILURE));
     }
 
     // Unpersisted already and being unregistered already by nsIAlertsService

dom/notification/test/mochitest/MockAlertsService.js

@@ -29,11 +29,6 @@ function mockServicesChromeScript() {
       // fake async alert show event
       if (listener) {
         setTimeout(() => {
-          if (this.mockFailure) {
-            listener.observe(null, "alertfinished", alert.cookie);
-            return;
-          }
-
           listener.observe(null, "alertshow", alert.cookie);
           if (this.autoClick) {
             let subject;
@@ -147,10 +142,6 @@ function mockServicesChromeScript() {
     mockAlertsService.autoClick = action || true;
   });
 
-  addMessageListener("mock-alert-service:mock-failure", action => {
-    mockAlertsService.mockFailure = action || true;
-  });
-
   addMessageListener("mock-alert-service:get-notification-ids", () =>
     Object.keys(activeNotifications)
   );
@@ -215,12 +206,6 @@ const MockAlertsService = {
       action
     );
   },
-  async mockFailure(action) {
-    await this._chromeScript.sendQuery(
-      "mock-alert-service:mock-failure",
-      action
-    );
-  },
   async getNotificationIds() {
     return await this._chromeScript.sendQuery(
       "mock-alert-service:get-notification-ids"

dom/notification/test/mochitest/NotificationTest.js

@@ -101,7 +101,6 @@ async function setupServiceWorker(src, scope) {
   SimpleTest.registerCleanupFunction(async () => {
     await registration.unregister();
   });
-  return registration;
 }
 
 async function testFrame(src, args) {

dom/notification/test/mochitest/mochitest.toml

@@ -11,13 +11,7 @@ prefs = [
 ["test_notification_basics.html"]
 skip-if = [
   "xorigin", # Bug 1792790
-  "os == 'android'", # Bug 1948752, Notification.onshow/close are broken on Android
-]
-
-["test_notification_browser_failure.html"]
-support-files = ["notification_empty_sw.js"]
-skip-if = [
-  "os == 'android'", # Bug 1948752, Notification.onshow/close are broken on Android
+  "os == 'android'", # Bug 1816427, Notification.onshow/close are broken on Android
 ]
 
 ["test_notification_crossorigin_iframe.html"]
@@ -99,13 +93,13 @@ support-files = ["create_notification.html"]
 
 ["test_notification_worker.html"]
 skip-if = [
-  "os == 'android'", # Bug 1948752, Notification.onshow/close are broken on Android
+  "os == 'android'", # Bug 1816427, Notification.onshow/close are broken on Android
 ]
 support-files = ["notification_worker.js"]
 
 ["test_notification_worker_child.html"]
 skip-if = [
-  "os == 'android'", # Bug 1948752, Notification.onshow/close are broken on Android
+  "os == 'android'", # Bug 1816427, Notification.onshow/close are broken on Android
 ]
 support-files = [
   "notification_worker_child-child.js",
@@ -114,7 +108,7 @@ support-files = [
 
 ["test_notification_worker_click.html"]
 skip-if = [
-  "os == 'android'", # Bug 1948752, Notification.onshow/close are broken on Android
+  "os == 'android'", # Bug 1816427, Notification.onshow/close are broken on Android
 ]
 
 ["test_notification_worker_permission.html"]