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
parent 98a48367
...@@ -38,7 +38,7 @@ vars = { ...@@ -38,7 +38,7 @@ vars = {
# Three lines of non-changing comments so that # Three lines of non-changing comments so that
# the commit queue can handle CLs rolling WebRTC # the commit queue can handle CLs rolling WebRTC
# and V8 without interference from each other. # and V8 without interference from each other.
"webrtc_revision": "4520", "webrtc_revision": "4533",
"jsoncpp_revision": "248", "jsoncpp_revision": "248",
"nss_revision": "209026", "nss_revision": "209026",
# Three lines of non-changing comments so that # Three lines of non-changing comments so that
......
...@@ -37,7 +37,7 @@ class MockTransportChannel : public cricket::TransportChannel { ...@@ -37,7 +37,7 @@ class MockTransportChannel : public cricket::TransportChannel {
MOCK_METHOD3(SendPacket, int(const char* data, size_t len, int flags)); MOCK_METHOD3(SendPacket, int(const char* data, size_t len, int flags));
MOCK_METHOD2(SetOption, int(talk_base::Socket::Option opt, int value)); MOCK_METHOD2(SetOption, int(talk_base::Socket::Option opt, int value));
MOCK_METHOD0(GetError, int()); MOCK_METHOD0(GetError, int());
MOCK_CONST_METHOD0(GetRole, cricket::TransportRole()); MOCK_CONST_METHOD0(GetIceRole, cricket::IceRole());
}; };
class TransportChannelSocketAdapterTest : public testing::Test { class TransportChannelSocketAdapterTest : public testing::Test {
......
Name: libjingle Name: libjingle
URL: http://code.google.com/p/webrtc/ URL: http://code.google.com/p/webrtc/
Version: unknown Version: unknown
Revision: 4520 Revision: 4533
License: BSD License: BSD
License File: source/talk/COPYING License File: source/talk/COPYING
Security Critical: yes Security Critical: yes
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment