Bug 473938 Stylesheets don't load without a safe browsing service r+sr=sicking

content/base/src/nsObjectLoadingContent.cpp

@@ -1754,10 +1754,6 @@ nsObjectLoadingContent::CheckClassifier(nsIChannel *aChannel)
   NS_ENSURE_SUCCESS(rv, rv);
 
   rv = classifier->Start(aChannel, PR_FALSE);
-  if (rv == NS_ERROR_FACTORY_NOT_REGISTERED) {
-    // no URI classifier, ignore this
-    return NS_OK;
-  }
   NS_ENSURE_SUCCESS(rv, rv);
 
   mClassifier = classifier;

docshell/base/nsDocShell.cpp

@@ -7798,11 +7798,6 @@ nsDocShell::CheckClassifier(nsIChannel *aChannel)
     if (!classifier) return NS_ERROR_OUT_OF_MEMORY;
 
     nsresult rv = classifier->Start(aChannel, PR_FALSE);
-    if (rv == NS_ERROR_FACTORY_NOT_REGISTERED ||
-        rv == NS_ERROR_NOT_AVAILABLE) {
-        // no URI classifier => ignored cases
-        return NS_OK;
-    }
     NS_ENSURE_SUCCESS(rv, rv);
 
     mClassifier = classifier;
@@ -9749,7 +9744,12 @@ nsClassifierCallback::Run()
 
     nsCOMPtr<nsIURIClassifier> uriClassifier =
         do_GetService(NS_URICLASSIFIERSERVICE_CONTRACTID, &rv);
-    if (NS_FAILED(rv)) return rv;
+    if (rv == NS_ERROR_FACTORY_NOT_REGISTERED ||
+        rv == NS_ERROR_NOT_AVAILABLE) {
+        // no URI classifier, ignore this failure.
+        return NS_OK;
+    }
+    NS_ENSURE_SUCCESS(rv, rv);
 
     PRBool expectCallback;
     rv = uriClassifier->Classify(uri, this, &expectCallback);