Revert "Migrate U-Z histograms to patterned histogram syntax"

This reverts commit 9b53f52e. Reason for revert: Causing server pipeline breakage Original change's description: > Migrate U-Z histograms to patterned histogram syntax > > This is part of a migration that replaces the old > <histogram-suffixes> syntax that was used to denote groups > of histogram to the new patterned histogram syntax. > > Bug: 758782 > Change-Id: I6cde5e15fb8d43b58006569ca01cab5765fb79e3 > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2552631 > Reviewed-by: Weilun Shi <sweilun@chromium.org> > Reviewed-by: Ilya Sherman <isherman@chromium.org> > Commit-Queue: Karthika Pai <karthikapai@google.com> > Cr-Commit-Position: refs/heads/master@{#832494} TBR=isherman@chromium.org,sweilun@chromium.org,chromium-scoped@luci-project-accounts.iam.gserviceaccount.com,karthikapai@google.com # Not skipping CQ checks because original CL landed > 1 day ago. Bug: 758782 Change-Id: I1e6f202496d6bf30f18828ddb8a1ba2647f2eec6 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2574779Reviewed-by: Alexei Svitkine <asvitkine@chromium.org> Reviewed-by: Weilun Shi <sweilun@chromium.org> Commit-Queue: Alexei Svitkine <asvitkine@chromium.org> Cr-Commit-Position: refs/heads/master@{#833876}

Revert "Migrate U-Z histograms to patterned histogram syntax"
This reverts commit 9b53f52e. Reason for revert: Causing server pipeline breakage Original change's description: > Migrate U-Z histograms to patterned histogram syntax > > This is part of a migration that replaces the old > <histogram-suffixes> syntax that was used to denote groups > of histogram to the new patterned histogram syntax. > > Bug: 758782 > Change-Id: I6cde5e15fb8d43b58006569ca01cab5765fb79e3 > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2552631 > Reviewed-by: Weilun Shi <sweilun@chromium.org> > Reviewed-by: Ilya Sherman <isherman@chromium.org> > Commit-Queue: Karthika Pai <karthikapai@google.com> > Cr-Commit-Position: refs/heads/master@{#832494} TBR=isherman@chromium.org,sweilun@chromium.org,chromium-scoped@luci-project-accounts.iam.gserviceaccount.com,karthikapai@google.com # Not skipping CQ checks because original CL landed > 1 day ago. Bug: 758782 Change-Id: I1e6f202496d6bf30f18828ddb8a1ba2647f2eec6 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2574779Reviewed-by: Alexei Svitkine <asvitkine@chromium.org> Reviewed-by: Weilun Shi <sweilun@chromium.org> Commit-Queue: Alexei Svitkine <asvitkine@chromium.org> Cr-Commit-Position: refs/heads/master@{#833876}
47d94379 · Alexei Svitkine · Chromium LUCI CQ · 24e521c6 · 47d94379 · 47d94379
Commit 47d94379 authored Dec 04, 2020 by Alexei Svitkine Committed by Chromium LUCI CQ Dec 04, 2020
5 changed files
--- a/tools/metrics/histograms/histograms_xml/histogram_suffixes_list.xml
+++ b/tools/metrics/histograms/histograms_xml/histogram_suffixes_list.xml
@@ -6578,6 +6578,24 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
  <affected-histogram name="FileBrowser.CrostiniSharedPaths.Depth"/>
 </histogram_suffixes>
+<histogram_suffixes name="FileOperations" separator=".">
+  <suffix name="DeleteFile.NonRecursive" label=""/>
+  <suffix name="DeleteFile.Recursive" label=""/>
+  <affected-histogram name="Windows.FilesystemError"/>
+  <affected-histogram name="Windows.PostOperationState"/>
+</histogram_suffixes>
+<histogram_suffixes name="FindInPageRequestEndState" separator=".">
+  <suffix name="Aborted"
+      label="The request got aborted before it went through every text in the
+             document."/>
+  <suffix name="Finished"
+      label="The request finished going through every text in the document."/>
+  <affected-histogram name="WebCore.FindInPage.NumberOfTasksPerRequest"/>
+  <affected-histogram name="WebCore.FindInPage.RequestDuration"/>
+  <affected-histogram name="WebCore.FindInPage.TotalTaskDuration"/>
+</histogram_suffixes>
 <histogram_suffixes name="FirstDownload" separator=".">
  <obsolete>
    Removed 2020-10.
@@ -7901,6 +7919,15 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
  <affected-histogram name="InProductHelp.ShouldTriggerHelpUI"/>
 </histogram_suffixes>
+<histogram_suffixes name="IPProtocolType" separator="_">
+  <suffix name="TCP" label=""/>
+  <suffix name="UDP" label=""/>
+  <affected-histogram name="WebRTC.PeerConnection.CandidatePairType"/>
+  <affected-histogram name="WebRTC.SystemMaxConsecutiveBytesDelayed"/>
+  <affected-histogram name="WebRTC.SystemPercentPacketsDelayed"/>
+  <affected-histogram name="WebRTC.SystemSendPacketDuration"/>
+</histogram_suffixes>
 <histogram_suffixes name="IPv6_Probe" separator="_">
  <suffix name="IPv6_probe_done"
      label="with IPv6 probed for and possibly disabled"/>
@@ -9398,6 +9425,16 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
  <affected-histogram name="NativeFileSystemAPI.WritePermissionRequestOutcome"/>
 </histogram_suffixes>
+<histogram_suffixes name="NatType" separator=".">
+  <suffix name="NoNAT" label=""/>
+  <suffix name="NonSymNAT" label=""/>
+  <suffix name="SymNAT" label=""/>
+  <suffix name="UnknownNAT" label=""/>
+  <affected-histogram name="WebRTC.Stun.BatchSuccessPercent"/>
+  <affected-histogram name="WebRTC.Stun.ResponseLatency"/>
+  <affected-histogram name="WebRTC.Stun.SuccessPercent"/>
+</histogram_suffixes>
 <histogram_suffixes name="NavigationCharacteristic" separator="_">
  <suffix name="ExistingRenderer_BeforeUnloadDiscounted"
      label="Navigation reused an existing renderer process. Time spent in
@@ -16260,6 +16297,24 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
      name="Scheduler.Experimental.Renderer.TotalTime.Wall.MainThread"/>
 </histogram_suffixes>
