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..07a64a15f6bf18b8eecf1ead665c9eca0b96916d 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,74 @@ enum IceCandidatePairType {
   kIceCandidatePairMax
 };
 
+// The same list as SrtpCipherMap from opensslstsreamadapter.cc. Must be kept
+// the same as the order in histograms.xml.
+enum SrtpCipherType {
+  SrtpCipherType_Unknown,
+  SrtpCipherType_AES_CM_128_HMAC_SHA1_32,
+  SrtpCipherType_AES_CM_128_HMAC_SHA1_80,
+  SrtpCipherType_Max,
+};
+
+SrtpCipherType GetSrtpCipherType(const std::string& cipher);
+
+// The same list as kSslCipherMap from opensslstsreamadapter.cc. Must be
+// kept the same as the order in histograms.xml.
+enum SslCipherType {
+  SslCipherType_Unknown,
+
+  // TLS v1.0 ciphersuites from RFC2246.
+  SslCipherType_TLS_RSA_RC4_128_SHA,
+  SslCipherType_TLS_RSA_WITH_3DES_EDE_CBC_SHA,
+
+  // AES ciphersuites from RFC3268.
+  SslCipherType_TLS_RSA_WITH_AES_128_CBC_SHA,
+  SslCipherType_TLS_DHE_RSA_WITH_AES_128_CBC_SHA,
+  SslCipherType_TLS_RSA_WITH_AES_256_CBC_SHA,
+  SslCipherType_TLS_DHE_RSA_WITH_AES_256_CBC_SHA,
+
+  // ECC ciphersuites from RFC4492.
+  SslCipherType_TLS_ECDHE_ECDSA_WITH_RC4_128_SHA,
+  SslCipherType_TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA,
+  SslCipherType_TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
+  SslCipherType_TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,
+
+  SslCipherType_TLS_ECDHE_RSA_WITH_RC4_128_SHA,
+  SslCipherType_TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA,
+  SslCipherType_TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
+  SslCipherType_TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,
+
+  // TLS v1.2 ciphersuites.
+  SslCipherType_TLS_RSA_WITH_AES_128_CBC_SHA256,
+  SslCipherType_TLS_RSA_WITH_AES_256_CBC_SHA256,
+  SslCipherType_TLS_DHE_RSA_WITH_AES_128_CBC_SHA256,
+  SslCipherType_TLS_DHE_RSA_WITH_AES_256_CBC_SHA256,
+
+  // TLS v1.2 GCM ciphersuites from RFC5288.
+  SslCipherType_TLS_RSA_WITH_AES_128_GCM_SHA256,
+  SslCipherType_TLS_RSA_WITH_AES_256_GCM_SHA384,
+  SslCipherType_TLS_DHE_RSA_WITH_AES_128_GCM_SHA256,
+  SslCipherType_TLS_DHE_RSA_WITH_AES_256_GCM_SHA384,
+  SslCipherType_TLS_DH_RSA_WITH_AES_128_GCM_SHA256,
+  SslCipherType_TLS_DH_RSA_WITH_AES_256_GCM_SHA384,
+
+  // ECDH HMAC based ciphersuites from RFC5289.
+  SslCipherType_TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,
+  SslCipherType_TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384,
+  SslCipherType_TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,
+  SslCipherType_TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384,
+
+  // ECDH GCM based ciphersuites from RFC5289.
+  SslCipherType_TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
+  SslCipherType_TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
+  SslCipherType_TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
+  SslCipherType_TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
+
+  SslCipherType_Max,
+};
+
+SslCipherType GetSslCipherType(const std::string& cipher);
+
 }  // namespace webrtc
 
 #endif  // TALK_APP_WEBRTC_UMAMETRICS_H_