Revert of 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 14fac962f4c6e81b1a7c77f08aaeeeb2bda54aaf..8eaed6d2ff58ec291c6d4e2b4b24909b890bda46 100644
--- a/talk/app/webrtc/umametrics.h
+++ b/talk/app/webrtc/umametrics.h
@@ -42,13 +42,6 @@
   // to the TURN server in the case of TURN candidates.
   kEnumCounterIceCandidatePairTypeUdp,
   kEnumCounterIceCandidatePairTypeTcp,
-
-  kEnumCounterAudioSrtpCipher,
-  kEnumCounterAudioSslCipher,
-  kEnumCounterVideoSrtpCipher,
-  kEnumCounterVideoSslCipher,
-  kEnumCounterDataSrtpCipher,
-  kEnumCounterDataSslCipher,
   kPeerConnectionEnumCounterMax
 };
 
@@ -85,6 +78,12 @@
   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
 };