Add UMA for consistency between TPM and install attributes.

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 a662614823bb3f57514102fd3927bf799ed6549f..f3a4018618d763c5ef05d9c2b1b6facf144f6b7f 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -7832,6 +7832,15 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   </summary>
 </histogram>
 
+<histogram name="Enterprise.AttributesTPMConsistency"
+    enum="EnterpriseAttributesTPMConsistencyType">
+  <owner>tnagel@chromium.org</owner>
+  <summary>
+    Consistency between TPM lock state and absence/presence of install
+    attributes.
+  </summary>
+</histogram>
+
 <histogram name="Enterprise.AutoEnrollmentExtraTime" units="milliseconds">
   <owner>mnissler@chromium.org</owner>
   <summary>
@@ -52422,6 +52431,81 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <int value="3" label="Error"/>
 </enum>
 
+<enum name="EnterpriseAttributesTPMConsistencyType" type="int">
+  <int value="0" label="unknown attributes, enterprise mode, TPM unlocked">
+    impossible: unknown install attributes cannot yield enterprise mode
+  </int>
+  <int value="1" label="unlocked attributes, enterprise mode, TPM unlocked">
+    impossible: unlocked install attributes cannot yield enterprise mode
+  </int>
+  <int value="2" label="pending attributes, enterprise mode, TPM unlocked">
+    impossible: pending install attributes cannot yield enterprise mode
+  </int>
+  <int value="3" label="locked attributes, enterprise mode, TPM unlocked">
+    inconsistent: install attributes locked but TPM clear
+  </int>
+  <int value="4" label="unknown attributes, other mode, TPM unlocked">
+    initialization error: bad install attributes state
+  </int>
+  <int value="5" label="unlocked attributes, other mode, TPM unlocked">
+    valid: machine in pristine state
+  </int>
+  <int value="6" label="pending attributes, other mode, TPM unlocked">
+    TPM lock in progress: very rare
+  </int>
+  <int value="7" label="locked attributes, other mode, TPM unlocked">
+    should not happen: install attributes locked but TPM clear
+  </int>
+  <int value="8" label="unknown attributes, enterprise mode, TPM locked">
+    impossible: unknown install attributes cannot yield enterprise mode
+  </int>
+  <int value="9" label="unlocked attributes, enterprise mode, TPM locked">
+    impossible: unlocked install attributes cannot yield enterprise mode
+  </int>
+  <int value="10" label="pending attributes, enterprise mode, TPM locked">
+    impossible: pending install attributes cannot yield enterprise mode
+  </int>
+  <int value="11" label="locked attributes, enterprise mode, TPM locked">
+    valid: enterprise enrolled
+  </int>
+  <int value="12" label="unknown attributes, other mode, TPM locked">
+    initialization error: bad install attributes state
+  </int>
+  <int value="13" label="unlocked attributes, other mode, TPM locked">
+    inconsistent: install attributes clear but TPM locked
+  </int>
+  <int value="14" label="pending attributes, other mode, TPM locked">
+    TPM lock in progress: very rare
+  </int>
+  <int value="15" label="locked attributes, other mode, TPM locked">
+    valid: consumer owned
+  </int>
+  <int value="16" label="unknown attributes, enterprise mode, TPM unreachable">
+    impossible: unknown install attributes cannot yield enterprise mode
+  </int>
+  <int value="17" label="unlocked attributes, enterprise mode, TPM unreachable">
+    impossible: unlocked install attributes cannot yield enterprise mode
+  </int>
+  <int value="18" label="pending attributes, enterprise mode, TPM unreachable">
+    impossible: pending install attributes cannot yield enterprise mode
+  </int>
+  <int value="19" label="locked attributes, enterprise mode, TPM unreachable">
+    error: cryptohomed unreachable
+  </int>
+  <int value="20" label="unknown attributes, other mode, TPM unreachable">
+    error: cryptohomed unreachable
+  </int>
+  <int value="21" label="unlocked attributes, other mode, TPM unreachable">
+    error: cryptohomed unreachable
+  </int>
+  <int value="22" label="pending attributes, other mode, TPM unreachable">
+    error: cryptohomed unreachable
+  </int>
+  <int value="23" label="locked attributes, other mode, TPM unreachable">
+    error: cryptohomed unreachable
+  </int>
+</enum>
+
 <enum name="EnterpriseCheckError" type="int">
   <summary>
     Defined as DomainCheckErrors in