2 files changed, 7 insertions, 13 deletions
diff --git a/net/ftp/ftp_server_type_histograms.cc b/net/ftp/ftp_server_type_histograms.cc
index 591545b..84592ed 100644
--- a/net/ftp/ftp_server_type_histograms.cc
+++ b/net/ftp/ftp_server_type_histograms.cc
@@ -22,11 +22,11 @@ void UpdateFtpServerTypeHistograms(FtpServerType type) {
   if (type >= 0 && type < NUM_OF_SERVER_TYPES) {
     if (!had_server_type[type]) {
       had_server_type[type] = true;
-      UMA_HISTOGRAM_ENUMERATION("Net.HadFtpServerType",
+      UMA_HISTOGRAM_ENUMERATION("Net.HadFtpServerType2",
                                 type, NUM_OF_SERVER_TYPES);
     }
   }
-  UMA_HISTOGRAM_ENUMERATION("Net.FtpServerTypeCount",
+  UMA_HISTOGRAM_ENUMERATION("Net.FtpServerTypeCount2",
                             type, NUM_OF_SERVER_TYPES);
 }
 
diff --git a/net/ftp/ftp_server_type_histograms.h b/net/ftp/ftp_server_type_histograms.h
index 9a99588..5ae862c 100644
--- a/net/ftp/ftp_server_type_histograms.h
+++ b/net/ftp/ftp_server_type_histograms.h
@@ -16,17 +16,11 @@ enum FtpServerType {
   // connecting to isn't an FTP server), or a broken server.
   SERVER_UNKNOWN = 0,
 
-  // Types 1-8 are RESERVED (were earlier used for listings recognized by
-  // Mozilla's ParseFTPList code).
-
-  SERVER_LS = 9,        // Server using /bin/ls -l listing style.
-  SERVER_WINDOWS = 10,  // Server using Windows listing style.
-  SERVER_VMS = 11,      // Server using VMS listing style.
-  SERVER_NETWARE = 12,  // Server using Netware listing style.
-
-  // Types 13-14 are RESERVED (were earlier used for MLSD listings).
-
-  SERVER_OS2 = 15,      // Server using OS/2 listing style.
+  SERVER_LS = 1,       // Server using /bin/ls -l listing style.
+  SERVER_WINDOWS = 2,  // Server using Windows listing style.
+  SERVER_VMS = 3,      // Server using VMS listing style.
+  SERVER_NETWARE = 4,  // Server using Netware listing style.
+  SERVER_OS2 = 5,      // Server using OS/2 listing style.
 
   NUM_OF_SERVER_TYPES
 };