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..3426db3b1066f491365296c164e7a5e8dbd31964 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 at boot.
+  </summary>
+</histogram>
+
 <histogram name="Enterprise.AutoEnrollmentExtraTime" units="milliseconds">
   <owner>mnissler@chromium.org</owner>
   <summary>
@@ -52422,6 +52431,45 @@ 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="no attributes, other mode, TPM unlocked">
+    valid: machine in pristine state
+  </int>
+  <int value="1" label="locked attributes, other mode, TPM unlocked">
+    should not happen: install attributes locked but TPM clear

[Mattias Nissler (ping if slow), 2015/06/24 11:55:03]

If I'm not mistaken, this actually does happen in the wild. TPM ownership can
take quite a while to be established, and we may even reboot before we succeed
in taking ownership. This state should be transient though as TPM ownership
should get established eventually if the device keeps running for a long-enough
amount of time.

[Thiemo Nagel, 2015/06/24 12:49:52]

Interesting.  Thanks!

+  </int>
+  <int value="2" label="no attributes, enterprise mode, TPM unlocked">
+    impossible: non-existent install attributes cannot yield enterprise mode
+  </int>
+  <int value="3" label="locked attributes, enterprise mode, TPM unlocked">
+    inconsistent: install attributes locked but TPM clear

[Mattias Nissler (ping if slow), 2015/06/24 11:55:03]

ditto

[Thiemo Nagel, 2015/06/24 12:49:52]

Done.

+  </int>
+  <int value="4" label="no attributes, other mode, TPM locked">
+    inconsistent: install attributes clear but TPM locked
+  </int>
+  <int value="5" label="locked attributes, other mode, TPM locked">
+    valid: consumer owned
+  </int>
+  <int value="6" label="no attributes, enterprise mode, TPM locked">
+    impossible: non-existent install attributes cannot yield enterprise mode
+  </int>
+  <int value="7" label="locked attributes, enterprise mode, TPM locked">
+    valid: enterprise enrolled
+  </int>
+  <int value="8" label="no attributes, other mode, TPM unreachable">
+    error: cryptohomed unreachable
+  </int>
+  <int value="9" label="locked attributes, other mode, TPM unreachable">
+    error: cryptohomed unreachable
+  </int>
+  <int value="10" label="no attributes, enterprise mode, TPM unreachable">
+    impossible: non-existent install attributes cannot yield enterprise mode
+  </int>
+  <int value="11" label="locked attributes, enterprise mode, TPM unreachable">
+    error: cryptohomed unreachable
+  </int>
+</enum>
+
 <enum name="EnterpriseCheckError" type="int">
   <summary>
     Defined as DomainCheckErrors in