diff options
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | content/test/data/media/peerconnection-call.html | 2 | ||||
| -rw-r--r-- | jingle/glue/channel_socket_adapter_unittest.cc | 1 | ||||
| -rw-r--r-- | third_party/libjingle/README.chromium | 2 | ||||
| -rw-r--r-- | third_party/libjingle/libjingle.gyp | 3 |
5 files changed, 4 insertions, 6 deletions
@@ -18,7 +18,7 @@ vars = { "nacl_tools_revision": "10001", # native_client/DEPS: tools_rev "gtm_revision": "578", - "libjingle_revision": "291", + "libjingle_revision": "294", "libphonenumber_revision": "456", "libvpx_revision": "180104", "lss_revision": "18", diff --git a/content/test/data/media/peerconnection-call.html b/content/test/data/media/peerconnection-call.html index a937ff9..4a85e9c 100644 --- a/content/test/data/media/peerconnection-call.html +++ b/content/test/data/media/peerconnection-call.html @@ -232,7 +232,7 @@ } function removeMsidAndBundle(offerSdp) { - offerSdp = offerSdp.replace(/a=msid-semantics.*\r\n/g, ''); + offerSdp = offerSdp.replace(/a=msid-semantic.*\r\n/g, ''); offerSdp = offerSdp.replace('a=group:BUNDLE audio video\r\n', ''); offerSdp = offerSdp.replace('a=mid:audio\r\n', ''); offerSdp = offerSdp.replace('a=mid:video\r\n', ''); diff --git a/jingle/glue/channel_socket_adapter_unittest.cc b/jingle/glue/channel_socket_adapter_unittest.cc index 6a51640..c9b0bb7 100644 --- a/jingle/glue/channel_socket_adapter_unittest.cc +++ b/jingle/glue/channel_socket_adapter_unittest.cc @@ -38,6 +38,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()); }; class TransportChannelSocketAdapterTest : public testing::Test { diff --git a/third_party/libjingle/README.chromium b/third_party/libjingle/README.chromium index bb6325f..8e3b1f6 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/libjingle/ Version: unknown -Revision: 291 +Revision: 294 License: BSD License File: source/COPYING Security Critical: yes diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp index 304e829..7185fec 100644 --- a/third_party/libjingle/libjingle.gyp +++ b/third_party/libjingle/libjingle.gyp @@ -25,9 +25,6 @@ 'NO_MAIN_THREAD_WRAPPING', 'NO_SOUND_SYSTEM', 'SRTP_RELATIVE_PATH', - # TODO(ronghuawu): Remove this once libjingle is updated to use the new - # webrtc. - 'USE_WEBRTC_DEV_BRANCH', ], 'configurations': { 'Debug': { |