diff options
| author | mallinath@chromium.org <mallinath@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-12 23:52:21 +0000 |
|---|---|---|
| committer | mallinath@chromium.org <mallinath@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-12 23:52:21 +0000 |
| commit | 375ced63e91b845f22701d843235158cf887588f (patch) | |
| tree | 31bff36c351ee0173cd39e8b3a94b4d352122324 | |
| parent | 98a483675d48f0daede02528db9cacb8f7a342db (diff) | |
| download | chromium_src-375ced63e91b845f22701d843235158cf887588f.zip chromium_src-375ced63e91b845f22701d843235158cf887588f.tar.gz chromium_src-375ced63e91b845f22701d843235158cf887588f.tar.bz2 | |
Roll webrtc r4533.
R=ronghuawu@chromium.org
Review URL: https://codereview.chromium.org/22817004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@217120 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | jingle/glue/channel_socket_adapter_unittest.cc | 2 | ||||
| -rw-r--r-- | third_party/libjingle/README.chromium | 2 |
3 files changed, 3 insertions, 3 deletions
@@ -38,7 +38,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": "4520", + "webrtc_revision": "4533", "jsoncpp_revision": "248", "nss_revision": "209026", # 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 776bd06..65dce71 100644 --- a/jingle/glue/channel_socket_adapter_unittest.cc +++ b/jingle/glue/channel_socket_adapter_unittest.cc @@ -37,7 +37,7 @@ class MockTransportChannel : public cricket::TransportChannel { MOCK_METHOD3(SendPacket, int(const char* data, size_t len, int flags)); MOCK_METHOD2(SetOption, int(talk_base::Socket::Option opt, int value)); MOCK_METHOD0(GetError, int()); - MOCK_CONST_METHOD0(GetRole, cricket::TransportRole()); + MOCK_CONST_METHOD0(GetIceRole, cricket::IceRole()); }; class TransportChannelSocketAdapterTest : public testing::Test { diff --git a/third_party/libjingle/README.chromium b/third_party/libjingle/README.chromium index 45814ea..0acd33d 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: 4520 +Revision: 4533 License: BSD License File: source/talk/COPYING Security Critical: yes |