FTP: fix compatibility problems with MLSD by removing MLSD support.

net/ftp/ftp_server_type_histograms.h

Index: net/ftp/ftp_server_type_histograms.h
diff --git a/net/ftp/ftp_server_type_histograms.h b/net/ftp/ftp_server_type_histograms.h
index 6a856b1ffd8ffbc21a54cb8a5cde368e704bf875..e89ad3da892ee0a1adc3bb0f48373c38fc0980f3 100644
--- a/net/ftp/ftp_server_type_histograms.h
+++ b/net/ftp/ftp_server_type_histograms.h
@@ -24,8 +24,8 @@ enum FtpServerType {
   SERVER_WINDOWS = 10,  // Server using Windows listing style.
   SERVER_VMS = 11,      // Server using VMS listing style.
   SERVER_NETWARE = 12,  // Server using Netware listing style.
-  SERVER_MLSD = 13,     // Server using MLSD listing (RFC-3659).
-  SERVER_HPRC = 14,     // Server using HPRC listing (http://crbug.com/56547).
+
+  // Types 13-14 are RESERVED (were earlier used for MLSD listings).

[wtc, 2010/12/08 20:12:01]

This will change the value of NUM_OF_SERVER_TYPES.
Do you want to instead keep the two enums but rename them
to show they're reserved?
  // Types 13-14 are RESERVED (were earlier used for MLSD listings).
  SERVER_MLSD_RESERVED = 13,
  SERVER_HPRC_RESERVED = 14,

[jar (doing other things), 2010/12/08 20:50:12]

Assuming the only use of NUM_OF_SERVER_TYPES is in a histogram....

This code will work fine as is.... and would work fine with the reserved names. 
The time you'll have trouble is IF you add more items to the enums, and they
overlap the previous entries.  It will cause some confusion, and force you to
rename the histogram's buckets depending on the version (which is not supported
:-/) ... or revise the histogram name.

My suggestion: Go with the reservation as shown, and add a comment that they are
deprecated, and not used anymore (but reserved to avoid accidental re-use). 
This will create (for now) a pair of unused buckets, which means about 2 ints of
storage.... and that will be doubled since there is a snapshot.  For the 4 ints
total cost, you are future proofing bothersome coding confusion.

On 2010/12/08 20:12:01, wtc wrote:

 
   NUM_OF_SERVER_TYPES
 };