BASELINE: Update Chromium to 85.0.4183.14085-based

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

1 files changed, 1 insertions, 10 deletions

diff --git a/chromium/media/base/audio_renderer_mixer.h b/chromium/media/base/audio_renderer_mixer.h
index b8917dcf532..db82cb3eaa8 100644
--- a/chromium/media/base/audio_renderer_mixer.h
+++ b/chromium/media/base/audio_renderer_mixer.h
@@ -35,11 +35,8 @@ class SilentSinkSuspender;
 class MEDIA_EXPORT AudioRendererMixer
     : public AudioRendererSink::RenderCallback {
  public:
-  using UmaLogCallback = base::RepeatingCallback<void(int)>;
-
   AudioRendererMixer(const AudioParameters& output_params,
-                     scoped_refptr<AudioRendererSink> sink,
-                     UmaLogCallback log_callback);
+                     scoped_refptr<AudioRendererSink> sink);
   ~AudioRendererMixer() override;
 
   // Add or remove a mixer input from mixing; called by AudioRendererMixerInput.
@@ -62,8 +59,6 @@ class MEDIA_EXPORT AudioRendererMixer
   }
 
  private:
-  class UMAMaxValueTracker;
-
   // AudioRendererSink::RenderCallback implementation.
   int Render(base::TimeDelta delay,
              base::TimeTicks delay_timestamp,
@@ -115,10 +110,6 @@ class MEDIA_EXPORT AudioRendererMixer
   base::TimeTicks last_play_time_ GUARDED_BY(lock_);
   bool playing_ GUARDED_BY(lock_);
 
-  // Tracks the maximum number of simultaneous mixer inputs and logs it into
-  // UMA histogram upon the destruction.
-  std::unique_ptr<UMAMaxValueTracker> input_count_tracker_ GUARDED_BY(lock_);
-
   DISALLOW_COPY_AND_ASSIGN(AudioRendererMixer);
 };