From d8d6b53f54007c9b4eae42fdd5019d3cff60c2ce Mon Sep 17 00:00:00 2001 From: hbos Date: Tue, 8 Sep 2015 06:32:12 -0700 Subject: Roll WebRTC 9867:9890, Libjingle 9867:9885 WebRTC 9867:9890 Changes: https://chromium.googlesource.com/external/webrtc/trunk/webrtc.git/+log/22fd889..e3f2eba Libjingle 9867:9885 Changes: https://chromium.googlesource.com/external/webrtc/trunk/talk.git/+log/ca717fa..531209a Additional Chromium changes: Updated MockTransportChannel to compile with the latest webrtc changes. TBR=guidou@chromium.org, garykac@chromium.org, tommi@chromium.org BUG= Review URL: https://codereview.chromium.org/1317973006 Cr-Commit-Position: refs/heads/master@{#347695} --- remoting/protocol/channel_socket_adapter_unittest.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'remoting/protocol') diff --git a/remoting/protocol/channel_socket_adapter_unittest.cc b/remoting/protocol/channel_socket_adapter_unittest.cc index 85e73a1..d488c4b 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& 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()); + MOCK_CONST_METHOD1(GetRemoteSSLCertificate, bool(rtc::SSLCertificate** cert)); MOCK_METHOD6(ExportKeyingMaterial, bool(const std::string& label, const uint8* context, -- cgit v1.1