+<histogram_suffixes name="ScreenshareLayerStats" separator=".">
+  <suffix name="FrameRate"
+      label="Frames per second sent, in fps. The value is reported when a
+             stream is removed and is calculated as the total number of
+             frames in this layer, divided by the duration of the call."/>
+  <suffix name="Qp"
+      label="Average quantizer (qp) of frames sent. The value is reported
+             when a stream is removed and is calculated, for this layer, as
+             the sum of all qp values divided the number of frames."/>
+  <suffix name="TargetBitrate"
+      label="Average target bitrate in kbps. The value is reported when a
+             stream is removed and is calculated as the sum of all target
+             bitrates for this layer (sampled after frame has been encoded)
+             divided by the total number of frames for this layer."/>
+  <affected-histogram name="WebRTC.Video.Screenshare.Layer0"/>
+  <affected-histogram name="WebRTC.Video.Screenshare.Layer1"/>
+</histogram_suffixes>
 <histogram_suffixes name="ScrollSourceDevice" separator=".">
  <suffix name="Touch" label="Touch"/>
  <suffix name="Wheel" label="Wheel"/>
@@ -19369,6 +19424,15 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
  <affected-histogram name="VRSessionVideoTime"/>
 </histogram_suffixes>
+<histogram_suffixes name="WebApkDistributorType" separator=".">
+  <suffix name="Browser" label="Installed by Chrome"/>
+  <suffix name="DevicePolicy" label="Installed by device policy"/>
+  <suffix name="Other" label="Installed by other sources"/>
+  <affected-histogram name="WebApk.Session.TotalDuration2"/>
+  <affected-histogram name="WebApk.ShellApkVersion2"/>
+  <affected-histogram name="WebApk.Uninstall"/>
+</histogram_suffixes>
 <histogram_suffixes name="WebApkType" separator=".">
  <suffix name="BrowserApk" label="Installed by Chrome"/>
  <suffix name="UnboundApk" label="Not installed by Chrome"/>
@@ -19558,6 +19622,14 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
  <affected-histogram name="Media.UnderflowDuration2"/>
 </histogram_suffixes>
+<histogram_suffixes name="WebRTCEchoCancellerEstimate" separator=".">
+  <suffix name="Max" label="The maximum over the time interval"/>
+  <suffix name="Min" label="The minimum over the time interval"/>
+  <suffix name="Value" label="The last estimated value of the time interval"/>
+  <affected-histogram name="WebRTC.Audio.EchoCanceller.Erl"/>
+  <affected-histogram name="WebRTC.Audio.EchoCanceller.Erle"/>
+</histogram_suffixes>
 <histogram_suffixes name="WebRTCEchoCancellerStatisticType" separator=".">
  <suffix name="Average" label="The average over the time interval"/>
  <suffix name="Max" label="The maximum over the time interval"/>
@@ -19572,6 +19644,50 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
  <affected-histogram name="WebRTC.Audio.EchoCanceller.SuppressorGainBand1"/>
 </histogram_suffixes>
+<histogram_suffixes name="WebRTCMediaType" separator=".">
+  <suffix name="Audio" label="Audio"/>
+  <suffix name="Data" label="Data"/>
+  <suffix name="Video" label="Video"/>
+  <affected-histogram name="WebRTC.PeerConnection.SrtpCryptoSuite"/>
+  <affected-histogram name="WebRTC.PeerConnection.SslCipherSuite"/>
+</histogram_suffixes>
+<histogram_suffixes name="WebRTCVideoExperimentGroupId" separator=".">
+  <owner>ilnik@chromium.org</owner>
+  <owner>webrtc-video@google.com</owner>
+  <suffix name="ExperimentGroup0" label=""/>
+  <suffix name="ExperimentGroup1" label=""/>
+  <suffix name="ExperimentGroup2" label=""/>
+  <suffix name="ExperimentGroup3" label=""/>
+  <suffix name="ExperimentGroup4" label=""/>
+  <suffix name="S0" label=""/>
+  <suffix name="S1" label=""/>
+  <suffix name="S2" label=""/>
+  <affected-histogram name="WebRTC.Video.Decoded.Vp8.Qp"/>
+  <affected-histogram name="WebRTC.Video.EndToEndDelayInMs"/>
+  <affected-histogram name="WebRTC.Video.EndToEndDelayMaxInMs"/>
+  <affected-histogram name="WebRTC.Video.InterframeDelay95PercentileInMs"/>
+  <affected-histogram name="WebRTC.Video.InterframeDelayInMs"/>
+  <affected-histogram name="WebRTC.Video.InterframeDelayMaxInMs"/>
+  <affected-histogram name="WebRTC.Video.KeyFramesReceivedInPermille"/>
+  <affected-histogram name="WebRTC.Video.MediaBitrateReceivedInKbps"/>
+  <affected-histogram name="WebRTC.Video.ReceivedHeightInPixels"/>
+  <affected-histogram name="WebRTC.Video.ReceivedWidthInPixels"/>
+  <affected-histogram name="WebRTC.Video.Screenshare.Decoded.Vp8.Qp"/>
+  <affected-histogram name="WebRTC.Video.Screenshare.EndToEndDelayInMs"/>
+  <affected-histogram name="WebRTC.Video.Screenshare.EndToEndDelayMaxInMs"/>
+  <affected-histogram
+      name="WebRTC.Video.Screenshare.InterframeDelay95PercentileInMs"/>
+  <affected-histogram name="WebRTC.Video.Screenshare.InterframeDelayInMs"/>
+  <affected-histogram name="WebRTC.Video.Screenshare.InterframeDelayMaxInMs"/>
+  <affected-histogram
+      name="WebRTC.Video.Screenshare.KeyFramesReceivedInPermille"/>
+  <affected-histogram
+      name="WebRTC.Video.Screenshare.MediaBitrateReceivedInKbps"/>
+  <affected-histogram name="WebRTC.Video.Screenshare.ReceivedHeightInPixels"/>
+  <affected-histogram name="WebRTC.Video.Screenshare.ReceivedWidthInPixels"/>
+</histogram_suffixes>
 <histogram_suffixes name="WebSocketErrorCodesVariants" separator="_">
  <suffix name="Localhost" label=""/>
  <suffix name="NotLocalhost" label=""/>

--- a/tools/metrics/histograms/histograms_xml/web_apk/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/web_apk/histograms.xml
@@ -21,12 +21,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histograms>
-<variants name="WebApkDistributorType">
-  <variant name=".Browser" summary="Installed by Chrome"/>
-  <variant name=".DevicePolicy" summary="Installed by device policy"/>
-  <variant name=".Other" summary="Installed by other sources"/>
-</variants>
 <histogram name="WebApk.Install.AvailableSpace.Fail" units="MB"
    expires_after="2021-02-01">
  <owner>hartmanng@chromium.org</owner>
@@ -172,22 +166,19 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
  </summary>
 </histogram>
-<histogram name="WebApk.Session.TotalDuration2{WebApkDistributorType}"
+<histogram name="WebApk.Session.TotalDuration2" units="ms"
-    units="ms" expires_after="2021-05-16">
+    expires_after="2021-05-16">
  <owner>hartmanng@chromium.org</owner>
  <owner>
    src/chrome/android/java/src/org/chromium/chrome/browser/webapps/OWNERS
  </owner>
  <summary>
    The length of a WebAPK session (launch/foregrounding to backgrounding) in
