Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1027)

Unified Diff: webrtc/p2p/base/dtlstransportchannel_unittest.cc

Issue 1337673002: Change WebRTC SslCipher to be exposed as number only. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/p2p/base/dtlstransportchannel_unittest.cc
diff --git a/webrtc/p2p/base/dtlstransportchannel_unittest.cc b/webrtc/p2p/base/dtlstransportchannel_unittest.cc
index 95696e222c500f54cd44b23df3a218b52cf19ad2..48ab7c2abdb5b11864462c786ca97d38d75b69ec 100644
--- a/webrtc/p2p/base/dtlstransportchannel_unittest.cc
+++ b/webrtc/p2p/base/dtlstransportchannel_unittest.cc
@@ -225,13 +225,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.name, expected_cipher);
} else {
ASSERT_FALSE(rv);
}
@@ -462,10 +462,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::GetDefaultSslCipherForTest(
+ ssl_expected_version_).name);
+ client2_.CheckSsl(rtc::SSLStreamAdapter::GetDefaultSslCipherForTest(
+ ssl_expected_version_).name);
return true;
}

Powered by Google App Engine
This is Rietveld 408576698