diff options
| author | ronghuawu@chromium.org <ronghuawu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-17 02:02:54 +0000 |
|---|---|---|
| committer | ronghuawu@chromium.org <ronghuawu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-17 02:02:54 +0000 |
| commit | 863369f78d9c2b4f774e693fdef8943deba270fa (patch) | |
| tree | eb26aa6471148152a16a9ecf2950d2dcd76bc5ff /jingle | |
| parent | 2c30adb144694822d2eeec760e7874262c82028a (diff) | |
| download | chromium_src-863369f78d9c2b4f774e693fdef8943deba270fa.zip chromium_src-863369f78d9c2b4f774e693fdef8943deba270fa.tar.gz chromium_src-863369f78d9c2b4f774e693fdef8943deba270fa.tar.bz2 | |
Update webrtc/libjingle 5268:5301.
R=grunell@chromium.org, mallinath@chromium.org, sergeyu@chromium.org, wjia@chromium.org
Review URL: https://codereview.chromium.org/103143004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@241095 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'jingle')
| -rw-r--r-- | jingle/glue/channel_socket_adapter.cc | 1 | ||||
| -rw-r--r-- | jingle/glue/channel_socket_adapter.h | 2 | ||||
| -rw-r--r-- | jingle/glue/channel_socket_adapter_unittest.cc | 3 | ||||
| -rw-r--r-- | jingle/glue/fake_socket_factory.cc | 4 |
4 files changed, 8 insertions, 2 deletions
diff --git a/jingle/glue/channel_socket_adapter.cc b/jingle/glue/channel_socket_adapter.cc index 27f0080..c9cfff1 100644 --- a/jingle/glue/channel_socket_adapter.cc +++ b/jingle/glue/channel_socket_adapter.cc @@ -140,6 +140,7 @@ void TransportChannelSocketAdapter::OnNewPacket( cricket::TransportChannel* channel, const char* data, size_t data_size, + const talk_base::PacketTime& packet_time, int flags) { DCHECK_EQ(base::MessageLoop::current(), message_loop_); DCHECK_EQ(channel, channel_); diff --git a/jingle/glue/channel_socket_adapter.h b/jingle/glue/channel_socket_adapter.h index baf4d4c..35414a1 100644 --- a/jingle/glue/channel_socket_adapter.h +++ b/jingle/glue/channel_socket_adapter.h @@ -8,6 +8,7 @@ #include "base/callback_forward.h" #include "base/compiler_specific.h" #include "net/socket/socket.h" +#include "third_party/libjingle/source/talk/base/asyncpacketsocket.h" #include "third_party/libjingle/source/talk/base/socketaddress.h" #include "third_party/libjingle/source/talk/base/sigslot.h" @@ -54,6 +55,7 @@ class TransportChannelSocketAdapter : public net::Socket, void OnNewPacket(cricket::TransportChannel* channel, const char* data, size_t data_size, + const talk_base::PacketTime& packet_time, int flags); void OnWritableState(cricket::TransportChannel* channel); void OnChannelDestroyed(cricket::TransportChannel* channel); diff --git a/jingle/glue/channel_socket_adapter_unittest.cc b/jingle/glue/channel_socket_adapter_unittest.cc index 6a89a43..7fcb5d1 100644 --- a/jingle/glue/channel_socket_adapter_unittest.cc +++ b/jingle/glue/channel_socket_adapter_unittest.cc @@ -88,7 +88,8 @@ TEST_F(TransportChannelSocketAdapterTest, Read) { int result = target_->Read(buffer.get(), kBufferSize, callback_); ASSERT_EQ(net::ERR_IO_PENDING, result); - channel_.SignalReadPacket(&channel_, kTestData, kTestDataSize, 0); + channel_.SignalReadPacket(&channel_, kTestData, kTestDataSize, + talk_base::CreatePacketTime(0), 0); EXPECT_EQ(kTestDataSize, callback_result_); } diff --git a/jingle/glue/fake_socket_factory.cc b/jingle/glue/fake_socket_factory.cc index 823367f..38472c6 100644 --- a/jingle/glue/fake_socket_factory.cc +++ b/jingle/glue/fake_socket_factory.cc @@ -7,6 +7,7 @@ #include "base/bind.h" #include "base/message_loop/message_loop.h" #include "jingle/glue/utils.h" +#include "third_party/libjingle/source/talk/base/asyncpacketsocket.h" #include "third_party/libjingle/source/talk/base/asyncsocket.h" namespace jingle_glue { @@ -113,7 +114,8 @@ void FakeUDPPacketSocket::DeliverPacket(const net::IPEndPoint& from, return; } - SignalReadPacket(this, &data[0], data.size(), address); + SignalReadPacket(this, &data[0], data.size(), address, + talk_base::CreatePacketTime(0)); } FakeSocketManager::FakeSocketManager() |