Merging upstream version 126.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 18 insertions, 11 deletions

diff --git a/toolkit/components/contentanalysis/ContentAnalysisIPCTypes.h b/toolkit/components/contentanalysis/ContentAnalysisIPCTypes.h
index a7cf812d0b..a554036257 100644
--- a/toolkit/components/contentanalysis/ContentAnalysisIPCTypes.h
+++ b/toolkit/components/contentanalysis/ContentAnalysisIPCTypes.h
@@ -17,12 +17,12 @@ namespace mozilla {
 namespace contentanalysis {
 
 enum class NoContentAnalysisResult : uint8_t {
-  CONTENT_ANALYSIS_NOT_ACTIVE,
-  CONTEXT_EXEMPT_FROM_CONTENT_ANALYSIS,
-  CANCELED,
-  ERROR_INVALID_JSON_RESPONSE,
-  ERROR_COULD_NOT_GET_DATA,
-  ERROR_OTHER,
+  ALLOW_DUE_TO_CONTENT_ANALYSIS_NOT_ACTIVE,
+  ALLOW_DUE_TO_CONTEXT_EXEMPT_FROM_CONTENT_ANALYSIS,
+  ALLOW_DUE_TO_COULD_NOT_GET_DATA,
+  DENY_DUE_TO_CANCELED,
+  DENY_DUE_TO_INVALID_JSON_RESPONSE,
+  DENY_DUE_TO_OTHER_ERROR,
   LAST_VALUE
 };
 
@@ -59,7 +59,8 @@ class ContentAnalysisResult : public nsIContentAnalysisResult {
         }
       }
     }
-    return FromNoResult(NoContentAnalysisResult::ERROR_INVALID_JSON_RESPONSE);
+    return FromNoResult(
+        NoContentAnalysisResult::DENY_DUE_TO_INVALID_JSON_RESPONSE);
   }
 
   static RefPtr<ContentAnalysisResult> FromJSONContentAnalysisResponse(
@@ -76,16 +77,21 @@ class ContentAnalysisResult : public nsIContentAnalysisResult {
         } else if (shouldAllowValue.isFalse()) {
           return FromAction(nsIContentAnalysisResponse::Action::eBlock);
         } else {
-          return FromNoResult(NoContentAnalysisResult::ERROR_OTHER);
+          return FromNoResult(NoContentAnalysisResult::DENY_DUE_TO_OTHER_ERROR);
         }
       }
     }
-    return FromNoResult(NoContentAnalysisResult::ERROR_INVALID_JSON_RESPONSE);
+    return FromNoResult(
+        NoContentAnalysisResult::DENY_DUE_TO_INVALID_JSON_RESPONSE);
   }
 
   static RefPtr<ContentAnalysisResult> FromContentAnalysisResponse(
       nsIContentAnalysisResponse* aResponse) {
-    if (aResponse->GetShouldAllowContent()) {
+    bool shouldAllowContent = false;
+    DebugOnly<nsresult> rv =
+        aResponse->GetShouldAllowContent(&shouldAllowContent);
+    MOZ_ASSERT(NS_SUCCEEDED(rv));
+    if (shouldAllowContent) {
       return FromAction(nsIContentAnalysisResponse::Action::eAllow);
     } else {
       return FromAction(nsIContentAnalysisResponse::Action::eBlock);
@@ -159,7 +165,8 @@ struct ParamTraits<mozilla::contentanalysis::ContentAnalysisResult*> {
       return true;
     }
     *aResult = mozilla::contentanalysis::ContentAnalysisResult::FromNoResult(
-        mozilla::contentanalysis::NoContentAnalysisResult::ERROR_OTHER);
+        mozilla::contentanalysis::NoContentAnalysisResult::
+            DENY_DUE_TO_OTHER_ERROR);
     return ReadParam(aReader, &((*aResult)->mValue));
   }
 };