-    milliseconds. {WebApkDistributorType}
+    milliseconds.
  </summary>
-  <token key="WebApkDistributorType" variants="WebApkDistributorType">
-    <variant name=""/>
-  </token>
 </histogram>
-<histogram name="WebApk.ShellApkVersion2{WebApkDistributorType}" units="units"
+<histogram base="true" name="WebApk.ShellApkVersion2" units="units"
    expires_after="2021-04-04">
  <owner>hartmanng@chromium.org</owner>
  <owner>
@@ -196,15 +187,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
  <summary>
    Records WebAPK &quot;Shell APK version&quot; when the WebAPK is launched.
    The &quot;Shell APK version&quot; is documented in shell_apk_version.gni
-    {WebApkDistributorType}
  </summary>
-  <token key="WebApkDistributorType" variants="WebApkDistributorType">
-    <variant name="">
-      <obsolete>
-        Base histogram. Use suffixes of this histogram instead.
-      </obsolete>
-    </variant>
-  </token>
 </histogram>
 <histogram name="WebApk.Startup.Cold.NewStyle.ShellLaunchToSplashscreenVisible"
@@ -257,22 +240,13 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
  </summary>
 </histogram>
-<histogram name="WebApk.Uninstall{WebApkDistributorType}" enum="BooleanHit"
+<histogram base="true" name="WebApk.Uninstall" enum="BooleanHit"
    expires_after="2021-06-06">
  <owner>hartmanng@chromium.org</owner>
  <owner>
    src/chrome/android/java/src/org/chromium/chrome/browser/webapps/OWNERS
  </owner>
-  <summary>
+  <summary>Records that a WebAPK was uninstalled.</summary>
-    Records that a WebAPK was uninstalled. {WebApkDistributorType}
-  </summary>
-  <token key="WebApkDistributorType" variants="WebApkDistributorType">
-    <variant name="">
-      <obsolete>
-        Base histogram. Use suffixes of this histogram instead.
-      </obsolete>
-    </variant>
-  </token>
 </histogram>
 <histogram name="WebApk.Update.GooglePlayUpdateResult"

--- a/tools/metrics/histograms/histograms_xml/web_core/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/web_core/histograms.xml
@@ -21,14 +21,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histograms>
-<variants name="FindInPageRequestEndState">
-  <variant name=".Aborted"
-      summary="The request got aborted before it went through every text in
-               the document."/>
-  <variant name=".Finished"
-      summary="The request finished going through every text in the document."/>
-</variants>
 <histogram name="WebCore.DistillabilityUs" units="microseconds"
    expires_after="2021-04-04">
  <owner>wychen@chromium.org</owner>
@@ -66,42 +58,27 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
  </summary>
 </histogram>
-<histogram
+<histogram base="true" name="WebCore.FindInPage.NumberOfTasksPerRequest"
-    name="WebCore.FindInPage.NumberOfTasksPerRequest{FindInPageRequestEndState}"
    units="tasks" expires_after="2021-04-04">
  <owner>rakina@chromium.org</owner>
  <owner>altimin@chromium.org</owner>
  <summary>
    Records the number of find-in-page tasks executed for a find-in-page
    request. Emitted when a find-in-page request is finished (it went through
-    the whole document) or when it got aborted. {FindInPageRequestEndState}
+    the whole document) or when it got aborted.
  </summary>
-  <token key="FindInPageRequestEndState" variants="FindInPageRequestEndState">
-    <variant name="">
-      <obsolete>
-        Base histogram. Use suffixes of this histogram instead.
-      </obsolete>
-    </variant>
-  </token>
 </histogram>
-<histogram name="WebCore.FindInPage.RequestDuration{FindInPageRequestEndState}"
+<histogram base="true" name="WebCore.FindInPage.RequestDuration" units="ms"
-    units="ms" expires_after="2021-04-04">
+    expires_after="2021-04-04">
  <owner>rakina@chromium.org</owner>
  <owner>altimin@chromium.org</owner>
  <summary>
    Records how long one find-in-page request (consisting multiple tasks) took
    from the request start until the last find-in-page task for the request
    finished. Emitted when a find-in-page request is finished (it went through
-    the whole document) or when it got aborted. {FindInPageRequestEndState}
+    the whole document) or when it got aborted.
  </summary>
-  <token key="FindInPageRequestEndState" variants="FindInPageRequestEndState">
-    <variant name="">
-      <obsolete>
-        Base histogram. Use suffixes of this histogram instead.
-      </obsolete>
-    </variant>
-  </token>
 </histogram>
 <histogram name="WebCore.FindInPage.TaskDuration" units="ms"
@@ -114,9 +91,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
  </summary>
 </histogram>
-<histogram
+<histogram base="true" name="WebCore.FindInPage.TotalTaskDuration" units="ms"
-    name="WebCore.FindInPage.TotalTaskDuration{FindInPageRequestEndState}"
+    expires_after="2021-04-04">
-    units="ms" expires_after="2021-04-04">
  <owner>rakina@chromium.org</owner>
  <owner>altimin@chromium.org</owner>
  <summary>
@@ -124,15 +100,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
    find-in-page request. Nothe that this does not include the time spent in
    between tasks. Emitted when a find-in-page request is finished (it went
    through the whole document) or when it got aborted.
-    {FindInPageRequestEndState}
+  </summary>
-  </summary>
-  <token key="FindInPageRequestEndState" variants="FindInPageRequestEndState">
-    <variant name="">
-      <obsolete>
-        Base histogram. Use suffixes of this histogram instead.
-      </obsolete>
-    </variant>
-  </token>
 </histogram>
 <histogram name="WebCore.Framebust.ClickThroughPosition"

