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 8a7a577ecfb3f6eb9d33bda98f934a4bf496115d..929d01aecbd6960ae66dddd4b7380f97530f6e47 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -4439,30 +4439,11 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <summary>Gamma properties of destination color space.</summary>
 </histogram>
 
-<histogram name="Blink.ColorSpace.Destination.ExtractedRawData"
-    enum="ColorSpaceExtractedRawDataResult">
+<histogram name="Blink.ColorSpace.Destination.ICCResult"
+    enum="ICCProfileAnalyzeResult">
   <owner>ccameron@chromium.org</owner>
   <summary>
-    Whether or not the output color space ICC profile was able to produce raw
-    transfer function tables.
-  </summary>
-</histogram>
-
-<histogram name="Blink.ColorSpace.Destination.LinearFitError">

[Ilya Sherman, 2017/02/28 02:02:16]

Please mark removed histograms as <obsolete> rather than removing them entirely
from histograms.xml.

[ccameron, 2017/02/28 16:34:41]

Done.

-  <owner>ccameron@chromium.org</owner>
-  <summary>
-    The L-infinity error (in 8-bit values) of the numerical approximation of
-    table-based ICC profile transfer functions, when falling back to a linear
-    approximation.
-  </summary>
-</histogram>
-
-<histogram name="Blink.ColorSpace.Destination.Matrix"
-    enum="ColorSpaceMatrixResult">
-  <owner>ccameron@chromium.org</owner>
-  <summary>
-    Whether or not to-XYZD50 matrix was extracted from the output color space
-    ICC profile.
+    The result of analyzing the destiation color space's ICC profile.
   </summary>
 </histogram>
 
@@ -4471,7 +4452,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <owner>ccameron@chromium.org</owner>
   <summary>
     Whether or not the nonlinear least squares fit of the table-based ICC
-    profile transfer function converged.
+    profile transfer function for a single channel converged.
   </summary>
 </histogram>
 
@@ -4479,35 +4460,17 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <owner>ccameron@chromium.org</owner>
   <summary>
     The L-infinity error (in 8-bit values) of the numerical approximation of
-    table-based ICC profile transfer functions, when the nonlinear approximation
-    converged.
-  </summary>
-</histogram>
-
-<histogram name="Blink.ColorSpace.Destination.Numerical"
-    enum="ColorSpaceNumericalResult">
-  <owner>ccameron@chromium.org</owner>
-  <summary>
-    Whether or not the output color space ICC profile has a numerical transfer
-    function.
+    table-based ICC profile transfer functions for a single channel, when the
+    nonlinear approximation converged.
   </summary>
 </histogram>
 
-<histogram name="Blink.ColorSpace.Destination.OneMinusTMax">
+<histogram name="Blink.ColorSpace.Destination.NonlinearFitErrorCombined">
   <owner>ccameron@chromium.org</owner>
   <summary>
-    One minus the maximum value of table-based ICC profile transfer functions as
-    an 8-bit fixed-point value. This histogram is temporary, to see if we can
-    bake in the assumption that it will almost always be 255.
-  </summary>
-</histogram>
-
-<histogram name="Blink.ColorSpace.Destination.TMin">
-  <owner>ccameron@chromium.org</owner>
-  <summary>
-    The minimum value of table-based ICC profile transfer functions as an 8-bit
-    fixed-point value. This histogram is temporary, to see if we can bake in the
-    assumption that it will almost always be 0.
+    The L-infinity error (in 8-bit values) of the numerical approximation of
+    table-based ICC profile transfer functions for all channels combined, when
+    the nonlinear approximation converged.
   </summary>
 </histogram>
 
@@ -83031,26 +82994,11 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <int value="30" label="More Than 30"/>
 </enum>
 
-<enum name="ColorSpaceExtractedRawDataResult" type="int">
-  <int value="0" label="Failed to extract."/>
-  <int value="1" label="Successfully extracted."/>
-</enum>
-
-<enum name="ColorSpaceMatrixResult" type="int">
-  <int value="0" label="Failed to extract toXYZD50 matrix."/>
-  <int value="1" label="Successfully extracted toXYZD50 matrix."/>
-</enum>
-
 <enum name="ColorSpaceNonlinearFitConverged" type="int">
   <int value="0" label="Did not converge."/>
   <int value="1" label="Converged."/>
 </enum>
 
-<enum name="ColorSpaceNumericalResult" type="int">
-  <int value="0" label="Failed to extract."/>
-  <int value="1" label="Successfully extracted."/>
-</enum>
-
 <enum name="CombinedHttpResponseAndNetErrorCode" type="int">
 <!-- Generated from net/base/net_error_list.h -->
 
@@ -94781,6 +94729,18 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   </int>
 </enum>
 
+<enum name="ICCProfileAnalyzeResult" type="int">
+  <int value="0"
+      label="Extracted primary matrix and numerical transfer function"/>
+  <int value="1"
+      label="Extracted primary matrix and approximated transfer function"/>
+  <int value="2"
+      label="Failed to converge in approximation of transfer function"/>
+  <int value="3" label="Failed to extract transfer function"/>
+  <int value="4" label="Failed to extract primary matrix"/>
+  <int value="5" label="Failed to parse"/>
+</enum>
+
 <enum name="IceCandidatePairTypes" type="int">
   <int value="0" label="host_host"/>
   <int value="1" label="host_srflx"/>