Backed out 2 changesets (bug 1706616) for causing failures in browser_urlQueryStringStripping_telemetry.js

CLOSED TREE

Backed out changeset 7979a6bdcdae (bug 1706616)
Backed out changeset 0d901239cc7a (bug 1706616)

docshell/base/nsDocShellLoadState.cpp

@@ -21,7 +21,6 @@
 #include "mozilla/dom/LoadURIOptionsBinding.h"
 #include "mozilla/StaticPrefs_browser.h"
 #include "mozilla/StaticPrefs_fission.h"
-#include "mozilla/Telemetry.h"
 #include "mozilla/URLQueryStringStripper.h"
 
 #include "mozilla/OriginAttributes.h"
@@ -602,16 +601,10 @@ void nsDocShellLoadState::MaybeStripTrackerQueryStrings(
     return;
   }
 
-  Telemetry::AccumulateCategorical(
-      Telemetry::LABELS_QUERY_STRIPPING_COUNT::Navigation);
-
   nsCOMPtr<nsIURI> strippedURI;
   if (URLQueryStringStripper::Strip(URI(), strippedURI)) {
     mUnstrippedURI = URI();
     SetURI(strippedURI);
-
-    Telemetry::AccumulateCategorical(
-        Telemetry::LABELS_QUERY_STRIPPING_COUNT::StripForNavigation);
   } else if (LoadType() & nsIDocShell::LOAD_CMD_RELOAD) {
     // Preserve the Unstripped URI if it's a reload. By doing this, we can
     // restore the stripped query parameters once the ETP has been toggled to