Issue #1822 - Part 3: Remove LOAD_CLASSIFIER_URI and various

helper functions.

3 files changed, 1 insertions, 28 deletions

diff --git a/netwerk/base/nsBaseChannel.cpp b/netwerk/base/nsBaseChannel.cpp
index 85181c50bd..a4d8d0d42f 100644
--- a/netwerk/base/nsBaseChannel.cpp
+++ b/netwerk/base/nsBaseChannel.cpp
@@ -304,25 +304,6 @@ nsBaseChannel::ContinueHandleAsyncRedirect(nsresult result)
   CallbacksChanged();
 }
 
-void
-nsBaseChannel::ClassifyURI()
-{
-  // For channels created in the child process, delegate to the parent to
-  // classify URIs.
-  if (!XRE_IsParentProcess()) {
-    return;
-  }
-
-  if (mLoadFlags & LOAD_CLASSIFY_URI) {
-    RefPtr<nsChannelClassifier> classifier = new nsChannelClassifier();
-    if (classifier) {
-      classifier->Start(this);
-    } else {
-      Cancel(NS_ERROR_OUT_OF_MEMORY);
-    }
-  }
-}
-
 //-----------------------------------------------------------------------------
 // nsBaseChannel::nsISupports
 
@@ -627,7 +608,6 @@ nsBaseChannel::Open(nsIInputStream **result)
 
   if (NS_SUCCEEDED(rv)) {
     mWasOpened = true;
-    ClassifyURI();
   }
 
   return rv;
@@ -698,8 +678,6 @@ nsBaseChannel::AsyncOpen(nsIStreamListener *listener, nsISupports *ctxt)
   if (mLoadGroup)
     mLoadGroup->AddRequest(this, nullptr);
 
-  ClassifyURI();
-
   return NS_OK;
 }
 
diff --git a/netwerk/base/nsBaseChannel.h b/netwerk/base/nsBaseChannel.h
index b98609e857..390a492f9b 100644
--- a/netwerk/base/nsBaseChannel.h
+++ b/netwerk/base/nsBaseChannel.h
@@ -241,9 +241,6 @@ private:
   void ContinueHandleAsyncRedirect(nsresult result);
   nsresult ContinueRedirect();
 
-  // start URI classifier if requested
-  void ClassifyURI();
-
   class RedirectRunnable : public mozilla::Runnable
   {
   public:
diff --git a/netwerk/base/nsIChannel.idl b/netwerk/base/nsIChannel.idl
index 743e942920..b668c518d0 100644
--- a/netwerk/base/nsIChannel.idl
+++ b/netwerk/base/nsIChannel.idl
@@ -258,10 +258,8 @@ interface nsIChannel : nsIRequest
     const unsigned long LOAD_CALL_CONTENT_SNIFFERS = 1 << 21;
 
     /**
-     * This flag tells the channel to use URI classifier service to check
-     * the URI when opening the channel.
+     * Bit 22 is unused.
      */
-    const unsigned long LOAD_CLASSIFY_URI = 1 << 22;
 
     /**
      * If this flag is set, the media-type content sniffer will be allowed