--- a/tools/metrics/histograms/histograms_xml/web_rtc/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/web_rtc/histograms.xml
@@ -21,82 +21,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histograms>
-<variants name="IPProtocolType">
-  <variant name="_TCP" summary=""/>
-  <variant name="_UDP" summary=""/>
-</variants>
-<variants name="NatType">
-  <variant name=".NoNAT" summary=""/>
-  <variant name=".NonSymNAT" summary=""/>
-  <variant name=".SymNAT" summary=""/>
-  <variant name=".UnknownNAT" summary=""/>
-</variants>
-<variants name="ScreenshareLayerStats">
-  <variant name=".FrameRate"
-      summary="Frames per second sent, in fps. The value is reported when a
-               stream is removed and is calculated as the total number of
-               frames in this layer, divided by the duration of the call."/>
-  <variant name=".Qp"
-      summary="Average quantizer (qp) of frames sent. The value is reported
-               when a stream is removed and is calculated, for this layer, as
-               the sum of all qp values divided the number of frames."/>
-  <variant name=".TargetBitrate"
-      summary="Average target bitrate in kbps. The value is reported when a
-               stream is removed and is calculated as the sum of all target
-               bitrates for this layer (sampled after frame has been encoded)
-               divided by the total number of frames for this layer."/>
-</variants>
-<variants name="WebRTCEchoCancellerEstimate">
-  <variant name=".Max" summary="The maximum over the time interval"/>
-  <variant name=".Min" summary="The minimum over the time interval"/>
-  <variant name=".Value"
-      summary="The last estimated value of the time interval"/>
-</variants>
-<variants name="WebRTCMediaType">
-  <variant name=".Audio" summary="Audio"/>
-  <variant name=".Data" summary="Data"/>
-  <variant name=".Video" summary="Video"/>
-</variants>
-<variants name="WebRTCVideoExperimentGroupId">
-  <variant name=".ExperimentGroup0" summary="">
-    <owner>ilnik@chromium.org</owner>
-    <owner>webrtc-video@google.com</owner>
-  </variant>
-  <variant name=".ExperimentGroup1" summary="">
-    <owner>ilnik@chromium.org</owner>
-    <owner>webrtc-video@google.com</owner>
-  </variant>
-  <variant name=".ExperimentGroup2" summary="">
-    <owner>ilnik@chromium.org</owner>
-    <owner>webrtc-video@google.com</owner>
-  </variant>
-  <variant name=".ExperimentGroup3" summary="">
-    <owner>ilnik@chromium.org</owner>
-    <owner>webrtc-video@google.com</owner>
-  </variant>
-  <variant name=".ExperimentGroup4" summary="">
-    <owner>ilnik@chromium.org</owner>
-    <owner>webrtc-video@google.com</owner>
-  </variant>
-  <variant name=".S0" summary="">
-    <owner>ilnik@chromium.org</owner>
-    <owner>webrtc-video@google.com</owner>
-  </variant>
-  <variant name=".S1" summary="">
-    <owner>ilnik@chromium.org</owner>
-    <owner>webrtc-video@google.com</owner>
-  </variant>
-  <variant name=".S2" summary="">
-    <owner>ilnik@chromium.org</owner>
-    <owner>webrtc-video@google.com</owner>
-  </variant>
-</variants>
 <histogram name="WebRTC.AecFilterHasDivergence" units="%" expires_after="M85">
  <owner>grunell@chromium.org</owner>
  <owner>minyue@chromium.org</owner>
@@ -499,6 +423,17 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
  </summary>
 </histogram>
+<histogram name="WebRTC.Audio.EchoCanceller.Erl" units="dB (shifted)"
+    expires_after="2021-10-19">
+  <owner>gustaf@chromium.org</owner>
+  <owner>peah@chromium.org</owner>
+  <summary>
+    This histogram logs the echo return loss achieved by the WebRTC echo
+    canceller as described in ITU G.168. When the echo canceller is being used,
+    one value is logged every 10 seconds per ongoing WebRTC call.
+  </summary>
+</histogram>
 <histogram name="WebRTC.Audio.EchoCanceller.ErlBand0" units="dB (shifted)"
    expires_after="2020-12-01">
  <obsolete>
@@ -527,6 +462,17 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
  </summary>
 </histogram>
+<histogram name="WebRTC.Audio.EchoCanceller.Erle" units="dB"
+    expires_after="2021-10-19">
+  <owner>gustaf@chromium.org</owner>
+  <owner>peah@chromium.org</owner>
+  <summary>
+    This histogram logs the echo return loss enhancement achieved by the WebRTC
+    echo canceller as described in ITU G.168. When the echo canceller is being
+    used, one value is logged every 10 seconds per ongoing WebRTC call.
+  </summary>
+</histogram>
 <histogram name="WebRTC.Audio.EchoCanceller.ErleBand0" units="dB (shifted)"
    expires_after="2020-12-01">
  <obsolete>
@@ -555,38 +501,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
  </summary>
 </histogram>
-<histogram name="WebRTC.Audio.EchoCanceller.Erle{WebRTCEchoCancellerEstimate}"
-    units="dB" expires_after="2021-10-19">
-  <owner>gustaf@chromium.org</owner>
-  <owner>peah@chromium.org</owner>
-  <summary>
-    This histogram logs the echo return loss enhancement achieved by the WebRTC
-    echo canceller as described in ITU G.168. When the echo canceller is being
-    used, one value is logged every 10 seconds per ongoing WebRTC call.
-    {WebRTCEchoCancellerEstimate}
-  </summary>
-  <token key="WebRTCEchoCancellerEstimate"
-      variants="WebRTCEchoCancellerEstimate">
-    <variant name=""/>
-  </token>
-</histogram>
-<histogram name="WebRTC.Audio.EchoCanceller.Erl{WebRTCEchoCancellerEstimate}"
-    units="dB (shifted)" expires_after="2021-10-19">
-  <owner>gustaf@chromium.org</owner>
-  <owner>peah@chromium.org</owner>
-  <summary>
-    This histogram logs the echo return loss achieved by the WebRTC echo
-    canceller as described in ITU G.168. When the echo canceller is being used,
-    one value is logged every 10 seconds per ongoing WebRTC call.
-    {WebRTCEchoCancellerEstimate}
-  </summary>
-  <token key="WebRTCEchoCancellerEstimate"
-      variants="WebRTCEchoCancellerEstimate">
-    <variant name=""/>
-  </token>
-</histogram>
 <histogram name="WebRTC.Audio.EchoCanceller.FilterDelay" units="Blocks"
    expires_after="2021-10-19">
  <owner>peah@chromium.org</owner>
@@ -1188,17 +1102,14 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
  </summary>
 </histogram>
-<histogram name="WebRTC.PeerConnection.CandidatePairType{IPProtocolType}"
+<histogram name="WebRTC.PeerConnection.CandidatePairType"
    enum="IceCandidatePairTypes" expires_after="2020-04-05">
  <owner>qingsi@google.com</owner>
  <owner>jeroendb@google.com</owner>
  <summary>
    Counters of various ICE Endpoint types. These values are logged for the
-    first selected candidate pair of a PeerConnection. {IPProtocolType}
+    first selected candidate pair of a PeerConnection.
  </summary>
-  <token key="IPProtocolType" variants="IPProtocolType">
-    <variant name=""/>
-  </token>
 </histogram>
 <histogram name="WebRTC.PeerConnection.ConnectionState"
@@ -1513,17 +1424,14 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
  </summary>
 </histogram>
-<histogram name="WebRTC.PeerConnection.SrtpCryptoSuite{WebRTCMediaType}"
+<histogram name="WebRTC.PeerConnection.SrtpCryptoSuite"
    enum="DTLS_SRTPCryptoSuite" expires_after="M81">
  <owner>qingsi@google.com</owner>
  <owner>jeroendb@google.com</owner>
  <summary>
    Counters on the type of SRTP crypto suites used by WebRTC. This is collected
