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 e0710b1ea0815eacdddbe6b9b234a7154a2d3da0..f7503ee0aeb90920455cc4d9b037dce93fee5c07 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -13476,10 +13476,19 @@ Therefore, the affected-histogram name has to have at least one dot in it.
 </histogram>
 
 <histogram name="Net.FtpServerTypeCount" enum="FtpServerType">
+  <obsolete>
+    Replaced by Net.FtpServerTypeCount2 on 2012-11-03.
+  </obsolete>
+  <owner>phajdan.jr@chromium.org</owner>
+  <summary>
+    Each bucket is the number of times the FTP server type was encountered.
+  </summary>
+</histogram>
+
+<histogram name="Net.FtpServerTypeCount2" enum="FtpServerType2">
   <owner>phajdan.jr@chromium.org</owner>
   <summary>
-    Each bucket is the number of FTP server types the user has encountered
-    during the session.
+    Each bucket is the number of times the FTP server type was encountered.
   </summary>
 </histogram>
 
@@ -13540,10 +13549,21 @@ Therefore, the affected-histogram name has to have at least one dot in it.
 </histogram>
 
 <histogram name="Net.HadFtpServerType" enum="FtpServerType">
+  <obsolete>
+    Replaced by Net.HadFtpServerType2 on 2012-11-13.
+  </obsolete>
   <owner>phajdan.jr@chromium.org</owner>
   <summary>
-    Each bucket is a boolean (0 or 1) indicating whether the user has had a
-    connection with an FTP server of that type during the session.
+    Each bucket is the number of sessions that encountered a given FTP server
+    type. Each session reports a given server type at most once.
+  </summary>
+</histogram>
+
+<histogram name="Net.HadFtpServerType2" enum="FtpServerType2">
+  <owner>phajdan.jr@chromium.org</owner>
+  <summary>
+    Each bucket is the number of sessions that encountered a given FTP server
+    type. Each session reports a given server type at most once.
   </summary>
 </histogram>
 
@@ -37646,8 +37666,12 @@ Therefore, the affected-histogram name has to have at least one dot in it.
 </enum>
 
 <enum name="FtpServerType" type="int">
+  <obsolete>
+    Deprecated 2012-11-13. No longer generated.
+  </obsolete>
   <summary>
-    FTP server type as defined in net/ftp/ftp_server_type_histograms.h
+    Old FTP server type as previously defined in
+    net/ftp/ftp_server_type_histograms.h
   </summary>
   <int value="0" label="Unknown">
     Unknown (could be a server we don't support, a broken server, or a security
@@ -37667,6 +37691,18 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   </int>
 </enum>
 
+<enum name="FtpServerType2" type="int">
+  <summary>
+    FTP server type as defined in net/ftp/ftp_server_type_histograms.h
+  </summary>
+  <int value="0" label="Unknown"/>
+  <int value="1" label="/bin/ls"/>
+  <int value="2" label="Windows"/>
+  <int value="3" label="VMS"/>
+  <int value="4" label="Netware"/>
+  <int value="5" label="OS/2"/>
+</enum>
+
 <enum name="GaiaSessionRestoreOutcome" type="int">
   <int value="0" label="Undefined"/>
   <int value="1" label="Success"/>