fetch: Remove the now-unneeded TrustTokens.FetchFailedReason enum

crrev.com/c/2442229 added some temporary histogramming to FetchManager to identify why failing Trust Tokens operations were failing. Now that
we've found the cause (crbug.com/1128174; internal due to internal repro instructions, sorry), we can remove this instrumentation and clear up a hundred lines or so in fetch_manager.cc. We're keeping
Net.TrustTokens.NetErrorForTrustTokenOperation, which we added at close to the same time, around to use a health indicator.

Change-Id: Ib7178d30a03b1aaa529aafdd4c9f36cfc84e1dbc
Fixed: 1133944
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2561778
Commit-Queue: David Van Cleve <davidvc@chromium.org>
Reviewed-by: Yutaka Hirano <yhirano@chromium.org>
Reviewed-by: Charlie Harrison <csharrison@chromium.org>
Cr-Commit-Position: refs/heads/master@{#832069}

content/test/trust_token_browsertest.cc

@@ -39,7 +39,6 @@
 #include "services/network/trust_tokens/test/trust_token_test_util.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/blink/public/platform/resource_request_blocked_reason.h"
 #include "url/gurl.h"
 #include "url/origin.h"
 #include "url/url_canon_stdstring.h"
@@ -546,7 +545,7 @@ IN_PROC_BROWSER_TEST_F(TrustTokenBrowsertest, RecordsNetErrorCodes) {
 }
 
 IN_PROC_BROWSER_TEST_F(TrustTokenBrowsertest, RecordsFetchFailureReasons) {
-  // Verify that the Net.TrustTokens.FetchFailedReason.* metrics
+  // Verify that the Net.TrustTokens.NetErrorForFetchFailure.* metrics
   // record successfully by testing one case with a blocked resource, one case
   // with a generic net-stack failure, and one case with a Trust Tokens
   // operation failure.
@@ -568,10 +567,6 @@ IN_PROC_BROWSER_TEST_F(TrustTokenBrowsertest, RecordsFetchFailureReasons) {
                                    .catch(err => err.name);)"));
 
   content::FetchHistogramsFromChildProcesses();
-  histograms.ExpectUniqueSample(
-      "Net.TrustTokens.FetchFailedReason.Issuance",
-      9 /* fetch_manager.cc::FailedReason::kOtherNonBlockReason */,
-      /*expected_count=*/1);
   histograms.ExpectUniqueSample(
       "Net.TrustTokens.NetErrorForFetchFailure.Issuance", net::ERR_FAILED,
       /*expected_count=*/1);
@@ -585,10 +580,6 @@ IN_PROC_BROWSER_TEST_F(TrustTokenBrowsertest, RecordsFetchFailureReasons) {
                    .catch(err => err.name);)"));
 
   content::FetchHistogramsFromChildProcesses();
-  histograms.ExpectUniqueSample(
-      "Net.TrustTokens.FetchFailedReason.Redemption",
-      8 /* fetch_manager.cc::FailedReason::kTrustTokensError */,
-      /*expected_count=*/1);
   histograms.ExpectUniqueSample(
       "Net.TrustTokens.NetErrorForFetchFailure.Redemption",
       net::ERR_TRUST_TOKEN_OPERATION_FAILED,
@@ -613,12 +604,6 @@ IN_PROC_BROWSER_TEST_F(TrustTokenBrowsertest, RecordsFetchFailureReasons) {
               HasSubstr("Failed to fetch"));
 
   content::FetchHistogramsFromChildProcesses();
-  histograms.ExpectBucketCount(
-      "Net.TrustTokens.FetchFailedReason.Issuance",
-      // fetch_manager.cc::FailedReason::
-      // kCorpNotSameOriginAfterDefaultedToSameOriginByCoep
-      21,
-      /*expected_count=*/1);
   histograms.ExpectBucketCount(
       "Net.TrustTokens.NetErrorForFetchFailure.Issuance",
       net::ERR_BLOCKED_BY_RESPONSE,

third_party/blink/renderer/core/fetch/fetch_manager.cc

@@ -92,86 +92,6 @@ bool HasNonEmptyLocationHeader(const FetchHeaderList* headers) {
   return !value.IsEmpty();
 }
 
-// FailedReason enumerates reasons a fetch can return "TypeError: Failed to
-// fetch". This is a temporary measure for debugging a surprisingly high
-// incidence of "TypeError: Failed to fetch" when executing Trust Tokens
-// issuance operations (crbug.com/1128174).
-//
-// Since these values are persisted to histograms, please do not remove or
-// renumber entries.
-//
-// TODO(crbug.com/1133944): Once the investigation of Trust Tokens failures has
-// ended, remove this enum and the associated logging logic.
-enum class FailedReason {
-  kRedirectToDataUrlWithImpermissibleFetchMode = 0,
-  kContentSecurityPolicyViolation = 1,
-  kSameOriginModeButUrlNotSameOrigin = 2,
-  kModeIsNoCorsButRedirectModeIsNotFollow = 3,
-  kCorsRequestToUrlWithUnsupportedScheme = 4,
-  kSchemeFetchToUrlWithUnsupportedScheme = 5,
-  kSubresourceIntegrityVerificationError = 6,
-  kFailedRedirectCheck = 7,
-  kTrustTokensError = 8,
-  // The fetch call failed due to a reason other than any of the above, and the
-  // response was not blocked. (If it was blocked, the histogram will contain a
-  // ResourceRequestBlockedReason value.)
-  kOtherNonBlockReason = 9,
-
-  // The following correspond to the values of ResourceRequestBlockedReason:
-  kBlockedBecauseOther = 10,
-  kBlockedBecauseCSP = 11,
-  kBlockedBecauseMixedContent = 12,
-  kBlockedBecauseOrigin = 13,
-  kBlockedBecauseInspector = 14,
-  kBlockedBecauseSubresourceFilter = 15,
-  kBlockedBecauseContentType = 16,
-  kBlockedBecauseCollapsedByClient = 17,
-  kBlockedBecauseCoepFrameResourceNeedsCoepHeader = 18,
-  kBlockedBecauseCoopSandboxedIFrameCannotNavigateToCoopPage = 19,
-  kBlockedBecauseCorpNotSameOrigin = 20,
-  kBlockedBecauseCorpNotSameOriginAfterDefaultedToSameOriginByCoep = 21,
-  kBlockedBecauseCorpNotSameSite = 22,
-  kBlockedByExtensionCrbug1128174Investigation = 23,  // No longer used.
-
-  kMaxValue = kBlockedByExtensionCrbug1128174Investigation,
-};
-
-FailedReason ResourceRequestBlockedReasonToFailedReason(
-    ResourceRequestBlockedReason blocked_reason) {
-  switch (blocked_reason) {
-    case ResourceRequestBlockedReason::kOther:
-      return FailedReason::kBlockedBecauseOther;
-    case ResourceRequestBlockedReason::kCSP:
-      return FailedReason::kBlockedBecauseCSP;
-    case ResourceRequestBlockedReason::kMixedContent:
-      return FailedReason::kBlockedBecauseMixedContent;
-    case ResourceRequestBlockedReason::kOrigin:
-      return FailedReason::kBlockedBecauseOrigin;
-    case ResourceRequestBlockedReason::kInspector:
-      return FailedReason::kBlockedBecauseInspector;
-    case ResourceRequestBlockedReason::kSubresourceFilter:
-      return FailedReason::kBlockedBecauseSubresourceFilter;
-    case ResourceRequestBlockedReason::kContentType:
-      return FailedReason::kBlockedBecauseContentType;
-    case ResourceRequestBlockedReason::kCollapsedByClient:
-      return FailedReason::kBlockedBecauseCollapsedByClient;
-    case ResourceRequestBlockedReason::kCoepFrameResourceNeedsCoepHeader:
-      return FailedReason::kBlockedBecauseCoepFrameResourceNeedsCoepHeader;
-    case ResourceRequestBlockedReason::
-        kCoopSandboxedIFrameCannotNavigateToCoopPage:
-      return FailedReason::
-          kBlockedBecauseCoopSandboxedIFrameCannotNavigateToCoopPage;
-    case ResourceRequestBlockedReason::kCorpNotSameOrigin:
-      return FailedReason::kBlockedBecauseCorpNotSameOrigin;
-    case ResourceRequestBlockedReason::
-        kCorpNotSameOriginAfterDefaultedToSameOriginByCoep:
-      return FailedReason::
-          kBlockedBecauseCorpNotSameOriginAfterDefaultedToSameOriginByCoep;
-    case ResourceRequestBlockedReason::kCorpNotSameSite:
-      return FailedReason::kBlockedBecauseCorpNotSameSite;
-  }
-}
-
 const char* SerializeTrustTokenOperationType(
     network::mojom::TrustTokenOperationType operation_type) {
   switch (operation_type) {
@@ -184,19 +104,6 @@ const char* SerializeTrustTokenOperationType(
   }
 }
 
-// Logs a more descriptive reason why a fetch with Trust Tokens parameters
-// failed. This is a temporary measure for debugging a surprisingly high
-// incidence of "TypeError: Failed to fetch" when executing Trust Tokens
-// issuance operations (crbug.com/1128174).
-void HistogramFetchFailureReasonForTrustTokensOperation(
-    network::mojom::blink::TrustTokenOperationType operation_type,
-    FailedReason reason) {
-  base::UmaHistogramEnumeration(
-      base::StrCat({"Net.TrustTokens.FetchFailedReason", ".",
-                    SerializeTrustTokenOperationType(operation_type)}),
-      reason);
-}
-
 // Logs a net error describing why a fetch with Trust Tokens parameters
 // failed. This is a temporary measure for debugging a surprisingly high
 // incidence of "TypeError: Failed to fetch" when executing Trust Tokens
@@ -316,8 +223,7 @@ class FetchManager::Loader final
           "Unknown error occurred while trying to verify integrity.";
       updater_->Update(
           BytesConsumer::CreateErrored(BytesConsumer::Error(error_message)));
-      loader_->PerformNetworkError(
-          error_message, FailedReason::kSubresourceIntegrityVerificationError);
+      loader_->PerformNetworkError(error_message);
     }
 
     String DebugName() const override { return "SRIVerifier"; }
@@ -347,14 +253,12 @@ class FetchManager::Loader final
 
  private:
   void PerformSchemeFetch();
-  void PerformNetworkError(const String& message, FailedReason reason);
+  void PerformNetworkError(const String& message);
   void PerformHTTPFetch();
   void PerformDataFetch();
   // If |dom_exception| is provided, throws the specified DOMException instead
   // of the usual "Failed to fetch" TypeError.
-  void Failed(const String& message,
-              DOMException* dom_exception,
-              FailedReason reason);
+  void Failed(const String& message, DOMException* dom_exception);
   void NotifyFinished();
   ExecutionContext* GetExecutionContext() { return execution_context_; }
 
@@ -585,23 +489,15 @@ void FetchManager::Loader::DidFail(const ResourceError& error) {
   if (error.TrustTokenOperationError() !=
       network::mojom::blink::TrustTokenOperationStatus::kOk) {
     Failed(String(),
-           TrustTokenErrorToDOMException(error.TrustTokenOperationError()),
-           FailedReason::kTrustTokensError);
-    return;
-  }
-
-  if (base::Optional<ResourceRequestBlockedReason> blocked_reason =
-          error.GetResourceRequestBlockedReason()) {
-    Failed(String(), nullptr,
-           ResourceRequestBlockedReasonToFailedReason(*blocked_reason));
+           TrustTokenErrorToDOMException(error.TrustTokenOperationError()));
     return;
   }
 
-  Failed(String(), nullptr, FailedReason::kOtherNonBlockReason);
+  Failed(String(), nullptr);
 }
 
 void FetchManager::Loader::DidFailRedirectCheck() {
-  Failed(String(), nullptr, FailedReason::kFailedRedirectCheck);
+  Failed(String(), nullptr);
 }
 
 void FetchManager::Loader::Start() {
@@ -634,8 +530,7 @@ void FetchManager::Loader::Start() {
     // "A network error."
     PerformNetworkError(
         "Refused to connect to '" + fetch_request_data_->Url().ElidedString() +
-            "' because it violates the document's Content Security Policy.",
-        FailedReason::kContentSecurityPolicyViolation);
+        "' because it violates the document's Content Security Policy.");
     return;
   }
 
@@ -662,8 +557,7 @@ void FetchManager::Loader::Start() {
                         fetch_request_data_->Url().GetString() +
                         ". Request mode is \"same-origin\" but the URL\'s "
                         "origin is not same as the request origin " +
-                            fetch_request_data_->Origin()->ToString() + ".",
-                        FailedReason::kSameOriginModeButUrlNotSameOrigin);
+                        fetch_request_data_->Origin()->ToString() + ".");
     return;
   }
 
@@ -672,11 +566,10 @@ void FetchManager::Loader::Start() {
     // "If |request|'s redirect mode is not |follow|, then return a network
     // error.
     if (fetch_request_data_->Redirect() != RedirectMode::kFollow) {
-      PerformNetworkError(
-          "Fetch API cannot load " + fetch_request_data_->Url().GetString() +
+      PerformNetworkError("Fetch API cannot load " +
+                          fetch_request_data_->Url().GetString() +
                           ". Request mode is \"no-cors\" but the redirect mode "
-              "is not \"follow\".",
-          FailedReason::kModeIsNoCorsButRedirectModeIsNotFollow);
+                          "is not \"follow\".");
       return;
     }
 
@@ -697,8 +590,7 @@ void FetchManager::Loader::Start() {
     // "A network error."
     PerformNetworkError(
         "Fetch API cannot load " + fetch_request_data_->Url().GetString() +
-            ". URL scheme must be \"http\" or \"https\" for CORS request.",
-        FailedReason::kCorsRequestToUrlWithUnsupportedScheme);
+        ". URL scheme must be \"http\" or \"https\" for CORS request.");
     return;
   }
 
@@ -759,14 +651,12 @@ void FetchManager::Loader::PerformSchemeFetch() {
     PerformNetworkError(
         "Fetch API cannot load " + fetch_request_data_->Url().GetString() +
         ". URL scheme \"" + fetch_request_data_->Url().Protocol() +
-            "\" is not supported.",
-        FailedReason::kSchemeFetchToUrlWithUnsupportedScheme);
+        "\" is not supported.");
   }
 }
 
