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 65d16025996f576bbbcd682f0b53093959a19207..8ec9db504a7db01308ed22888184642ce34d1757 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -15203,7 +15203,8 @@ Therefore, the affected-histogram name has to have at least one dot in it.
     Chrome OS network metric that tracks the number of DHCP option failures
     encountered by Shill.  This indicates that Shill is using minimal DHCP
     options due to suspected MTU issues on the return path from the DHCP server
-    back to the client.
+    back to the client. Note this metric is deprecated; see
+    Network.Shill.DHCPOptionFailureDetected.

[Ilya Sherman, 2014/05/14 22:10:51]

Rather than updating the <summary> to indicate that the metric is deprecated,
please add an <obsolete> section.  (There are plenty of examples in the file you
can crib from.)  This will hide the deprecated histograms from the dashboard UI,
but still allow them to be surfaced by checking a checkbox, in case anyone wants
to do some historical analysis.

   </summary>
 </histogram>
 
@@ -15359,6 +15360,17 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   </summary>
 </histogram>
 
+<histogram name="Network.Shill.DHCPOptionFailureDetected"
+    enum="NetworkTechnology">
+  <owner>zqiu@chromium.org</owner>
+  <summary>
+    Chrome OS network metric that tracks the number of DHCP option failures
+    encountered by Shill for each network technology.  This indicates that Shill
+    is using minimal DHCP options due to suspected MTU issues on the return path
+    from the DHCP server back to the client.
+  </summary>
+</histogram>
+
 <histogram name="Network.Shill.Ethernet.DHCPOptionFailureDetected"
     enum="NetworkDHCPOptionFailure">
   <owner>quiche@chromium.org</owner>
@@ -15366,7 +15378,8 @@ Therefore, the affected-histogram name has to have at least one dot in it.
     Chrome OS network metric that tracks the number of DHCP option failures
     encountered by Shill.  This indicates that Shill is using minimal DHCP
     options due to suspected MTU issues on the return path from the DHCP server
-    back to the client.
+    back to the client. Note this metric is deprecated; see
+    Network.Shill.DHCPOptionFailureDetected.
   </summary>
 </histogram>
 
@@ -15574,6 +15587,13 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   </summary>
 </histogram>
 
+<histogram name="Network.Shill.UserInitiatedEvents" enum="UserInitiatedEvent">
+  <owner>zqiu@chromium.org</owner>
+  <summary>
+    Chrome OS network metric that tracks the number of user-initiated events.
+  </summary>
+</histogram>
+
 <histogram name="Network.Shill.Vpn.Driver" enum="VPNDriver">
   <owner>quiche@chromium.org</owner>
   <summary>
@@ -15700,7 +15720,8 @@ Therefore, the affected-histogram name has to have at least one dot in it.
     Chrome OS network metric that tracks the number of DHCP option failures
     encountered by Shill.  This indicates that Shill is using minimal DHCP
     options due to suspected MTU issues on the return path from the DHCP server
-    back to the client.
+    back to the client. Note this metric is deprecated; see
+    Network.Shill.DHCPOptionFailureDetected.
   </summary>
 </histogram>
 
@@ -15948,6 +15969,23 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   </summary>
 </histogram>
 
+<histogram name="Network.Shill.WiFi.TransmitBitrateMbps" units="Mbps">
+  <owner>zqiu@chromium.org</owner>
+  <summary>
+    Chrome OS network performance metric that tracks the transmit bitrate in
+    Mbps for the wifi device when it is connected to a network.

[Ilya Sherman, 2014/05/14 22:10:51]

Please document within the <summary> how often this is sampled.

+  </summary>
+</histogram>
+
+<histogram name="Network.Shill.WiFi.UserInitiatedConnectionResult"
+    enum="ConnectionResult">
+  <owner>zqiu@chromium.org</owner>
+  <summary>
+    Chrome OS network performance metric that tracks the result of
+    user-initiated wifi connection attempts.
+  </summary>
+</histogram>
+
 <histogram name="Network.Shill.WiMax.DHCPOptionFailureDetected"
     enum="NetworkDHCPOptionFailure">
   <owner>quiche@chromium.org</owner>
@@ -15955,7 +15993,8 @@ Therefore, the affected-histogram name has to have at least one dot in it.
     Chrome OS network metric that tracks the number of DHCP option failures
     encountered by Shill.  This indicates that Shill is using minimal DHCP
     options due to suspected MTU issues on the return path from the DHCP server
-    back to the client.
+    back to the client. Note this metric is deprecated; see
+    Network.Shill.DHCPOptionFailureDetected.
   </summary>
 </histogram>
 
@@ -32128,6 +32167,12 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   <int value="1" label="GPU compositor"/>
 </enum>
 
+<enum name="ConnectionResult" type="int">
+  <int value="0" label="Success"/>
+  <int value="1" label="Failure"/>
+  <int value="2" label="Aborted"/>
+</enum>
+
 <enum name="ConnectionType" type="int">
   <summary>
     Connection type as defined in net/base/connection_type_histograms.h
@@ -38545,6 +38590,16 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   <int value="14" label="HTTP_GET_FAILED"/>
 </enum>
 
+<enum name="NetworkTechnology" type="int">
+  <int value="0" label="Cellular"/>
+  <int value="1" label="Ethernet"/>
+  <int value="2" label="Ethernet EAP"/>
+  <int value="3" label="WiFi"/>
+  <int value="4" label="WiMax"/>
+  <int value="5" label="VPN"/>
+  <int value="6" label="Unknown"/>
+</enum>
+
 <enum name="NewTabPageActionAndroid" type="int">
   <int value="0" label="Searched using the omnibox"/>
   <int value="1" label="Navigated to Google search homepage using the omnibox"/>
@@ -42868,6 +42923,10 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   <int value="10" label="kFileSystemScheme"/>
 </enum>
 
+<enum name="UserInitiatedEvent" type="int">
+  <int value="0" label="WiFi Scan"/>
+</enum>
+
 <enum name="UserSelectableSyncType" type="int">
   <int value="0" label="Bookmarks"/>
   <int value="1" label="Preferences"/>