BASELINE: Update Chromium to 85.0.4183.14085-based

Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

3 files changed, 8 insertions, 3 deletions

diff --git a/chromium/third_party/webrtc/api/neteq/BUILD.gn b/chromium/third_party/webrtc/api/neteq/BUILD.gn
index 1ab02ec92b1..4e85c4d268c 100644
--- a/chromium/third_party/webrtc/api/neteq/BUILD.gn
+++ b/chromium/third_party/webrtc/api/neteq/BUILD.gn
@@ -23,8 +23,8 @@ rtc_source_set("neteq_api") {
     "../../rtc_base:rtc_base_approved",
     "../../system_wrappers:system_wrappers",
     "../audio_codecs:audio_codecs_api",
-    "//third_party/abseil-cpp/absl/types:optional",
   ]
+  absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
 }
 
 rtc_source_set("custom_neteq_factory") {
@@ -56,8 +56,8 @@ rtc_source_set("neteq_controller_api") {
     ":tick_timer",
     "../../rtc_base:rtc_base_approved",
     "../../system_wrappers:system_wrappers",
-    "//third_party/abseil-cpp/absl/types:optional",
   ]
+  absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
 }
 
 rtc_source_set("default_neteq_controller_factory") {
diff --git a/chromium/third_party/webrtc/api/neteq/neteq.cc b/chromium/third_party/webrtc/api/neteq/neteq.cc
index 155ddf2cf3d..e8ef4dbd39b 100644
--- a/chromium/third_party/webrtc/api/neteq/neteq.cc
+++ b/chromium/third_party/webrtc/api/neteq/neteq.cc
@@ -30,7 +30,8 @@ std::string NetEq::Config::ToString() const {
      << ", min_delay_ms=" << min_delay_ms << ", enable_fast_accelerate="
      << (enable_fast_accelerate ? "true" : "false")
      << ", enable_muted_state=" << (enable_muted_state ? "true" : "false")
-     << ", enable_rtx_handling=" << (enable_rtx_handling ? "true" : "false");
+     << ", enable_rtx_handling=" << (enable_rtx_handling ? "true" : "false")
+     << ", extra_output_delay_ms=" << extra_output_delay_ms;
   return ss.str();
 }
 
diff --git a/chromium/third_party/webrtc/api/neteq/neteq.h b/chromium/third_party/webrtc/api/neteq/neteq.h
index f62d3795f05..15ad3aac0ec 100644
--- a/chromium/third_party/webrtc/api/neteq/neteq.h
+++ b/chromium/third_party/webrtc/api/neteq/neteq.h
@@ -138,6 +138,10 @@ class NetEq {
     bool enable_rtx_handling = false;
     absl::optional<AudioCodecPairId> codec_pair_id;
     bool for_test_no_time_stretching = false;  // Use only for testing.
+    // Adds extra delay to the output of NetEq, without affecting jitter or
+    // loss behavior. This is mainly for testing. Value must be a non-negative
+    // multiple of 10 ms.
+    int extra_output_delay_ms = 0;
   };
 
   enum ReturnCodes { kOK = 0, kFail = -1 };