tools/metrics/histograms/histograms.xml

Index: tools/metrics/histograms/histograms.xml
diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml
index 8c2e4430cd9743a675273cbb408994ecd291232d..f7f319d6c0d1813e1925bdedc692992fc905501e 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -91384,12 +91384,12 @@ To add a new entry, add it with any value and run test to compute valid value.
 
 <histogram_suffixes name="PageLoadMetricsClients" separator="."
     ordering="prefix">
+  <obsolete>
+    Deprecated in favor of Clients.FromGWS2.
+  </obsolete>
   <suffix name="Clients.FromGWS"

[Alexei Svitkine (slow), 2016/04/19 15:51:55]

I think you can just mark this <suffix> as obsolete if you're keeping all the
same list of affected-histograms and other suffixes.

See PrerenderSource as an example.

[Bryan McQuade, 2016/04/19 15:59:41]

Ah, thanks, didn't know about this.

I did remove a few affected-histograms that we're in the procsess of removing
generally as part of this change, such as
PageLoad.Timing2.DOMLoadingToDOMContentLoadedEventFired,
PageLoad.Timing2.DOMLoadingToFirstContentfulPaint, and
PageLoad.Timing2.NavigationToFirstLayout. These were never logged by
Clients.DocWrite.Evaluator and we want to stop logging them for
Clients.FromGWS*. I could try to mark these as deprecated explicitly in
histograms.xml if there's an easy way to do that, but I'm also fine with just
removing them as I've done here. Let me know what you prefer.

       label="PageLoadMetrics that are a result of a navigation from a Google
              web search"/>
-  <suffix name="Clients.DocWrite.Evaluator"

[Alexei Svitkine (slow), 2016/04/19 15:51:55]

Keep this here, if you're already marking this suffix group as obsolete.

[Bryan McQuade, 2016/04/19 15:59:41]

Done

-      label="PageLoadMetrics from a page that could have been evaluated by
-             the DocumentWriteEvaluator"/>
   <affected-histogram
       name="PageLoad.Timing2.DOMLoadingToDOMContentLoadedEventFired"/>
   <affected-histogram name="PageLoad.Timing2.DOMLoadingToFirstContentfulPaint"/>
@@ -91412,6 +91412,32 @@ To add a new entry, add it with any value and run test to compute valid value.
   <affected-histogram name="PageLoad.Timing2.ParseStartToFirstContentfulPaint"/>
 </histogram_suffixes>
 
+<histogram_suffixes name="PageLoadMetricsClients" separator="."
+    ordering="prefix">
+  <suffix name="Clients.FromGWS2"
+      label="PageLoadMetrics that are a result of a navigation from a Google
+             web search"/>
+  <suffix name="Clients.DocWrite.Evaluator"
+      label="PageLoadMetrics from a page that could have been evaluated by
+             the DocumentWriteEvaluator"/>
+  <affected-histogram
+      name="PageLoad.Timing2.NavigationToDOMContentLoadedEventFired"/>
+  <affected-histogram name="PageLoad.Timing2.NavigationToFirstContentfulPaint"/>
+  <affected-histogram name="PageLoad.Timing2.NavigationToFirstImagePaint"/>
+  <affected-histogram name="PageLoad.Timing2.NavigationToFirstPaint"/>
+  <affected-histogram name="PageLoad.Timing2.NavigationToFirstTextPaint"/>
+  <affected-histogram name="PageLoad.Timing2.NavigationToLoadEventFired"/>
+  <affected-histogram name="PageLoad.Timing2.ParseBlockedOnScriptLoad"/>
+  <affected-histogram
+      name="PageLoad.Timing2.ParseBlockedOnScriptLoad.ParseComplete"/>
+  <affected-histogram
+      name="PageLoad.Timing2.ParseBlockedOnScriptLoadFromDocumentWrite"/>
+  <affected-histogram
+      name="PageLoad.Timing2.ParseBlockedOnScriptLoadFromDocumentWrite.ParseComplete"/>
+  <affected-histogram name="PageLoad.Timing2.ParseDuration"/>
+  <affected-histogram name="PageLoad.Timing2.ParseStartToFirstContentfulPaint"/>
+</histogram_suffixes>
+
 <histogram_suffixes name="PageLoadType">
   <suffix name="HistoryLoad"
       label="but only for user pressing back or forward"/>