tor-browser

commit 5962a8bd98d15ae7fb5b4d1a7dc28b0f9510c3e5
parent d835f7841db416bde8fa1bdd372a129f60ab5ecb
Author: Dan Baker <dbaker@mozilla.com>
Date:   Mon, 27 Oct 2025 11:36:20 -0600

Bug 1995393 - Vendor libwebrtc from 6da41c3e82

Upstream commit: https://webrtc.googlesource.com/src/+/6da41c3e82a3432472abaeb92a823a4d772be36c
    Use injected clock in tcp_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: I9a6ec3972e0a4cad2035d14026bef90b9a3f2242
    Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/405701
    Commit-Queue: Jonas Oreland <jonaso@webrtc.org>
    Auto-Submit: Evan Shrubsole <eshr@webrtc.org>
    Reviewed-by: Jonas Oreland <jonaso@webrtc.org>
    Cr-Commit-Position: refs/heads/main@{#45412}

Diffstat:
M
third_party/libwebrtc/README.mozilla.last-vendor
 | 
4
++--
M
third_party/libwebrtc/p2p/base/tcp_port_unittest.cc
 | 
9
++++-----

2 files changed, 6 insertions(+), 7 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-27T17:33:47.952003+00:00.
+libwebrtc updated from /Users/danielbaker/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-10-27T17:36:04.672119+00:00.
 # base of lastest vendoring
-e4fcb52663
+6da41c3e82
diff --git a/third_party/libwebrtc/p2p/base/tcp_port_unittest.cc b/third_party/libwebrtc/p2p/base/tcp_port_unittest.cc
@@ -36,7 +36,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 "test/gmock.h"
 #include "test/gtest.h"
@@ -291,8 +290,8 @@ TEST_F(TCPPortTest, SignalSentPacket) {
                         {.timeout = webrtc::TimeDelta::Millis(kTimeout)}),
       webrtc::IsRtcOk());
 
-  client_conn->Ping(webrtc::TimeMillis());
-  server_conn->Ping(webrtc::TimeMillis());
+  client_conn->Ping(env_.clock().TimeInMilliseconds());
+  server_conn->Ping(env_.clock().TimeInMilliseconds());
   ASSERT_THAT(
       webrtc::WaitUntil([&] { return client_conn->writable(); }, IsTrue(),
                         {.timeout = webrtc::TimeDelta::Millis(kTimeout)}),
@@ -355,7 +354,7 @@ TEST_F(TCPPortTest, SignalSentPacketAfterReconnect) {
                         {.timeout = webrtc::TimeDelta::Millis(kTimeout)}),
       webrtc::IsRtcOk());
   EXPECT_FALSE(client_conn->writable());
-  client_conn->Ping(webrtc::TimeMillis());
+  client_conn->Ping(env_.clock().TimeInMilliseconds());
   ASSERT_THAT(
       webrtc::WaitUntil([&] { return client_conn->writable(); }, IsTrue(),
                         {.timeout = webrtc::TimeDelta::Millis(kTimeout)}),
@@ -423,7 +422,7 @@ TEST_F(TCPPortTest, SignalSentPacketAfterReconnect) {
       webrtc::IsRtcOk());
 
   // Send Stun Binding request.
-  client_conn->Ping(webrtc::TimeMillis());
+  client_conn->Ping(env_.clock().TimeInMilliseconds());
   // The Stun Binding request is reported as sent.
   EXPECT_THAT(
       webrtc::WaitUntil([&] { return client_counter.sent_packets(); }, Eq(2),