Backed out changeset e310a6576d51 (bug 1516133) for service-workers failures with crashes on MOZ_CrashOOL

netwerk/protocol/http/TrackingDummyChannel.cpp

@@ -13,7 +13,6 @@
 #include "mozilla/Preferences.h"
 #include "nsIChannel.h"
 #include "nsIURI.h"
-#include "nsProxyRelease.h"
 
 namespace mozilla {
 namespace net {
@@ -85,14 +84,7 @@ TrackingDummyChannel::TrackingDummyChannel(nsIURI* aURI, nsIURI* aTopWindowURI,
   SetLoadInfo(aLoadInfo);
 }
 
-TrackingDummyChannel::~TrackingDummyChannel() {
-  NS_ReleaseOnMainThreadSystemGroup("TrackingDummyChannel::mLoadInfo",
-                                    mLoadInfo.forget());
-  NS_ReleaseOnMainThreadSystemGroup("TrackingDummyChannel::mURI",
-                                    mURI.forget());
-  NS_ReleaseOnMainThreadSystemGroup("TrackingDummyChannel::mTopWindowURI",
-                                    mTopWindowURI.forget());
-}
+TrackingDummyChannel::~TrackingDummyChannel() = default;
 
 bool TrackingDummyChannel::IsTrackingResource() const {
   return mIsTrackingResource;

toolkit/components/url-classifier/nsUrlClassifierDBService.cpp

@@ -51,6 +51,7 @@
 #include "mozilla/net/UrlClassifierFeatureResult.h"
 #include "mozilla/ipc/URIUtils.h"
 #include "mozilla/SyncRunnable.h"
+#include "nsProxyRelease.h"
 #include "UrlClassifierTelemetryUtils.h"
 #include "nsIURLFormatter.h"
 #include "nsIUploadChannel.h"
@@ -166,7 +167,7 @@ class FeatureHolder final {
     NS_ENSURE_SUCCESS(rv, rv);
 
     for (TableData* tableData : mTableData) {
-      rv = aWorker->DoSingleLocalLookupWithURIFragments(
+      nsresult rv = aWorker->DoSingleLocalLookupWithURIFragments(
           fragments, tableData->mTable, tableData->mResults);
       if (NS_WARN_IF(NS_FAILED(rv))) {
         return rv;
@@ -2450,15 +2451,6 @@ bool nsUrlClassifierDBService::ShutdownHasStarted() {
   return gShuttingDownThread;
 }
 
-// static
-nsUrlClassifierDBServiceWorker* nsUrlClassifierDBService::GetWorker() {
-  if (!sUrlClassifierDBService) {
-    return nullptr;
-  }
-
-  return sUrlClassifierDBService->mWorker;
-}
-
 NS_IMETHODIMP
 nsUrlClassifierDBService::AsyncClassifyLocalWithFeatures(
     nsIURI* aURI, const nsTArray<RefPtr<nsIUrlClassifierFeature>>& aFeatures,

toolkit/components/url-classifier/nsUrlClassifierDBService.h

@@ -70,9 +70,7 @@ class nsUrlClassifierDBServiceWorker;
 class nsIThread;
 class nsIURI;
 class UrlClassifierDBServiceWorkerProxy;
-
 namespace mozilla {
-
 namespace safebrowsing {
 class Classifier;
 class ProtocolParser;
@@ -80,11 +78,6 @@ class ProtocolParser;
 nsresult TablesToResponse(const nsACString& tables);
 
 }  // namespace safebrowsing
-
-namespace net {
-class AsyncUrlChannelClassifier;
-}
-
 }  // namespace mozilla
 
 // This is a proxy class that just creates a background thread and delegates
@@ -93,8 +86,6 @@ class nsUrlClassifierDBService final : public nsIUrlClassifierDBService,
                                        public nsIURIClassifier,
                                        public nsIUrlClassifierInfo,
                                        public nsIObserver {
-  friend class mozilla::net::AsyncUrlChannelClassifier;
-
  public:
   // This is thread safe. It throws an exception if the thread is busy.
   nsUrlClassifierDBService();
@@ -122,10 +113,6 @@ class nsUrlClassifierDBService final : public nsIUrlClassifierDBService,
   static bool ShutdownHasStarted();
 
  private:
-  // This method is used only by AsyncUrlChannelClassifier. If you want to use
-  // it, please contact a safebrowsing/URL-Classifier peer.
-  static nsUrlClassifierDBServiceWorker* GetWorker();
-
   const nsTArray<nsCString> kObservedPrefs = {
       NS_LITERAL_CSTRING(CHECK_MALWARE_PREF),
       NS_LITERAL_CSTRING(CHECK_PHISHING_PREF),