BASELINE: Update Chromium to 85.0.4183.14085-based

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

3 files changed, 11 insertions, 36 deletions

diff --git a/chromium/content/renderer/media/audio/audio_device_factory.cc b/chromium/content/renderer/media/audio/audio_device_factory.cc
index 2a5d45c9e1f..39b0a2b400a 100644
--- a/chromium/content/renderer/media/audio/audio_device_factory.cc
+++ b/chromium/content/renderer/media/audio/audio_device_factory.cc
@@ -43,16 +43,16 @@ namespace {
 // In this case we will time out, to avoid renderer hang forever waiting for
 // device authorization (http://crbug/615589). This will result in "no audio".
 // There are also cases when authorization takes too long on Mac and Linux.
-constexpr int64_t kMaxAuthorizationTimeoutMs = 10000;
+constexpr base::TimeDelta kMaxAuthorizationTimeout =
+    base::TimeDelta::FromSeconds(10);
 #else
-constexpr int64_t kMaxAuthorizationTimeoutMs = 0;  // No timeout.
+constexpr base::TimeDelta kMaxAuthorizationTimeout;  // No timeout.
 #endif
 
 base::TimeDelta GetDefaultAuthTimeout() {
   // Set authorization request timeout at 80% of renderer hung timeout,
   // but no more than kMaxAuthorizationTimeout.
-  return base::TimeDelta::FromMilliseconds(
-      std::min(kHungRendererDelayMs * 8 / 10, kMaxAuthorizationTimeoutMs));
+  return std::min(kHungRendererDelay * 8 / 10, kMaxAuthorizationTimeout);
 }
 
 scoped_refptr<media::AudioOutputDevice> NewOutputDevice(
@@ -181,7 +181,8 @@ AudioDeviceFactory::NewAudioCapturerSource(
 
   return base::MakeRefCounted<media::AudioInputDevice>(
       AudioInputIPCFactory::get()->CreateAudioInputIPC(render_frame_id, params),
-      media::AudioInputDevice::Purpose::kUserInput);
+      media::AudioInputDevice::Purpose::kUserInput,
+      media::AudioInputDevice::DeadStreamDetection::kEnabled);
 }
 
 // static
diff --git a/chromium/content/renderer/media/audio/audio_renderer_mixer_manager.cc b/chromium/content/renderer/media/audio/audio_renderer_mixer_manager.cc
index a5301686b4c..2518e7f289e 100644
--- a/chromium/content/renderer/media/audio/audio_renderer_mixer_manager.cc
+++ b/chromium/content/renderer/media/audio/audio_renderer_mixer_manager.cc
@@ -10,6 +10,7 @@
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
+#include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_functions.h"
 #include "base/metrics/histogram_macros.h"
@@ -98,30 +99,6 @@ media::AudioParameters GetMixerOutputParams(
   return params;
 }
 
-void LogMixerUmaHistogram(media::AudioLatency::LatencyType latency, int value) {
-  switch (latency) {
-    case media::AudioLatency::LATENCY_EXACT_MS:
-      UMA_HISTOGRAM_CUSTOM_COUNTS(
-          "Media.Audio.Render.AudioInputsPerMixer.LatencyExact", value, 1, 20,
-          21);
-      return;
-    case media::AudioLatency::LATENCY_INTERACTIVE:
-      UMA_HISTOGRAM_CUSTOM_COUNTS(
-          "Media.Audio.Render.AudioInputsPerMixer.LatencyInteractive", value, 1,
-          20, 21);
-      return;
-    case media::AudioLatency::LATENCY_RTC:
-      UMA_HISTOGRAM_CUSTOM_COUNTS(
-          "Media.Audio.Render.AudioInputsPerMixer.LatencyRtc", value, 1, 20,
-          21);
-      return;
-    case media::AudioLatency::LATENCY_PLAYBACK:
-      return;
-    default:
-      NOTREACHED();
-  }
-}
-
 }  // namespace
 
 namespace content {
@@ -193,9 +170,8 @@ media::AudioRendererMixer* AudioRendererMixerManager::GetMixer(
 
   const media::AudioParameters& mixer_output_params =
       GetMixerOutputParams(input_params, sink_info.output_params(), latency);
-  media::AudioRendererMixer* mixer = new media::AudioRendererMixer(
-      mixer_output_params, std::move(sink),
-      base::BindRepeating(&LogMixerUmaHistogram, latency));
+  media::AudioRendererMixer* mixer =
+      new media::AudioRendererMixer(mixer_output_params, std::move(sink));
   mixers_[key] = {mixer, 1};
   DVLOG(1) << __func__ << " mixer: " << mixer << " latency: " << latency
            << "\n input: " << input_params.AsHumanReadableString()
diff --git a/chromium/content/renderer/media/audio/audio_renderer_sink_cache_impl.cc b/chromium/content/renderer/media/audio/audio_renderer_sink_cache_impl.cc
index 02e2a9a54f2..3fa811c782a 100644
--- a/chromium/content/renderer/media/audio/audio_renderer_sink_cache_impl.cc
+++ b/chromium/content/renderer/media/audio/audio_renderer_sink_cache_impl.cc
@@ -34,10 +34,8 @@ class AudioRendererSinkCacheImpl::FrameObserver : public RenderFrameObserver {
 
  private:
   // content::RenderFrameObserver implementation:
-  void DidCommitProvisionalLoad(bool is_same_document_navigation,
-                                ui::PageTransition transition) override {
-    if (!is_same_document_navigation)
-      DropFrameCache();
+  void DidCommitProvisionalLoad(ui::PageTransition transition) override {
+    DropFrameCache();
   }
 
   void OnDestruct() override {