-    whenever the transport signals the OnCompleted event. {WebRTCMediaType}
+    whenever the transport signals the OnCompleted event.
  </summary>
-  <token key="WebRTCMediaType" variants="WebRTCMediaType">
-    <variant name=""/>
-  </token>
 </histogram>
 <histogram name="WebRTC.PeerConnection.SrtpUnprotectError" enum="SrtpErrorCode"
@@ -1537,17 +1445,14 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
  </summary>
 </histogram>
-<histogram name="WebRTC.PeerConnection.SslCipherSuite{WebRTCMediaType}"
+<histogram name="WebRTC.PeerConnection.SslCipherSuite" enum="SSLCipherSuite"
-    enum="SSLCipherSuite" expires_after="M81">
+    expires_after="M81">
  <owner>qingsi@google.com</owner>
  <owner>jeroendb@google.com</owner>
  <summary>
    Counters on the type of SSL cipher suites used by WebRTC. This is collected
-    whenever the transport signals the OnCompleted event. {WebRTCMediaType}
+    whenever the transport signals the OnCompleted event.
  </summary>
-  <token key="WebRTCMediaType" variants="WebRTCMediaType">
-    <variant name=""/>
-  </token>
 </histogram>
 <histogram name="WebRTC.PeerConnection.ThermalState" enum="ThermalState"
@@ -1646,8 +1551,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
  </summary>
 </histogram>
-<histogram name="WebRTC.Stun.BatchSuccessPercent{NatType}" units="%"
+<histogram name="WebRTC.Stun.BatchSuccessPercent" units="%" expires_after="M85">
-    expires_after="M85">
  <owner>qingsi@google.com</owner>
  <owner>jeroendb@google.com</owner>
  <summary>
@@ -1656,72 +1560,54 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
    various intervals between requests. Only the first instance of renderers
    will conduct the trial and log this result. The STUN binding requests are
    grouped into multiple batches and the success rate is calculated for an
-    individual batch. {NatType}
+    individual batch.
  </summary>
-  <token key="NatType" variants="NatType">
-    <variant name=""/>
-  </token>
 </histogram>
-<histogram name="WebRTC.Stun.ResponseLatency{NatType}" units="ms"
+<histogram name="WebRTC.Stun.ResponseLatency" units="ms" expires_after="M85">
-    expires_after="M85">
  <owner>qingsi@google.com</owner>
  <owner>jeroendb@google.com</owner>
  <summary>
    For clients using a shared source port per STUN binding request, average RTT
    for requests which received a response with various intervals between
    requests. Only the first instance of renderers will conduct the trial and
-    log this result. {NatType}
+    log this result.
  </summary>
-  <token key="NatType" variants="NatType">
-    <variant name=""/>
-  </token>
 </histogram>
-<histogram name="WebRTC.Stun.SuccessPercent{NatType}" units="%"
+<histogram name="WebRTC.Stun.SuccessPercent" units="%" expires_after="M85">
-    expires_after="M85">
  <owner>qingsi@google.com</owner>
  <owner>jeroendb@google.com</owner>
  <summary>
    For clients using a shared source port per STUN binding request, success
    rate for requests which received a response with various intervals between
    requests. Only the first instance of renderers will conduct the trial and
-    log this result. {NatType}
+    log this result.
  </summary>
-  <token key="NatType" variants="NatType">
-    <variant name=""/>
-  </token>
 </histogram>
-<histogram name="WebRTC.SystemMaxConsecutiveBytesDelayed{IPProtocolType}"
+<histogram name="WebRTC.SystemMaxConsecutiveBytesDelayed" units="units"
-    units="units" expires_after="M81">
+    expires_after="M81">
  <owner>qingsi@google.com</owner>
  <owner>jeroendb@google.com</owner>
  <summary>
    The maximum of consecutive delayed bytes caused by EWOULDBLOCKs from system.
    This happens when system can't send any packet synchronously at that moment.
-    {IPProtocolType}
  </summary>
-  <token key="IPProtocolType" variants="IPProtocolType">
-    <variant name=""/>
-  </token>
 </histogram>
-<histogram name="WebRTC.SystemPercentPacketsDelayed{IPProtocolType}" units="%"
+<histogram name="WebRTC.SystemPercentPacketsDelayed" units="%"
    expires_after="M81">
  <owner>qingsi@google.com</owner>
  <owner>jeroendb@google.com</owner>
  <summary>
    The percentage of packets delayed due to ERR_IO_PENDING from system in a
    WebRTC socket. This happens when system can't send any packet synchronously
-    at that moment. {IPProtocolType}
+    at that moment.
  </summary>
-  <token key="IPProtocolType" variants="IPProtocolType">
-    <variant name=""/>
-  </token>
 </histogram>
-<histogram name="WebRTC.SystemSendPacketDuration{IPProtocolType}" units="ms"
+<histogram name="WebRTC.SystemSendPacketDuration" units="ms"
    expires_after="M81">
  <owner>qingsi@google.com</owner>
  <owner>jeroendb@google.com</owner>
@@ -1731,11 +1617,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
    EWOULDBLOCK from system) as well as the time system takes to finish the
    asynchronous send. For UDP, it's the time from P2PSocketHostUdp::Send to
    P2PSocketHostUdp::HandleSendResult. Tcp part is to be implemented.
-    {IPProtocolType}
  </summary>
-  <token key="IPProtocolType" variants="IPProtocolType">
-    <variant name=""/>
-  </token>
 </histogram>
 <histogram name="WebRTC.UnreliableDataChannelMessageSize" units="bytes"
@@ -1882,19 +1764,15 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
  </summary>
 </histogram>
-<histogram name="WebRTC.Video.Decoded.Vp8.Qp{WebRTCVideoExperimentGroupId}"
+<histogram name="WebRTC.Video.Decoded.Vp8.Qp" units="qp value"
-    units="qp value" expires_after="never">
+    expires_after="never">
 <!-- expires-never: WebRTC health metric. -->
  <owner>asapersson@chromium.org</owner>
  <summary>
    The average QP (quantizer value) per frame for a received VP8 video stream.
-    Recorded when a stream is removed. {WebRTCVideoExperimentGroupId}
+    Recorded when a stream is removed.
  </summary>
-  <token key="WebRTCVideoExperimentGroupId"
-      variants="WebRTCVideoExperimentGroupId">
-    <variant name=""/>
-  </token>
 </histogram>
 <histogram name="WebRTC.Video.DecodedFramesPerSecond" units="fps"
@@ -2080,36 +1958,27 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
  </summary>
 </histogram>
