commit 9066c830c7a224c8fe4c495b0463ba11288e3113
parent e0ebc4f672b0f8e1e97079b042b3cfa974c719a7
Author: Dan Baker <dbaker@mozilla.com>
Date: Mon, 27 Oct 2025 12:29:46 -0600
Bug 1995393 - Vendor libwebrtc from e17369f41e
Upstream commit: https://webrtc.googlesource.com/src/+/e17369f41eccb8a209773920d1f3ea8e5d83ef45
Use injected clock in turn_port_unittest
Stops using the global clock methods from time_utils.
This CL was uploaded by an experimental version of git cl split
(https://crbug.com/389069356).
Bug: webrtc:42223992
Change-Id: I213bea54a619a93889046884e94f579ac835cfb4
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/405720
Auto-Submit: Evan Shrubsole <eshr@webrtc.org>
Commit-Queue: Evan Shrubsole <eshr@webrtc.org>
Reviewed-by: Jonas Oreland <jonaso@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#45430}
Diffstat:
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/third_party/libwebrtc/README.mozilla.last-vendor b/third_party/libwebrtc/README.mozilla.last-vendor
@@ -1,4 +1,4 @@
# ./mach python dom/media/webrtc/third_party_build/vendor-libwebrtc.py --from-local /Users/danielbaker/elm/.moz-fast-forward/moz-libwebrtc --commit mozpatches libwebrtc
-libwebrtc updated from /Users/danielbaker/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-10-27T18:25:59.250962+00:00.
+libwebrtc updated from /Users/danielbaker/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-10-27T18:29:28.908016+00:00.
# base of lastest vendoring
-4a632de57b
+e17369f41e
diff --git a/third_party/libwebrtc/p2p/base/turn_port_unittest.cc b/third_party/libwebrtc/p2p/base/turn_port_unittest.cc
@@ -59,7 +59,6 @@
#include "rtc_base/socket_address.h"
#include "rtc_base/third_party/sigslot/sigslot.h"
#include "rtc_base/thread.h"
-#include "rtc_base/time_utils.h"
#include "rtc_base/virtual_socket_server.h"
#include "system_wrappers/include/metrics.h"
#include "test/gmock.h"
@@ -1295,7 +1294,7 @@ TEST_F(TurnPortTest, TestTurnAllocateNonceResetAfterAllocateMismatch) {
// using timestamp `ts_before` but then get an allocate mismatch error and
// receive an even newer nonce based on the system clock. `ts_before` is
// chosen so that the two NONCEs generated by the server will be different.
- int64_t ts_before = TimeMillis() - 1;
+ int64_t ts_before = env_.clock().TimeInMilliseconds() - 1;
std::string first_nonce =
turn_server_.server()->SetTimestampForNextNonce(ts_before);
turn_port_->PrepareAddress();
@@ -1351,7 +1350,8 @@ TEST_F(TurnPortTest, TestTurnAllocateMismatch) {
std::string test_packet = "Test packet";
EXPECT_FALSE(turn_port_->HandleIncomingPacket(
socket_.get(), ReceivedIpPacket::CreateFromLegacy(
- test_packet.data(), test_packet.size(), TimeMicros(),
+ test_packet.data(), test_packet.size(),
+ env_.clock().TimeInMicroseconds(),
SocketAddress(kTurnUdpExtAddr.ipaddr(), 0))));
}