-void FetchManager::Loader::PerformNetworkError(const String& message,
-                                               FailedReason reason) {
-  Failed(message, nullptr, reason);
+void FetchManager::Loader::PerformNetworkError(const String& message) {
+  Failed(message, nullptr);
 }
 
 void FetchManager::Loader::PerformHTTPFetch() {
@@ -910,8 +800,7 @@ void FetchManager::Loader::PerformDataFetch() {
 }
 
 void FetchManager::Loader::Failed(const String& message,
-                                  DOMException* dom_exception,
-                                  FailedReason reason) {
+                                  DOMException* dom_exception) {
   if (failed_ || finished_)
     return;
   failed_ = true;
@@ -922,12 +811,6 @@ void FetchManager::Loader::Failed(const String& message,
         mojom::ConsoleMessageSource::kJavaScript,
         mojom::ConsoleMessageLevel::kError, message));
   }
-
-  if (fetch_request_data_ && fetch_request_data_->TrustTokenParams()) {
-    HistogramFetchFailureReasonForTrustTokensOperation(
-        fetch_request_data_->TrustTokenParams()->type, reason);
-  }
-
   if (resolver_) {
     ScriptState* state = resolver_->GetScriptState();
     ScriptState::Scope scope(state);

tools/metrics/histograms/histograms_xml/net/histograms.xml

@@ -4829,6 +4829,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram base="true" name="Net.TrustTokens.FetchFailedReason"
     enum="FetchFailedReasonOrResourceRequestBlockedReason"
     expires_after="2021-03-30">
+  <obsolete>
+    This was a temporary addition used for debugging during M88.
+  </obsolete>
 <!-- Name completed by histogram_suffixes name="TrustTokenOperationType" -->
 
   <owner>davidvc@chromium.org</owner>
@@ -4850,8 +4853,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <owner>privacy-sandbox-dev@chromium.org</owner>
   <summary>
     The net error for a failed Fetch API call with an associated Trust Tokens
-    operation. This might help debug a surfeit of 'TypeError: failed to fetch'
-    observed in live testing.
+    operation. This was originally added to help debug a surfeit of 'TypeError:
+    failed to fetch' observed in live testing, and it is now retained since it's
+    useful for ongoing health monitoring.
   </summary>
 </histogram>