diff options
| author | mail <mail@joachim-bauch.de> | 2015-02-09 12:14:10 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-09 20:14:39 +0000 |
| commit | bc321c76ace6e1d5a03440e554ccb207159802ec (patch) | |
| tree | f0d25f2416a251e71d92e7ce56a01e6638a95fd5 /jingle | |
| parent | 42c496ddef40221858df3df41dc7ef8105a82af3 (diff) | |
| download | chromium_src-bc321c76ace6e1d5a03440e554ccb207159802ec.zip chromium_src-bc321c76ace6e1d5a03440e554ccb207159802ec.tar.gz chromium_src-bc321c76ace6e1d5a03440e554ccb207159802ec.tar.bz2 | |
Add new method to get negotiated SSL cipher in jingle glue.
This is required to re-land CL 26009004 in webrtc (was reverted
due to compiler errors while rolling webrtc into chromium):
https://webrtc-codereview.appspot.com/26009004/
BUG=https://code.google.com/p/webrtc/issues/detail?id=3976
Review URL: https://codereview.chromium.org/896393005
Cr-Commit-Position: refs/heads/master@{#315370}
Diffstat (limited to 'jingle')
| -rw-r--r-- | jingle/glue/channel_socket_adapter_unittest.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/jingle/glue/channel_socket_adapter_unittest.cc b/jingle/glue/channel_socket_adapter_unittest.cc index e080449..ef14782 100644 --- a/jingle/glue/channel_socket_adapter_unittest.cc +++ b/jingle/glue/channel_socket_adapter_unittest.cc @@ -46,6 +46,7 @@ class MockTransportChannel : public cricket::TransportChannel { MOCK_CONST_METHOD1(GetSslRole, bool(rtc::SSLRole* role)); 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, bool(rtc::SSLCertificate** cert)); |