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 4583ac31a33fe39fda310202735974a4c971c1ab..b7c66ee3d4d6951bfa5fe3446b834bd4207e2363 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -102478,6 +102478,9 @@ To add a new entry, add it with any value and run test to compute valid value.
 </histogram_suffixes>
 
 <histogram_suffixes name="Prerender">
+  <obsolete>
+    Deprecated August 2016
+  </obsolete>
   <suffix name="PrerenderEnabled" label="prerender is enabled."/>
   <suffix name="PrerenderControl" label="prerender is disabled."/>
   <suffix name="PrerenderNoUse"
@@ -102550,7 +102553,26 @@ To add a new entry, add it with any value and run test to compute valid value.
   <affected-histogram name="Prerender.TimeToClick"/>
 </histogram_suffixes>
 
+<histogram_suffixes name="PrerenderModeType">
+  <obsolete>
+    Deprecated August 2016
+  </obsolete>
+  <suffix name="_Disabled" label="PRERENDER_MODE_DISABLED"/>
+  <suffix name="_Enabled" label="PRERENDER_MODE_EXPERIMENT_PRERENDER_GROUP"/>
+  <suffix name="_Control" label="PRERENDER_MODE_EXPERIMENT_CONTROL_GROUP"/>
+  <suffix name="_Multi"
+      label="PRERENDER_MODE_EXPERIMENT_MULTI_PRERENDER_GROUP"/>
+  <suffix name="_15MinTTL" label="PRERENDER_MODE_EXPERIMENT_15MIN_TTL_GROUP"/>
+  <suffix name="_NoUse" label="PRERENDER_MODE_EXPERIMENT_NO_USE_GROUP"/>
+  <affected-histogram name="Prerender.OmniboxNavigationsCouldPrerender"/>
+  <affected-histogram name="Prerender.OmniboxNavigationsUsedPrerenderCount"/>
+  <affected-histogram name="Prerender.OmniboxPrerenderCount"/>
+</histogram_suffixes>
+
 <histogram_suffixes name="PrerenderSource" ordering="prefix">
+  <obsolete>

[pasko, 2016/08/25 14:05:25]

some of the below is still not obsolete :)

the suffixes (with ordering="prefix", ha ha) are obsolete only for the
affected-histogram parts where <affected-histogram ...> has
_Prerender{Enabled,Control,5minTTL,...}.

Discussed offline, decided to move them to a separate <histogram_suffixes
name="DeprecatedPrerenderSource">

+    Deprecated August 2016
+  </obsolete>
   <suffix name="" label="All prerenders."/>
   <suffix name="exp1" label="Likelihood threshold experiment 1.">
     <obsolete>