| Index: webrtc/p2p/base/dtlstransportchannel_unittest.cc
|
| diff --git a/webrtc/p2p/base/dtlstransportchannel_unittest.cc b/webrtc/p2p/base/dtlstransportchannel_unittest.cc
|
| index 10640f99e3c130a73ab1f579a3f053dcaa119e9f..f96cec2d99a874256d7580c24fd7f53b27440532 100644
|
| --- a/webrtc/p2p/base/dtlstransportchannel_unittest.cc
|
| +++ b/webrtc/p2p/base/dtlstransportchannel_unittest.cc
|
| @@ -230,13 +230,13 @@ class DtlsTestClient : public sigslot::has_slots<> {
|
| void CheckSsl(const std::string& expected_cipher) {
|
| for (std::vector<cricket::DtlsTransportChannelWrapper*>::iterator it =
|
| channels_.begin(); it != channels_.end(); ++it) {
|
| - std::string cipher;
|
| + rtc::SslCipher cipher;
|
|
|
| bool rv = (*it)->GetSslCipher(&cipher);
|
| if (negotiated_dtls_ && !expected_cipher.empty()) {
|
| ASSERT_TRUE(rv);
|
|
|
| - ASSERT_EQ(cipher, expected_cipher);
|
| + ASSERT_EQ(cipher.rfc_name, expected_cipher);
|
| } else {
|
| ASSERT_FALSE(rv);
|
| }
|
| @@ -470,10 +470,10 @@ class DtlsTransportChannelTest : public testing::Test {
|
| client1_.CheckSrtp("");
|
| client2_.CheckSrtp("");
|
| }
|
| - client1_.CheckSsl(
|
| - rtc::SSLStreamAdapter::GetDefaultSslCipher(ssl_expected_version_));
|
| - client2_.CheckSsl(
|
| - rtc::SSLStreamAdapter::GetDefaultSslCipher(ssl_expected_version_));
|
| + client1_.CheckSsl(rtc::SSLStreamAdapter::GetDefaultSslCipher(
|
| + ssl_expected_version_).rfc_name);
|
| + client2_.CheckSsl(rtc::SSLStreamAdapter::GetDefaultSslCipher(
|
| + ssl_expected_version_).rfc_name);
|
|
|
| return true;
|
| }
|
|
|