summaryrefslogtreecommitdiffstats
path: root/remoting/protocol
diff options
context:
space:
mode:
authorhbos <hbos@chromium.org>2015-09-08 06:32:12 -0700
committerCommit bot <commit-bot@chromium.org>2015-09-08 13:32:58 +0000
commitd8d6b53f54007c9b4eae42fdd5019d3cff60c2ce (patch)
tree1d2fdaf194e1e091b586f1e88b702694167eaa22 /remoting/protocol
parent68bd58be4f2d1dede4db57ec46457d18568e0975 (diff)
downloadchromium_src-d8d6b53f54007c9b4eae42fdd5019d3cff60c2ce.zip
chromium_src-d8d6b53f54007c9b4eae42fdd5019d3cff60c2ce.tar.gz
chromium_src-d8d6b53f54007c9b4eae42fdd5019d3cff60c2ce.tar.bz2
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}
Diffstat (limited to 'remoting/protocol')
-rw-r--r--remoting/protocol/channel_socket_adapter_unittest.cc5
1 files changed, 3 insertions, 2 deletions
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<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,