-<histogram name="WebRTC.Video.EndToEndDelayInMs{WebRTCVideoExperimentGroupId}"
+<histogram name="WebRTC.Video.EndToEndDelayInMs" units="ms"
-    units="ms" expires_after="never">
+    expires_after="never">
 <!-- expires-never: WebRTC health metric. -->
  <owner>asapersson@chromium.org</owner>
  <summary>
    The average end-to-end delay per frame for a received video stream. Recorded
-    when a stream is removed. {WebRTCVideoExperimentGroupId}
+    when a stream is removed.
  </summary>
-  <token key="WebRTCVideoExperimentGroupId"
-      variants="WebRTCVideoExperimentGroupId">
-    <variant name=""/>
-  </token>
 </histogram>
-<histogram
+<histogram name="WebRTC.Video.EndToEndDelayMaxInMs" units="ms"
-    name="WebRTC.Video.EndToEndDelayMaxInMs{WebRTCVideoExperimentGroupId}"
+    expires_after="never">
-    units="ms" expires_after="never">
 <!-- expires-never: WebRTC health metric. -->
  <owner>ilnik@chromium.org</owner>
  <owner>webrtc-video@google.com</owner>
  <summary>
    The maximum end-to-end delay per frame for a received video stream. Recorded
-    when a stream is removed. {WebRTCVideoExperimentGroupId}
+    when a stream is removed.
  </summary>
-  <token key="WebRTCVideoExperimentGroupId"
-      variants="WebRTCVideoExperimentGroupId">
-    <variant name=""/>
-  </token>
 </histogram>
 <histogram name="WebRTC.Video.FecBitrateReceivedInKbps" units="kbps"
@@ -2248,53 +2117,38 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
  </summary>
 </histogram>
-<histogram
+<histogram name="WebRTC.Video.InterframeDelay95PercentileInMs" units="ms"
-    name="WebRTC.Video.InterframeDelay95PercentileInMs{WebRTCVideoExperimentGroupId}"
+    expires_after="never">
-    units="ms" expires_after="never">
  <owner>ilnik@chromium.org</owner>
  <owner>webrtc-video@google.com</owner>
  <summary>
    The 95th percentile of interframe delay for a received video stream.
-    Recorded when a stream is removed. {WebRTCVideoExperimentGroupId}
+    Recorded when a stream is removed.
  </summary>
-  <token key="WebRTCVideoExperimentGroupId"
-      variants="WebRTCVideoExperimentGroupId">
-    <variant name=""/>
-  </token>
 </histogram>
-<histogram
+<histogram name="WebRTC.Video.InterframeDelayInMs" units="ms"
-    name="WebRTC.Video.InterframeDelayInMs{WebRTCVideoExperimentGroupId}"
+    expires_after="never">
-    units="ms" expires_after="never">
 <!-- expires-never: WebRTC health metric. -->
  <owner>ilnik@chromium.org</owner>
  <owner>webrtc-video@google.com</owner>
  <summary>
    The average interframe delay for a received video stream. Recorded when a
-    stream is removed. {WebRTCVideoExperimentGroupId}
+    stream is removed.
  </summary>
-  <token key="WebRTCVideoExperimentGroupId"
-      variants="WebRTCVideoExperimentGroupId">
-    <variant name=""/>
-  </token>
 </histogram>
-<histogram
+<histogram name="WebRTC.Video.InterframeDelayMaxInMs" units="ms"
-    name="WebRTC.Video.InterframeDelayMaxInMs{WebRTCVideoExperimentGroupId}"
+    expires_after="never">
-    units="ms" expires_after="never">
 <!-- expires-never: WebRTC health metric. -->
  <owner>ilnik@chromium.org</owner>
  <owner>webrtc-video@google.com</owner>
  <summary>
    The maximum interframe delay for a received video stream. Recorded when a
-    stream is removed. {WebRTCVideoExperimentGroupId}
+    stream is removed.
  </summary>
-  <token key="WebRTCVideoExperimentGroupId"
-      variants="WebRTCVideoExperimentGroupId">
-    <variant name=""/>
-  </token>
 </histogram>
 <histogram name="WebRTC.Video.JitterBufferDelayInMs" units="ms"
@@ -2308,20 +2162,15 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
  </summary>
 </histogram>
-<histogram
+<histogram name="WebRTC.Video.KeyFramesReceivedInPermille" units="permille"
-    name="WebRTC.Video.KeyFramesReceivedInPermille{WebRTCVideoExperimentGroupId}"
+    expires_after="never">
-    units="permille" expires_after="never">
 <!-- expires-never: WebRTC health metric. -->
  <owner>asapersson@chromium.org</owner>
  <summary>
    Permille of frames that are key frames for a received video stream. Recorded
-    when a stream is removed. {WebRTCVideoExperimentGroupId}
+    when a stream is removed.
  </summary>
-  <token key="WebRTCVideoExperimentGroupId"
-      variants="WebRTCVideoExperimentGroupId">
-    <variant name=""/>
-  </token>
 </histogram>
 <histogram name="WebRTC.Video.KeyFramesSentInPermille" units="permille"
@@ -2359,21 +2208,16 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
  </summary>
 </histogram>
-<histogram
+<histogram name="WebRTC.Video.MediaBitrateReceivedInKbps" units="kbps"
-    name="WebRTC.Video.MediaBitrateReceivedInKbps{WebRTCVideoExperimentGroupId}"
+    expires_after="never">
-    units="kbps" expires_after="never">
 <!-- expires-never: WebRTC health metric. -->
  <owner>asapersson@chromium.org</owner>
  <summary>
    The number of received media payload bits per second for a received video
    stream. Recorded when a stream is removed. The total number of bytes is
-    divided by the time the video stream exists. {WebRTCVideoExperimentGroupId}
+    divided by the time the video stream exists.
  </summary>
-  <token key="WebRTCVideoExperimentGroupId"
-      variants="WebRTCVideoExperimentGroupId">
-    <variant name=""/>
-  </token>
 </histogram>
 <histogram name="WebRTC.Video.MediaBitrateSentInKbps" units="kbps"
@@ -2549,20 +2393,15 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
  </summary>
 </histogram>
-<histogram
+<histogram name="WebRTC.Video.ReceivedHeightInPixels" units="pixels"
-    name="WebRTC.Video.ReceivedHeightInPixels{WebRTCVideoExperimentGroupId}"
+    expires_after="never">
-    units="pixels" expires_after="never">
 <!-- expires-never: WebRTC health metric. -->
  <owner>asapersson@chromium.org</owner>
  <summary>
    The average received height per frame for a received video stream. Recorded
-    when a stream is removed. {WebRTCVideoExperimentGroupId}
+    when a stream is removed.
  </summary>
-  <token key="WebRTCVideoExperimentGroupId"
-      variants="WebRTCVideoExperimentGroupId">
-    <variant name=""/>
-  </token>
 </histogram>
 <histogram name="WebRTC.Video.ReceivedPacketsLostInPercent" units="%"
