import changes from `dev' branch of rmottola/Arctic-Fox:

- Bug 1170609 - Make the GC markers test use SpecialPowers.Cu.forceGC so it works in e10s. r=jsantell (c9efada65)
- Bug 1171539 - ConsoleTime markers should render endStacks. r=vp (2b818c84b)
- Bug 1141614 - Part 5: Add a test for cycle collection markers; r=jsantell (2fcf9b125)
- Bug 1183579 - Inline some function needed purplexpcom. r=jduell (d4c0decb5)
- Bug 1114554 - Patch 4 - ServiceWorkerRegistration.getNotifications() on main thread. r=wchen (3d2be75e5)
- Bug 1114554 - Patch 5 - getNotifications() on worker thread. r=wchen (baf1bf0eb)
- Bug 1114554 - Patch 6 - ServiceWorkerRegistration.getNotifications() tests. r=wchen (82978dc27)
- Bug 1114554 - Patch 7 - Call BindToOwner on all threads. r=wchen (8aa9fde6b)
- Bug 1114554 - Patch 8 - Support waitUntil() on notificationclick event. r=baku (0dec01fde)
- Bug 1182964 - Replace use of nsTHashtable::EnumerateEntries with nsTHashtable::Iterator in layout/{style,svg}/. r=njn (cb7b75a0a)
- Bug 1181321 - Eliminate duplicate mRefCnt members in PromiseNativeHandler subclasses. r=baku (1ab7687e1)
- Bug 1173934 Show a message if a docshell fails to load due to SW intercept failure. r=ehsan r=jdm (fa0e3c433)
- Bug 1243312 - nsNetCID is missing in toolkit/system/unixproxy/nsLibProxySettings.cpp. r=jduell (3bae88588)
- Bug 1186042 - "Undeclared identifier" errors building nsAboutBloat.cpp. r=jduell (e1f5b0376)
- Bug 1182976 - Part 1: Get rid of IdentifierMapEntryAddNames; r=baku (bfe3f4489)
- Bug 1182976 - Part 2: Get rid of the Helper class in QuotaManager::OpenDirectoryInternal; r=janv (a2545b8fa)
- Bug 1165270 - Use origin for BroadcastChannel, r=bholley (8c789d86e)
- Bug 1182976 - Part 3: Get rid of PostMessageEnumerator; r=baku (61efbbc9e)
- Bug 1182976 follow-up: Address njn's drive-by comment (26b345e4d)
- Bug 1182978 (part 1) - Use nsTHashtable::Iterator in nsSMILAnimationController. r=birtles. (87129e7d2)
- Bug 1182978 (part 2) - Use nsTHashtable::Iterator in nsSMILAnimationController. r=birtles. (d82307b24)
- Bug 1182978 (part 3) - Use nsTHashtable::Iterator in nsSMILAnimationController. r=birtles. (b162c947f)
- Bug 1182978 (part 4) - Use nsTHashtable::Iterator in nsSMILAnimationController. r=birtles (e6039255a)
- Bug 1182978 (part 5) - Use nsTHashtable::Iterator in nsSMILTimedElement. r=birtles. (305069fe9)

docshell/base/nsDocShell.cpp

@@ -5210,6 +5210,16 @@ nsDocShell::DisplayLoadError(nsresult aError, nsIURI* aURI,
         // Broken Content Detected. e.g. Content-MD5 check failure.
         error.AssignLiteral("corruptedContentError");
         break;
+      case NS_ERROR_INTERCEPTION_FAILED:
+      case NS_ERROR_OPAQUE_INTERCEPTION_DISABLED:
+      case NS_ERROR_BAD_OPAQUE_INTERCEPTION_REQUEST_MODE:
+      case NS_ERROR_INTERCEPTED_ERROR_RESPONSE:
+      case NS_ERROR_INTERCEPTED_USED_RESPONSE:
+        // ServiceWorker intercepted request, but something went wrong.
+        nsContentUtils::MaybeReportInterceptionErrorToConsole(GetDocument(),
+                                                              aError);
+        error.AssignLiteral("corruptedContentError");
+        break;
       default:
         break;
     }
@@ -7874,6 +7884,11 @@ nsDocShell::EndPageLoad(nsIWebProgress* aProgress,
                aStatus == NS_ERROR_UNSAFE_CONTENT_TYPE ||
                aStatus == NS_ERROR_REMOTE_XUL ||
                aStatus == NS_ERROR_OFFLINE ||
+               aStatus == NS_ERROR_INTERCEPTION_FAILED ||
+               aStatus == NS_ERROR_OPAQUE_INTERCEPTION_DISABLED ||
+               aStatus == NS_ERROR_BAD_OPAQUE_INTERCEPTION_REQUEST_MODE ||
+               aStatus == NS_ERROR_INTERCEPTED_ERROR_RESPONSE ||
+               aStatus == NS_ERROR_INTERCEPTED_USED_RESPONSE ||
                NS_ERROR_GET_MODULE(aStatus) == NS_ERROR_MODULE_SECURITY) {
       // Errors to be shown for any frame
       DisplayLoadError(aStatus, url, nullptr, aChannel);
@@ -14308,7 +14323,7 @@ nsDocShell::ChannelIntercepted(nsIInterceptedChannel* aChannel)
 {
   nsRefPtr<ServiceWorkerManager> swm = ServiceWorkerManager::GetInstance();
   if (!swm) {
-    aChannel->Cancel();
+    aChannel->Cancel(NS_ERROR_INTERCEPTION_FAILED);
     return NS_OK;
   }