Change WebRTC SslCipher to be exposed as number only.

talk/app/webrtc/umametrics.h

Index: talk/app/webrtc/umametrics.h
diff --git a/talk/app/webrtc/umametrics.h b/talk/app/webrtc/umametrics.h
index 8eaed6d2ff58ec291c6d4e2b4b24909b890bda46..2b9bc7c7cc30e5a542dbf716981a78f840449db4 100644
--- a/talk/app/webrtc/umametrics.h
+++ b/talk/app/webrtc/umametrics.h
@@ -42,6 +42,13 @@ enum PeerConnectionEnumCounterType {
   // to the TURN server in the case of TURN candidates.
   kEnumCounterIceCandidatePairTypeUdp,
   kEnumCounterIceCandidatePairTypeTcp,
+
+  kEnumCounterAudioSrtpCipher,
+  kEnumCounterAudioSslCipher,
+  kEnumCounterVideoSrtpCipher,
+  kEnumCounterVideoSslCipher,
+  kEnumCounterDataSrtpCipher,
+  kEnumCounterDataSslCipher,
   kPeerConnectionEnumCounterMax
 };
 
@@ -78,12 +85,6 @@ enum PeerConnectionMetricsName {
   kTimeToConnect,           // In milliseconds.
   kLocalCandidates_IPv4,    // Number of IPv4 local candidates.
   kLocalCandidates_IPv6,    // Number of IPv6 local candidates.
-  kAudioSrtpCipher,         // Name of SRTP cipher used in audio channel.
-  kAudioSslCipher,          // Name of SSL cipher used in audio channel.
-  kVideoSrtpCipher,         // Name of SRTP cipher used in video channel.
-  kVideoSslCipher,          // Name of SSL cipher used in video channel.
-  kDataSrtpCipher,          // Name of SRTP cipher used in data channel.
-  kDataSslCipher,           // Name of SSL cipher used in data channel.
   kPeerConnectionMetricsName_Max
 };
 
@@ -122,6 +123,18 @@ enum IceCandidatePairType {
   kIceCandidatePairMax
 };
 
+// Must be kept the same as the order in histograms.xml.
+enum CryptoCipherType {
+  CipherType_Unknown,
+  CipherType_AES_CM_128_HMAC_SHA1_32,
+  CipherType_AES_CM_128_HMAC_SHA1_80,
+  CipherType_TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,
+  CipherType_TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
+  CipherType_Max,
+};
+
+CryptoCipherType GetCipherType(const std::string& cipher);
+
 }  // namespace webrtc
 
 #endif  // TALK_APP_WEBRTC_UMAMETRICS_H_