Backed out changeset b308a5b128aa (bug 1553951) for causing bustages in builds/worker/workspace/build/src/toolkit/components/url-classifier/nsUrlClassifierDBService.cpp CLOSED TREE

toolkit/components/url-classifier/nsUrlClassifierDBService.cpp

@@ -374,11 +374,8 @@ nsresult nsUrlClassifierDBServiceWorker::DoLookup(
     const nsACString& spec,
     nsUrlClassifierDBService::FeatureHolder* aFeatureHolder,
     nsIUrlClassifierLookupCallback* c) {
-  // Make sure the callback is invoked when a failure occurs,
-  // otherwise we will not be able to load any url.
-  auto scopeExit = MakeScopeExit([c]() { c->LookupComplete(nullptr); });
-
   if (gShuttingDownThread) {
+    c->LookupComplete(nullptr);
     return NS_ERROR_NOT_INITIALIZED;
   }
 
@@ -388,9 +385,7 @@ nsresult nsUrlClassifierDBServiceWorker::DoLookup(
   }
 
   nsresult rv = aFeatureHolder->DoLocalLookup(spec, this);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
+  NS_ENSURE_SUCCESS(rv, rv);
 
   if (LOG_ENABLED()) {
     PRIntervalTime clockEnd = PR_IntervalNow();
@@ -400,6 +395,7 @@ nsresult nsUrlClassifierDBServiceWorker::DoLookup(
 
   UniquePtr<LookupResultArray> results = aFeatureHolder->GetTableResults();
   if (NS_WARN_IF(!results)) {
+    c->LookupComplete(nullptr);
     return NS_ERROR_OUT_OF_MEMORY;
   }
 
@@ -418,7 +414,6 @@ nsresult nsUrlClassifierDBServiceWorker::DoLookup(
   }
 
   // At this point ownership of 'results' is handed to the callback.
-  scopeExit.release();
   c->LookupComplete(std::move(results));
 
   return NS_OK;