diff options
| author | hbos <hbos@chromium.org> | 2015-09-08 06:32:12 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-08 13:32:58 +0000 |
| commit | d8d6b53f54007c9b4eae42fdd5019d3cff60c2ce (patch) | |
| tree | 1d2fdaf194e1e091b586f1e88b702694167eaa22 | |
| parent | 68bd58be4f2d1dede4db57ec46457d18568e0975 (diff) | |
| download | chromium_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}
| -rw-r--r-- | DEPS | 4 | ||||
| -rw-r--r-- | remoting/protocol/channel_socket_adapter_unittest.cc | 5 | ||||
| -rw-r--r-- | third_party/libjingle/README.chromium | 2 |
3 files changed, 6 insertions, 5 deletions
@@ -192,7 +192,7 @@ deps = { Var('chromium_git') + '/chromium/third_party/ffmpeg.git' + '@' + '3651d8ef1fe8bf1fab61da6298341470402c991a', 'src/third_party/libjingle/source/talk': - Var('chromium_git') + '/external/webrtc/trunk/talk.git' + '@' + 'ca717fa1df12a4d3c7e111f974fdbdd3c487d805', # commit position 9867 + Var('chromium_git') + '/external/webrtc/trunk/talk.git' + '@' + '531209a7d1349b3d14f28315b3c3a7ae362a7f56', # commit position 9885 'src/third_party/usrsctp/usrsctplib': Var('chromium_git') + '/external/usrsctplib.git' + '@' + '36444a999739e9e408f8f587cb4c3ffeef2e50ac', # from svn revision 9215 @@ -216,7 +216,7 @@ deps = { Var('chromium_git') + '/native_client/src/third_party/scons-2.0.1.git' + '@' + '1c1550e17fc26355d08627fbdec13d8291227067', 'src/third_party/webrtc': - Var('chromium_git') + '/external/webrtc/trunk/webrtc.git' + '@' + '22fd889297d3a1073001825fdff5aedf467fa3eb', # commit position 9867 + Var('chromium_git') + '/external/webrtc/trunk/webrtc.git' + '@' + 'e3f2ebadf5073ad63c1377967b54fb918e07ab2e', # commit position 9890 'src/third_party/openmax_dl': Var('chromium_git') + '/external/webrtc/deps/third_party/openmax.git' + '@' + Var('openmax_dl_revision'), 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, diff --git a/third_party/libjingle/README.chromium b/third_party/libjingle/README.chromium index 9b798c7..676b551 100644 --- a/third_party/libjingle/README.chromium +++ b/third_party/libjingle/README.chromium @@ -1,7 +1,7 @@ Name: libjingle URL: http://code.google.com/p/webrtc/ Version: unknown -Revision: 9867 +Revision: 9885 License: BSD License File: source/talk/COPYING Security Critical: yes |