Revert of Change WebRTC SslCipher to be exposed as number only.

talk/session/media/channel.cc

Index: talk/session/media/channel.cc
diff --git a/talk/session/media/channel.cc b/talk/session/media/channel.cc
index 56209800fa7eddb8ecd4fd01e26d2f86bbf6a137..5a6b7e198f16cb8380790e82d4eda8bc958e4c2a 100644
--- a/talk/session/media/channel.cc
+++ b/talk/session/media/channel.cc
@@ -816,9 +816,9 @@
   // We always use the default SRTP ciphers for RTCP, but we may use different
   // ciphers for RTP depending on the media type.
   if (!rtcp) {
-    GetSrtpCryptoSuiteNames(&ciphers);
+    GetSrtpCiphers(&ciphers);
   } else {
-    GetDefaultSrtpCryptoSuiteNames(&ciphers);
+    GetSupportedDefaultCryptoSuites(&ciphers);
   }
   return tc->SetSrtpCiphers(ciphers);
 }
@@ -841,7 +841,7 @@
 
   std::string selected_cipher;
 
-  if (!channel->GetSrtpCryptoSuite(&selected_cipher)) {
+  if (!channel->GetSrtpCipher(&selected_cipher)) {
     LOG(LS_ERROR) << "No DTLS-SRTP selected cipher";
     return false;
   }
@@ -1627,8 +1627,7 @@
   }
 }
 
-void VoiceChannel::GetSrtpCryptoSuiteNames(
-    std::vector<std::string>* ciphers) const {
+void VoiceChannel::GetSrtpCiphers(std::vector<std::string>* ciphers) const {
   GetSupportedAudioCryptoSuites(ciphers);
 }
 
@@ -2061,8 +2060,7 @@
   }
 }
 
-void VideoChannel::GetSrtpCryptoSuiteNames(
-    std::vector<std::string>* ciphers) const {
+void VideoChannel::GetSrtpCiphers(std::vector<std::string>* ciphers) const {
   GetSupportedVideoCryptoSuites(ciphers);
 }
 
@@ -2397,8 +2395,7 @@
   }
 }
 
-void DataChannel::GetSrtpCryptoSuiteNames(
-    std::vector<std::string>* ciphers) const {
+void DataChannel::GetSrtpCiphers(std::vector<std::string>* ciphers) const {
   GetSupportedDataCryptoSuites(ciphers);
 }