Add histograms to compare GetVersionEx() with VerQueryValue() of kernel32

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 5e334167a6657c475f9f07d0e104dc6233e13b05..8c56c55dd3be164fd1f632bffc5d53d2c62f5192 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -58379,6 +58379,30 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   </summary>
 </histogram>
 
+<histogram name="Windows.GetVersionExVersion" enum="WindowsVersion">
+  <owner>scottmg@chromium.org</owner>
+  <summary>
+    The Windows version (base::win::Version) as reported by GetVersionEx().
+  </summary>
+</histogram>
+
+<histogram name="Windows.InCompatibilityMode">

[Will Harris, 2016/03/09 23:02:50]

I think you need a enum="Boolean*" type e.g. BooleanEnabled or just Boolean.

[scottmg, 2016/03/10 00:41:31]

I copied from some other bools, dunno. Maybe it just wouldn't have a "nice" enum
name on the dashboard? Anyway, done.

+  <owner>scottmg@chromium.org</owner>
+  <summary>
+    A boolean used to indicate when the Windows version reported by
+    GetVersionEx() and the Windows version reported by VerQueryValue() on
+    kernel32 do not match.
+  </summary>
+</histogram>
+
+<histogram name="Windows.Kernel32Version" enum="WindowsVersion">
+  <owner>scottmg@chromium.org</owner>
+  <summary>
+    The Windows version (base::win::Version) as reported by VeryQueryValue() on
+    kernel32.dll.
+  </summary>
+</histogram>
+
 <histogram name="Windows.Tablet" enum="BooleanTablet">
   <owner>zturner@chromium.org</owner>
   <summary>Count of browser launches from a Windows tablet pc.</summary>
@@ -84044,6 +84068,9 @@ To add a new entry, add it with any value and run test to compute valid value.
   <int value="3" label="Vista"/>
   <int value="4" label="Windows 7"/>
   <int value="5" label="Windows 8"/>
+  <int value="6" label="Windows 8.1"/>
+  <int value="7" label="Windows 10"/>
+  <int value="8" label="Windows 10 TH2"/>
 </enum>
 
 <enum name="WindowType" type="int">