@@ -2576,20 +2415,15 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
  </summary>
 </histogram>
-<histogram
+<histogram name="WebRTC.Video.ReceivedWidthInPixels" units="pixels"
-    name="WebRTC.Video.ReceivedWidthInPixels{WebRTCVideoExperimentGroupId}"
+    expires_after="never">
-    units="pixels" expires_after="never">
 <!-- expires-never: WebRTC health metric. -->
  <owner>asapersson@chromium.org</owner>
  <summary>
    The average received width per frame for a received video stream. Recorded
-    when a stream is removed. {WebRTCVideoExperimentGroupId}
+    when a stream is removed.
  </summary>
-  <token key="WebRTCVideoExperimentGroupId"
-      variants="WebRTCVideoExperimentGroupId">
-    <variant name=""/>
-  </token>
 </histogram>
 <histogram name="WebRTC.Video.ReceiveStreamLifetimeInSeconds" units="seconds"
@@ -2735,21 +2569,16 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
  </summary>
 </histogram>
-<histogram
+<histogram name="WebRTC.Video.Screenshare.Decoded.Vp8.Qp" units="qp value"
-    name="WebRTC.Video.Screenshare.Decoded.Vp8.Qp{WebRTCVideoExperimentGroupId}"
+    expires_after="never">
-    units="qp value" expires_after="never">
 <!-- expires-never: WebRTC health metric. -->
  <owner>ilnik@chromium.org</owner>
  <owner>webrtc-video@google.com</owner>
  <summary>
    The average QP (quantizer value) per frame for a received VP8 screenshare
-    stream. Recorded when a stream is removed. {WebRTCVideoExperimentGroupId}
+    stream. Recorded when a stream is removed.
  </summary>
-  <token key="WebRTCVideoExperimentGroupId"
-      variants="WebRTCVideoExperimentGroupId">
-    <variant name=""/>
-  </token>
 </histogram>
 <histogram name="WebRTC.Video.Screenshare.DroppedFrames.Capturer"
@@ -2811,38 +2640,28 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
  </summary>
 </histogram>
-<histogram
+<histogram name="WebRTC.Video.Screenshare.EndToEndDelayInMs" units="ms"
-    name="WebRTC.Video.Screenshare.EndToEndDelayInMs{WebRTCVideoExperimentGroupId}"
+    expires_after="never">
-    units="ms" expires_after="never">
 <!-- expires-never: WebRTC health metric. -->
  <owner>ilnik@chromium.org</owner>
  <owner>webrtc-video@google.com</owner>
  <summary>
    The average end-to-end delay per frame for a received screenshare stream.
-    Recorded when a stream is removed. {WebRTCVideoExperimentGroupId}
+    Recorded when a stream is removed.
  </summary>
-  <token key="WebRTCVideoExperimentGroupId"
-      variants="WebRTCVideoExperimentGroupId">
-    <variant name=""/>
-  </token>
 </histogram>
-<histogram
+<histogram name="WebRTC.Video.Screenshare.EndToEndDelayMaxInMs" units="ms"
-    name="WebRTC.Video.Screenshare.EndToEndDelayMaxInMs{WebRTCVideoExperimentGroupId}"
+    expires_after="never">
-    units="ms" expires_after="never">
 <!-- expires-never: WebRTC health metric. -->
  <owner>ilnik@chromium.org</owner>
  <owner>webrtc-video@google.com</owner>
  <summary>
    The maximum end-to-end delay per frame for a received screenshare stream.
-    Recorded when a stream is removed. {WebRTCVideoExperimentGroupId}
+    Recorded when a stream is removed.
  </summary>
-  <token key="WebRTCVideoExperimentGroupId"
-      variants="WebRTCVideoExperimentGroupId">
-    <variant name=""/>
-  </token>
 </histogram>
 <histogram name="WebRTC.Video.Screenshare.FecBitrateSentInKbps" units="kbps"
@@ -2927,8 +2746,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
  </summary>
 </histogram>
-<histogram
+<histogram name="WebRTC.Video.Screenshare.InterframeDelay95PercentileInMs"
-    name="WebRTC.Video.Screenshare.InterframeDelay95PercentileInMs{WebRTCVideoExperimentGroupId}"
    units="ms" expires_after="never">
 <!-- expires-never: WebRTC health metric. -->
@@ -2936,50 +2754,35 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
  <owner>webrtc-video@google.com</owner>
  <summary>
    The 95th percentile of interframe delay for a received screenshare stream.
-    Recorded when a stream is removed. {WebRTCVideoExperimentGroupId}
+    Recorded when a stream is removed.
  </summary>
-  <token key="WebRTCVideoExperimentGroupId"
-      variants="WebRTCVideoExperimentGroupId">
-    <variant name=""/>
-  </token>
 </histogram>
-<histogram
+<histogram name="WebRTC.Video.Screenshare.InterframeDelayInMs" units="ms"
-    name="WebRTC.Video.Screenshare.InterframeDelayInMs{WebRTCVideoExperimentGroupId}"
+    expires_after="never">
-    units="ms" expires_after="never">
 <!-- expires-never: WebRTC health metric. -->
  <owner>ilnik@chromium.org</owner>
  <owner>webrtc-video@google.com</owner>
  <summary>
    The average interframe delay for a received screenshare stream. Recorded
-    when a stream is removed. {WebRTCVideoExperimentGroupId}
+    when a stream is removed.
  </summary>
-  <token key="WebRTCVideoExperimentGroupId"
-      variants="WebRTCVideoExperimentGroupId">
-    <variant name=""/>
-  </token>
 </histogram>
-<histogram
+<histogram name="WebRTC.Video.Screenshare.InterframeDelayMaxInMs" units="ms"
-    name="WebRTC.Video.Screenshare.InterframeDelayMaxInMs{WebRTCVideoExperimentGroupId}"
+    expires_after="never">
-    units="ms" expires_after="never">
 <!-- expires-never: WebRTC health metric. -->
  <owner>ilnik@chromium.org</owner>
  <owner>webrtc-video@google.com</owner>
  <summary>
    The maximum interframe delay for a received screenshare stream. Recorded
-    when a stream is removed. {WebRTCVideoExperimentGroupId}
+    when a stream is removed.
  </summary>
-  <token key="WebRTCVideoExperimentGroupId"
-      variants="WebRTCVideoExperimentGroupId">
-    <variant name=""/>
-  </token>
 </histogram>
-<histogram
+<histogram name="WebRTC.Video.Screenshare.KeyFramesReceivedInPermille"
-    name="WebRTC.Video.Screenshare.KeyFramesReceivedInPermille{WebRTCVideoExperimentGroupId}"
    units="permille" expires_after="never">
 <!-- expires-never: WebRTC health metric. -->
@@ -2987,12 +2790,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
  <owner>webrtc-video@google.com</owner>
  <summary>
    Permille of frames that are key frames for a received screenshare stream.
