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

Unified Diff: remoting/protocol/channel_socket_adapter_unittest.cc

Issue 1317973006: Roll WebRTC 9867:9890, Libjingle 9867:9885 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@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
« no previous file with comments | « DEPS ('k') | third_party/libjingle/README.chromium » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/channel_socket_adapter_unittest.cc
diff --git a/remoting/protocol/channel_socket_adapter_unittest.cc b/remoting/protocol/channel_socket_adapter_unittest.cc
index 85e73a19a9edd010fe970e7725150dac81698666..d488c4b517a09928ec74e9936a97c20f2dd2e54d 100644
--- a/remoting/protocol/channel_socket_adapter_unittest.cc
+++ b/remoting/protocol/channel_socket_adapter_unittest.cc
@@ -49,8 +49,9 @@ class MockTransportChannel : public cricket::TransportChannel {
MOCK_METHOD1(SetSrtpCiphers, bool(const std::vector<std::string>& ciphers));
MOCK_METHOD1(GetSrtpCipher, bool(std::string* cipher));
MOCK_METHOD1(GetSslCipher, bool(std::string* cipher));
- MOCK_CONST_METHOD1(GetLocalIdentity, bool(rtc::SSLIdentity** identity));
- MOCK_CONST_METHOD1(GetRemoteCertificate,
+ MOCK_CONST_METHOD0(GetLocalCertificate,
+ rtc::scoped_refptr<rtc::RTCCertificate>());
+ MOCK_CONST_METHOD1(GetRemoteSSLCertificate,
bool(rtc::SSLCertificate** cert));
MOCK_METHOD6(ExportKeyingMaterial, bool(const std::string& label,
const uint8* context,
« no previous file with comments | « DEPS ('k') | third_party/libjingle/README.chromium » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698