summaryrefslogtreecommitdiffstats
path: root/jingle
diff options
context:
space:
mode:
authorronghuawu@chromium.org <ronghuawu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-09 22:49:38 +0000
committerronghuawu@chromium.org <ronghuawu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-09 22:49:38 +0000
commit5e13ad002d406a5d146a096cea4e8bb38f4ae5d4 (patch)
treed21478f797dda4ebf0cf7a7e8b5e95a589947cd7 /jingle
parent039fa8c89dba9061a69a43107ca4016b255a7d39 (diff)
downloadchromium_src-5e13ad002d406a5d146a096cea4e8bb38f4ae5d4.zip
chromium_src-5e13ad002d406a5d146a096cea4e8bb38f4ae5d4.tar.gz
chromium_src-5e13ad002d406a5d146a096cea4e8bb38f4ae5d4.tar.bz2
Update webrtc/libjingle to r4948.
R=mallinath@chromium.org, sergeyu@chromium.org Review URL: https://codereview.chromium.org/26719002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@227825 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'jingle')
-rw-r--r--jingle/glue/channel_socket_adapter_unittest.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/jingle/glue/channel_socket_adapter_unittest.cc b/jingle/glue/channel_socket_adapter_unittest.cc
index 580a34d..6a89a43 100644
--- a/jingle/glue/channel_socket_adapter_unittest.cc
+++ b/jingle/glue/channel_socket_adapter_unittest.cc
@@ -46,6 +46,9 @@ class MockTransportChannel : public cricket::TransportChannel {
MOCK_CONST_METHOD1(GetSslRole, bool(talk_base::SSLRole* role));
MOCK_METHOD1(SetSrtpCiphers, bool(const std::vector<std::string>& ciphers));
MOCK_METHOD1(GetSrtpCipher, bool(std::string* cipher));
+ MOCK_CONST_METHOD1(GetLocalIdentity, bool(talk_base::SSLIdentity** identity));
+ MOCK_CONST_METHOD1(GetRemoteCertificate,
+ bool(talk_base::SSLCertificate** cert));
MOCK_METHOD6(ExportKeyingMaterial, bool(const std::string& label,
const uint8* context,
size_t context_len,