-    Recorded when a stream is removed. {WebRTCVideoExperimentGroupId}
+    Recorded when a stream is removed.
  </summary>
-  <token key="WebRTCVideoExperimentGroupId"
-      variants="WebRTCVideoExperimentGroupId">
-    <variant name=""/>
-  </token>
 </histogram>
 <histogram name="WebRTC.Video.Screenshare.KeyFramesSentInPermille"
@@ -3006,32 +2805,24 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
  </summary>
 </histogram>
-<histogram name="WebRTC.Video.Screenshare.Layer0{ScreenshareLayerStats}"
+<histogram name="WebRTC.Video.Screenshare.Layer0" units="units"
-    units="units" expires_after="never">
+    expires_after="never">
 <!-- expires-never: WebRTC health metric. -->
  <owner>sprang@chromium.org</owner>
  <summary>
    Stats for the lower layer (TL0) of a screenshare stream in conference mode.
-    {ScreenshareLayerStats}
  </summary>
-  <token key="ScreenshareLayerStats" variants="ScreenshareLayerStats">
-    <variant name=""/>
-  </token>
 </histogram>
-<histogram name="WebRTC.Video.Screenshare.Layer1{ScreenshareLayerStats}"
+<histogram name="WebRTC.Video.Screenshare.Layer1" units="units"
-    units="units" expires_after="never">
+    expires_after="never">
 <!-- expires-never: WebRTC health metric. -->
  <owner>sprang@chromium.org</owner>
  <summary>
    Stats for the higher layer (TL1) of a screenshare stream in conference mode.
-    {ScreenshareLayerStats}
  </summary>
-  <token key="ScreenshareLayerStats" variants="ScreenshareLayerStats">
-    <variant name=""/>
-  </token>
 </histogram>
 <histogram name="WebRTC.Video.Screenshare.MeanFreezeDurationMs" units="ms"
@@ -3058,8 +2849,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
  </summary>
 </histogram>
-<histogram
+<histogram name="WebRTC.Video.Screenshare.MediaBitrateReceivedInKbps"
-    name="WebRTC.Video.Screenshare.MediaBitrateReceivedInKbps{WebRTCVideoExperimentGroupId}"
    units="kbps" expires_after="never">
 <!-- expires-never: WebRTC health metric. -->
@@ -3069,12 +2859,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
    The number of received media payload bits per second for a received
    screenshare stream. Recorded when a stream is removed. The total number of
    bytes is divided by the time the video stream exists.
-    {WebRTCVideoExperimentGroupId}
  </summary>
-  <token key="WebRTCVideoExperimentGroupId"
-      variants="WebRTCVideoExperimentGroupId">
-    <variant name=""/>
-  </token>
 </histogram>
 <histogram name="WebRTC.Video.Screenshare.MediaBitrateSentInKbps" units="kbps"
@@ -3160,8 +2945,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
  </summary>
 </histogram>
-<histogram
+<histogram name="WebRTC.Video.Screenshare.ReceivedHeightInPixels"
-    name="WebRTC.Video.Screenshare.ReceivedHeightInPixels{WebRTCVideoExperimentGroupId}"
    units="pixels" expires_after="never">
 <!-- expires-never: WebRTC health metric. -->
@@ -3169,12 +2953,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
  <owner>webrtc-video@google.com</owner>
  <summary>
    The average received height per frame for a received screenshare stream.
-    Recorded when a stream is removed. {WebRTCVideoExperimentGroupId}
+    Recorded when a stream is removed.
  </summary>
-  <token key="WebRTCVideoExperimentGroupId"
-      variants="WebRTCVideoExperimentGroupId">
-    <variant name=""/>
-  </token>
 </histogram>
 <histogram name="WebRTC.Video.Screenshare.ReceivedPacketsLostInPercent"
@@ -3189,21 +2969,16 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
  </summary>
 </histogram>
-<histogram
+<histogram name="WebRTC.Video.Screenshare.ReceivedWidthInPixels" units="pixels"
-    name="WebRTC.Video.Screenshare.ReceivedWidthInPixels{WebRTCVideoExperimentGroupId}"
+    expires_after="never">
-    units="pixels" expires_after="never">
 <!-- expires-never: WebRTC health metric. -->
  <owner>ilnik@chromium.org</owner>
  <owner>webrtc-video@google.com</owner>
  <summary>
    The average received width per frame for a received screenshare stream.
-    Recorded when a stream is removed. {WebRTCVideoExperimentGroupId}
+    Recorded when a stream is removed.
  </summary>
-  <token key="WebRTCVideoExperimentGroupId"
-      variants="WebRTCVideoExperimentGroupId">
-    <variant name=""/>
-  </token>
 </histogram>
 <histogram name="WebRTC.Video.Screenshare.ReceiveStreamLifetimeInSeconds"

--- a/tools/metrics/histograms/histograms_xml/windows/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/windows/histograms.xml
@@ -21,11 +21,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histograms>
-<variants name="FileOperations">
-  <variant name=".DeleteFile.NonRecursive" summary=""/>
-  <variant name=".DeleteFile.Recursive" summary=""/>
-</variants>
 <histogram name="Windows.ApplockerRunning" enum="Boolean" expires_after="M83">
  <owner>forshaw@chromium.org</owner>
  <owner>wfh@chromium.org</owner>
@@ -69,20 +64,13 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
  </summary>
 </histogram>
-<histogram name="Windows.FilesystemError{FileOperations}"
+<histogram base="true" name="Windows.FilesystemError" enum="WinGetLastError"
-    enum="WinGetLastError" expires_after="M81">
+    expires_after="M81">
  <owner>grt@chromium.org</owner>
  <summary>
    The Windows error code relating to a failed attempt to operate on a file or
-    a directory. {FileOperations}
+    a directory.
  </summary>
-  <token key="FileOperations" variants="FileOperations">
-    <variant name="">
-      <obsolete>
-        Base histogram. Use suffixes of this histogram instead.
-      </obsolete>
-    </variant>
-  </token>
 </histogram>
 <histogram name="Windows.GetVersionExVersion" enum="WindowsVersion"
@@ -293,20 +281,12 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
  </summary>
 </histogram>
-<histogram name="Windows.PostOperationState{FileOperations}"
+<histogram base="true" name="Windows.PostOperationState"
    enum="PostOperationState" expires_after="M81">
  <owner>grt@chromium.org</owner>
  <summary>
    The state of an item in the filesystem following an operation on it.
-    {FileOperations}
  </summary>
-  <token key="FileOperations" variants="FileOperations">
-    <variant name="">
-      <obsolete>
-        Base histogram. Use suffixes of this histogram instead.
-      </obsolete>
-    </variant>
-  </token>
 </histogram>
 <histogram name="Windows.ProcessorFamily" enum="ProcessorFamily"