Simplify OriginTrialContext and the way it validates tokens.

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 56ecbb048820ec70db206c90e9b774b6e65071f8..0f5c01a4b966909a590ffbeec91549a07057ef92 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -37082,6 +37082,9 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
 </histogram>
 
 <histogram name="OriginTrials.FeatureEnabled" enum="OriginTrialEnableResult">
+  <obsolete>
+    Obsolete as of Chrome 54. Sort of replaced by OriginTrials.ValidationResult.
+  </obsolete>
   <owner>chasej@chromium.org</owner>
   <owner>iclelland@chromium.org</owner>
   <summary>
@@ -37093,6 +37096,9 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
 
 <histogram name="OriginTrials.FeatureEnabled.MessageGenerated"
     enum="OriginTrialMessageGeneratedResult">
+  <obsolete>
+    Obsolete as of Chrome 54.
+  </obsolete>
   <owner>chasej@chromium.org</owner>
   <owner>iclelland@chromium.org</owner>
   <summary>
@@ -37101,6 +37107,16 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   </summary>
 </histogram>
 
+<histogram name="OriginTrials.ValidationResult" enum="OriginTrialTokenStatus">
+  <owner>chasej@chromium.org</owner>
+  <owner>iclelland@chromium.org</owner>
+  <summary>
+    Counts the results of token validation checks to enable experimental
+    features. The result for each token validation check is counted once per
+    token per execution context (e.g. page, worker).
+  </summary>
+</histogram>
+
 <histogram name="OSX.BluetoothAvailability" enum="BluetoothAvailability">
   <owner>erikchen@chromium.org</owner>
   <summary>
@@ -85361,6 +85377,9 @@ To add a new entry, add it with any value and run test to compute valid value.
 </enum>
 
 <enum name="OriginTrialEnableResult" type="int">
+  <obsolete>
+    Obsolete as of M54 and replaced by OriginTrialTokenStatus.
+  </obsolete>
   <int value="0" label="Success"/>
   <int value="1" label="NotSupported"/>
   <int value="2" label="Insecure"/>
@@ -85375,11 +85394,26 @@ To add a new entry, add it with any value and run test to compute valid value.
 </enum>
 
 <enum name="OriginTrialMessageGeneratedResult" type="int">
+  <obsolete>
+    Obsolete as of Chrome 54.
+  </obsolete>
   <int value="0" label="NotRequested"/>
   <int value="1" label="Yes"/>
   <int value="2" label="No"/>
 </enum>
 
+<enum name="OriginTrialTokenStatus" type="int">
+  <int value="0" label="Success"/>
+  <int value="1" label="NotSupported"/>
+  <int value="2" label="Insecure"/>
+  <int value="3" label="Expired"/>
+  <int value="4" label="WrongOrigin"/>
+  <int value="5" label="InvalidSignature"/>
+  <int value="6" label="Malformed"/>
+  <int value="7" label="WrongVersion"/>
+  <int value="8" label="FeatureDisabled"/>
+</enum>
+
 <enum name="OSAgnosticErrno" type="int">
   <summary>Errno values with the same meanings on Mac/Win/Linux.</summary>
   <int value="0" label="0">No error</int>