From 06c7c8b6bda5457376c75ab93cd59f41c3d4af0c Mon Sep 17 00:00:00 2001
From: Marco Castelluccio <mcastelluccio@mozilla.com>
Date: Sun, 16 Jun 2024 12:22:25 +0000
Subject: [PATCH] Bug 1897501 - Vendor libwebrtc from 06986dc187

Upstream commit: https://webrtc.googlesource.com/src/+/06986dc187465997549eafc164f2d0c3323284c6
    Add flag to exclude policy exempt field trials when listing expired ones

    This is a new version of 47cfed2a7d ("Add flag to exclude policy exempt
    field trials when listing expired ones") that was reverted because the
    CI didn't use a hermetic version of Python. This version relies on older
    Python constructs so it can be used by the CI.

    Bug: None
    Change-Id: I3b4794242d48c59ad94c6210c774cced362fc279
    Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/346600
    Reviewed-by: Jeremy Leconte <jlecontegoogle.com>
    Commit-Queue: Emil Lundmark <lndmrkwebrtc.org>
    Cr-Commit-Position: refs/heads/main{#42029}

UltraBlame original commit: 6b6920c1e4a268fdad3f1989d375eef34e0034bc
---
 third_party/libwebrtc/README.moz-ff-commit    | 49 +++++++++++
 third_party/libwebrtc/README.mozilla          | 88 +++++++++++++++++++
 .../libwebrtc/experiments/field_trials.py     | 49 +++++++++++
 3 files changed, 186 insertions(+)

diff --git a/third_party/libwebrtc/README.moz-ff-commit b/third_party/libwebrtc/README.moz-ff-commit
index 8f0bced55508..92b29991a060 100644
--- a/third_party/libwebrtc/README.moz-ff-commit
+++ b/third_party/libwebrtc/README.moz-ff-commit
@@ -465054,3 +465054,52 @@ of
 lastest
 vendoring
 d5c107d5d4
+#
+MOZ_LIBWEBRTC_SRC
+=
+/
+home
+/
+mfroman
+/
+mozilla
+/
+moz
+-
+central
+/
+.
+moz
+-
+fast
+-
+forward
+/
+moz
+-
+libwebrtc
+MOZ_LIBWEBRTC_BRANCH
+=
+mozpatches
+bash
+dom
+/
+media
+/
+webrtc
+/
+third_party_build
+/
+fast
+-
+forward
+-
+libwebrtc
+.
+sh
+#
+base
+of
+lastest
+vendoring
+06986dc187
diff --git a/third_party/libwebrtc/README.mozilla b/third_party/libwebrtc/README.mozilla
index 48590ab5ada3..1092c716c240 100644
--- a/third_party/libwebrtc/README.mozilla
+++ b/third_party/libwebrtc/README.mozilla
@@ -769112,3 +769112,91 @@ on
 .
 602951
 .
+#
+.
+/
+mach
+python
+dom
+/
+media
+/
+webrtc
+/
+third_party_build
+/
+vendor
+-
+libwebrtc
+.
+py
+-
+-
+from
+-
+local
+/
+home
+/
+mfroman
+/
+mozilla
+/
+moz
+-
+central
+/
+.
+moz
+-
+fast
+-
+forward
+/
+moz
+-
+libwebrtc
+-
+-
+commit
+mozpatches
+libwebrtc
+libwebrtc
+updated
+from
+/
+home
+/
+mfroman
+/
+mozilla
+/
+moz
+-
+central
+/
+.
+moz
+-
+fast
+-
+forward
+/
+moz
+-
+libwebrtc
+commit
+mozpatches
+on
+2024
+-
+05
+-
+18T03
+:
+42
+:
+03
+.
+316923
+.
diff --git a/third_party/libwebrtc/experiments/field_trials.py b/third_party/libwebrtc/experiments/field_trials.py
index f99abaa62723..b4ef2843234f 100644
--- a/third_party/libwebrtc/experiments/field_trials.py
+++ b/third_party/libwebrtc/experiments/field_trials.py
@@ -7000,9 +7000,18 @@
 =
 expired_field_trials
 (
+        
 today
 +
 diff
+        
+ACTIVE_FIELD_TRIALS
+if
+args
+.
+no_exempt
+else
+REGISTERED_FIELD_TRIALS
 )
     
 if
@@ -7332,6 +7341,46 @@
 add_argument
 (
         
+'
+-
+-
+no
+-
+exempt
+'
+        
+default
+=
+False
+        
+action
+=
+'
+store_true
+'
+        
+required
+=
+False
+        
+help
+=
+'
+whether
+to
+include
+policy
+exempt
+field
+trials
+'
+)
+    
+parser_expired
+.
+add_argument
+(
+        
 '
 -
 -