diff options
| author | ronghuawu@chromium.org <ronghuawu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-09 22:49:38 +0000 |
|---|---|---|
| committer | ronghuawu@chromium.org <ronghuawu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-09 22:49:38 +0000 |
| commit | 5e13ad002d406a5d146a096cea4e8bb38f4ae5d4 (patch) | |
| tree | d21478f797dda4ebf0cf7a7e8b5e95a589947cd7 | |
| parent | 039fa8c89dba9061a69a43107ca4016b255a7d39 (diff) | |
| download | chromium_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
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | jingle/glue/channel_socket_adapter_unittest.cc | 3 | ||||
| -rw-r--r-- | third_party/libjingle/README.chromium | 2 |
3 files changed, 5 insertions, 2 deletions
@@ -39,7 +39,7 @@ vars = { # Three lines of non-changing comments so that # the commit queue can handle CLs rolling WebRTC # and V8 without interference from each other. - "webrtc_revision": "4889", + "webrtc_revision": "4948", "jsoncpp_revision": "248", "nss_revision": "223139", # Three lines of non-changing comments so that 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, diff --git a/third_party/libjingle/README.chromium b/third_party/libjingle/README.chromium index 0c48f37..9ee5062 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: 4889 +Revision: 4948 License: BSD License File: source/talk/COPYING Security Critical: yes |