commit e2719eae27bc87c472ad8ecc4bb085bfd7ee8ce5
author Eric Robinson <ericrobinson@google.com> Thu May 23 15:53:25 2019
committer Commit Bot <commit-bot@chromium.org> Thu May 23 15:53:25 2019
tree 6d1dae9a9291a20e37b00ae0c73c58d4bc10408f
parent acfa38b8ce05dd425d831f10aeb3da8769501677

Fix to get base histograms to show for cpu metrics.

Right now looking up the base histograms without any suffixes
(Activated/Unactivated) doesn't work properly on uma.googleplex.
It indicates that the histograms are obsolete and a suffix should
be used.  John indicated he thought this was due to the extraneous
"base" in a couple histograms.  This change removes those.

Change-Id: I3552ce44af355b549539f9e6da1dfbda56100e20
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1626570
Reviewed-by: Charlie Harrison <csharrison@chromium.org>
Commit-Queue: Eric Robinson <ericrobinson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#662654}

tools/metrics/histograms/histograms.xml

diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml
index 9cd6476..63c7044 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -145875,15 +145875,15 @@
 </histogram_suffixes>
 
 <histogram_suffixes name="AdsPageLoadMetricsCpu" separator=".">
-  <suffix base="true" name="AdFrames.PerFrame.PeakWindowedPercent"
+  <suffix name="AdFrames.PerFrame.PeakWindowedPercent"
       label="The peak load over all 30 second windows while the page is
              unactivated of an ad creative. This is measured as percentage of
              a cpu core used and capped at 100% for multicore systems."/>
-  <suffix base="true" name="AdFrames.PerFrame.PercentUsage"
+  <suffix name="AdFrames.PerFrame.PercentUsage"
       label="The average load of an ad creative across the life of the page.
              This is measured as percentage of a cpu core used and capped at
              100% for multicore systems."/>
-  <suffix base="true" name="AdFrames.PerFrame.TotalUsage"
+  <suffix name="AdFrames.PerFrame.TotalUsage"
       label="The total load of an ad creative across the life of the page.
              This is measured in milliseconds and capped at 10 seconds."/>
   <affected-histogram name="PageLoad.Clients.Ads.Cpu"/>
@@ -145892,9 +145892,9 @@
 </histogram_suffixes>
 
 <histogram_suffixes name="AdsPageLoadMetricsCpuActivated" separator=".">
-  <suffix base="true" name="Activated"
+  <suffix name="Activated"
       label="Includes only creatives that have had a user gesture."/>
-  <suffix base="true" name="Unactivated"
+  <suffix name="Unactivated"
       label="Includes only creatives without a user gesture."/>
   <affected-histogram
       name="PageLoad.Clients.Ads.Cpu.AdFrames.PerFrame.PercentUsage"/>
@@ -145911,15 +145911,15 @@
 </histogram_suffixes>
 
 <histogram_suffixes name="AdsPageLoadMetricsCpuFullPage" separator=".">
-  <suffix base="true" name="FullPage.PeakWindowedPercent"
+  <suffix name="FullPage.PeakWindowedPercent"
       label="The peak load over all 30 second windows during the lifetime of
              the page. This is measured as percentage of a cpu core used and
              capped at 100% for multicore systems."/>
-  <suffix base="true" name="FullPage.PercentUsage"
+  <suffix name="FullPage.PercentUsage"
       label="The average load of the page across its lifetime. This is
              measured as percentage of a cpu core used and capped at 100% for
              multicore systems."/>
-  <suffix base="true" name="FullPage.TotalUsage"
+  <suffix name="FullPage.TotalUsage"
       label="The total load of the page across its lifetime. This is measured
              in milliseconds and capped at 10 minutes."/>
   <affected-histogram name="PageLoad.Clients.Ads.Cpu"/>