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

webrtc/p2p/base/dtlstransportchannel_unittest.cc

 /*
  *  Copyright 2011 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 199 matching lines @@
       ASSERT_TRUE(received_dtls_client_hello_);
       ASSERT_FALSE(received_dtls_server_hello_);
     }
   }
 
   void CheckSrtp(const std::string& expected_cipher) {
     for (std::vector<cricket::DtlsTransportChannelWrapper*>::iterator it =
            channels_.begin(); it != channels_.end(); ++it) {
       std::string cipher;
 
-      bool rv = (*it)->GetSrtpCryptoSuite(&cipher);
+      bool rv = (*it)->GetSrtpCipher(&cipher);
       if (negotiated_dtls_ && !expected_cipher.empty()) {
         ASSERT_TRUE(rv);
 
         ASSERT_EQ(cipher, expected_cipher);
       } else {
         ASSERT_FALSE(rv);
       }
     }
   }
 
-  void CheckSsl(uint16_t expected_cipher) {
+  void CheckSsl(const std::string& expected_cipher) {
     for (std::vector<cricket::DtlsTransportChannelWrapper*>::iterator it =
            channels_.begin(); it != channels_.end(); ++it) {
-      uint16_t cipher;
+      std::string cipher;
 
-      bool rv = (*it)->GetSslCipherSuite(&cipher);
-      if (negotiated_dtls_ && expected_cipher) {
+      bool rv = (*it)->GetSslCipher(&cipher);
+      if (negotiated_dtls_ && !expected_cipher.empty()) {
         ASSERT_TRUE(rv);
 
         ASSERT_EQ(cipher, expected_cipher);
       } else {
         ASSERT_FALSE(rv);
       }
     }
   }
 
   void SendPackets(size_t channel, size_t size, size_t count, bool srtp) {
@@ skipping 208 matching lines @@
     }
 
     // Check that we negotiated the right ciphers.
     if (use_dtls_srtp_) {
       client1_.CheckSrtp(AES_CM_128_HMAC_SHA1_80);
       client2_.CheckSrtp(AES_CM_128_HMAC_SHA1_80);
     } else {
       client1_.CheckSrtp("");
       client2_.CheckSrtp("");
     }
-    client1_.CheckSsl(rtc::SSLStreamAdapter::GetDefaultSslCipherForTest(
-        ssl_expected_version_, rtc::KT_DEFAULT));
-    client2_.CheckSsl(rtc::SSLStreamAdapter::GetDefaultSslCipherForTest(
-        ssl_expected_version_, rtc::KT_DEFAULT));
+    client1_.CheckSsl(
+        rtc::SSLStreamAdapter::GetDefaultSslCipher(ssl_expected_version_));
+    client2_.CheckSsl(
+        rtc::SSLStreamAdapter::GetDefaultSslCipher(ssl_expected_version_));
 
     return true;
   }
 
   bool Connect() {
     // By default, Client1 will be Server and Client2 will be Client.
     return Connect(cricket::CONNECTIONROLE_ACTPASS,
                    cricket::CONNECTIONROLE_ACTIVE);
   }
 
@@ skipping 384 matching lines @@
   // Each side's remote certificate is the other side's local certificate.
   ASSERT_TRUE(
       client1_.transport()->GetRemoteSSLCertificate(remote_cert1.accept()));
   ASSERT_EQ(remote_cert1->ToPEMString(),
             certificate2->ssl_certificate().ToPEMString());
   ASSERT_TRUE(
       client2_.transport()->GetRemoteSSLCertificate(remote_cert2.accept()));
   ASSERT_EQ(remote_cert2->ToPEMString(),
             certificate1->ssl_certificate().ToPEMString());
 }