summaryrefslogtreecommitdiff
path: root/media/base/rtpdataengine_unittest.cc
diff options
context:
space:
mode:
authorwu@webrtc.org <wu@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>2013-12-12 22:54:25 +0000
committerwu@webrtc.org <wu@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>2013-12-12 22:54:25 +0000
commita064d5de938aebae46dfb11446ca4e66fac1762f (patch)
treef5a85cc17a4104a8059cac0ad08eb72176e8c712 /media/base/rtpdataengine_unittest.cc
parent01d88c78467af6103d14524a369d3b9785983f05 (diff)
downloadtalk-a064d5de938aebae46dfb11446ca4e66fac1762f.tar.gz
Revert 5274 "Update talk to 58113193 together with https://webrt..."
> Update talk to 58113193 together with https://webrtc-codereview.appspot.com/5309005/. > > R=mallinath@webrtc.org, niklas.enbom@webrtc.org > > Review URL: https://webrtc-codereview.appspot.com/5719004 TBR=wu@webrtc.org Review URL: https://webrtc-codereview.appspot.com/5729004 git-svn-id: http://webrtc.googlecode.com/svn/trunk/talk@5275 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'media/base/rtpdataengine_unittest.cc')
-rw-r--r--media/base/rtpdataengine_unittest.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/media/base/rtpdataengine_unittest.cc b/media/base/rtpdataengine_unittest.cc
index a86ab3b..bc46818 100644
--- a/media/base/rtpdataengine_unittest.cc
+++ b/media/base/rtpdataengine_unittest.cc
@@ -423,13 +423,13 @@ TEST_F(RtpDataMediaChannelTest, ReceiveData) {
talk_base::scoped_ptr<cricket::RtpDataMediaChannel> dmc(CreateChannel());
// SetReceived not called.
- dmc->OnPacketReceived(&packet, talk_base::PacketTime());
+ dmc->OnPacketReceived(&packet);
EXPECT_FALSE(HasReceivedData());
dmc->SetReceive(true);
// Unknown payload id
- dmc->OnPacketReceived(&packet, talk_base::PacketTime());
+ dmc->OnPacketReceived(&packet);
EXPECT_FALSE(HasReceivedData());
cricket::DataCodec codec;
@@ -440,7 +440,7 @@ TEST_F(RtpDataMediaChannelTest, ReceiveData) {
ASSERT_TRUE(dmc->SetRecvCodecs(codecs));
// Unknown stream
- dmc->OnPacketReceived(&packet, talk_base::PacketTime());
+ dmc->OnPacketReceived(&packet);
EXPECT_FALSE(HasReceivedData());
cricket::StreamParams stream;
@@ -448,7 +448,7 @@ TEST_F(RtpDataMediaChannelTest, ReceiveData) {
ASSERT_TRUE(dmc->AddRecvStream(stream));
// Finally works!
- dmc->OnPacketReceived(&packet, talk_base::PacketTime());
+ dmc->OnPacketReceived(&packet);
EXPECT_TRUE(HasReceivedData());
EXPECT_EQ("abcde", GetReceivedData());
EXPECT_EQ(5U, GetReceivedDataLen());
@@ -463,6 +463,6 @@ TEST_F(RtpDataMediaChannelTest, InvalidRtpPackets) {
talk_base::scoped_ptr<cricket::RtpDataMediaChannel> dmc(CreateChannel());
// Too short
- dmc->OnPacketReceived(&packet, talk_base::PacketTime());
+ dmc->OnPacketReceived(&packet);
EXPECT_FALSE(HasReceivedData());
}