Adding upstream version 125.0.1.upstream/125.0.1

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 4 insertions, 2 deletions

diff --git a/third_party/libwebrtc/net/dcsctp/tx/send_queue.h b/third_party/libwebrtc/net/dcsctp/tx/send_queue.h
index 48eaefaf6a..d0d834c901 100644
--- a/third_party/libwebrtc/net/dcsctp/tx/send_queue.h
+++ b/third_party/libwebrtc/net/dcsctp/tx/send_queue.h
@@ -17,6 +17,7 @@
 
 #include "absl/types/optional.h"
 #include "api/array_view.h"
+#include "api/units/timestamp.h"
 #include "net/dcsctp/common/internal_types.h"
 #include "net/dcsctp/packet/data.h"
 #include "net/dcsctp/public/types.h"
@@ -37,7 +38,7 @@ class SendQueue {
 
     // Partial reliability - RFC3758
     MaxRetransmits max_retransmissions = MaxRetransmits::NoLimit();
-    TimeMs expires_at = TimeMs::InfiniteFuture();
+    webrtc::Timestamp expires_at = webrtc::Timestamp::PlusInfinity();
 
     // Lifecycle - set for the last fragment, and `LifecycleId::NotSet()` for
     // all other fragments.
@@ -55,7 +56,8 @@ class SendQueue {
   //
   // `max_size` refers to how many payload bytes that may be produced, not
   // including any headers.
-  virtual absl::optional<DataToSend> Produce(TimeMs now, size_t max_size) = 0;
+  virtual absl::optional<DataToSend> Produce(webrtc::Timestamp now,
+                                             size_t max_size) = 0;
 
   // Discards a partially sent message identified by the parameters
   // `stream_id` and `message_id`. The `message_id` comes from the returned