Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / third_party / libjingle / source / talk / p2p / base / dtlstransportchannel_unittest.cc

diff --git a/src/third_party/libjingle/source/talk/p2p/base/dtlstransportchannel_unittest.cc b/src/third_party/libjingle/source/talk/p2p/base/dtlstransportchannel_unittest.cc
index c6e2804..cdab332 100644 (file)
--- a/src/third_party/libjingle/source/talk/p2p/base/dtlstransportchannel_unittest.cc
+++ b/src/third_party/libjingle/source/talk/p2p/base/dtlstransportchannel_unittest.cc
@@ -185,14 +185,14 @@ class DtlsTestClient : public sigslot::has_slots<> {
     // content action is CA_ANSWER.
     if (action == cricket::CA_OFFER) {
       ASSERT_TRUE(transport_->SetLocalTransportDescription(
-          local_desc, cricket::CA_OFFER));
+          local_desc, cricket::CA_OFFER, NULL));
       ASSERT_EQ(expect_success, transport_->SetRemoteTransportDescription(
-          remote_desc, cricket::CA_ANSWER));
+          remote_desc, cricket::CA_ANSWER, NULL));
     } else {
       ASSERT_TRUE(transport_->SetRemoteTransportDescription(
-          remote_desc, cricket::CA_OFFER));
+          remote_desc, cricket::CA_OFFER, NULL));
       ASSERT_EQ(expect_success, transport_->SetLocalTransportDescription(
-          local_desc, cricket::CA_ANSWER));
+          local_desc, cricket::CA_ANSWER, NULL));
     }
     negotiated_dtls_ = (local_identity && remote_identity);
   }
@@ -245,8 +245,9 @@ class DtlsTestClient : public sigslot::has_slots<> {
 
       // Only set the bypass flag if we've activated DTLS.
       int flags = (identity_.get() && srtp) ? cricket::PF_SRTP_BYPASS : 0;
+      talk_base::PacketOptions packet_options;
       int rv = channels_[channel]->SendPacket(
-          packet.get(), size, talk_base::DSCP_NO_CHANGE, flags);
+          packet.get(), size, packet_options, flags);
       ASSERT_GT(rv, 0);
       ASSERT_EQ(size, static_cast<size_t>(rv));
       ++sent;
@@ -307,6 +308,7 @@ class DtlsTestClient : public sigslot::has_slots<> {
 
   void OnTransportChannelReadPacket(cricket::TransportChannel* channel,
                                     const char* data, size_t size,
+                                    const talk_base::PacketTime& packet_time,
                                     int flags) {
     uint32 packet_num = 0;
     ASSERT_TRUE(VerifyPacket(data, size, &packet_num));
@@ -320,6 +322,7 @@ class DtlsTestClient : public sigslot::has_slots<> {
   // Hook into the raw packet stream to make sure DTLS packets are encrypted.
   void OnFakeTransportChannelReadPacket(cricket::TransportChannel* channel,
                                         const char* data, size_t size,
+                                        const talk_base::PacketTime& time,
                                         int flags) {
     // Flags shouldn't be set on the underlying TransportChannel packets.
     ASSERT_EQ(0, flags);