BASELINE: Update Chromium to 85.0.4183.14085-based

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

1 files changed, 12 insertions, 2 deletions

diff --git a/chromium/media/base/renderer.cc b/chromium/media/base/renderer.cc
index c2e1736fdc0..c1970f95e89 100644
--- a/chromium/media/base/renderer.cc
+++ b/chromium/media/base/renderer.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "media/base/renderer.h"
+#include "base/logging.h"
 
 namespace media {
 
@@ -10,18 +11,27 @@ Renderer::Renderer() = default;
 
 Renderer::~Renderer() = default;
 
+void Renderer::SetCdm(CdmContext* cdm_context, CdmAttachedCB cdm_attached_cb) {
+  DLOG(WARNING) << "CdmContext is not supported.";
+  std::move(cdm_attached_cb).Run(false);
+}
+
 void Renderer::OnSelectedVideoTracksChanged(
     const std::vector<DemuxerStream*>& enabled_tracks,
     base::OnceClosure change_completed_cb) {
-  std::move(change_completed_cb).Run();
   DLOG(WARNING) << "Track changes are not supported.";
+  std::move(change_completed_cb).Run();
 }
 
 void Renderer::OnEnabledAudioTracksChanged(
     const std::vector<DemuxerStream*>& enabled_tracks,
     base::OnceClosure change_completed_cb) {
-  std::move(change_completed_cb).Run();
   DLOG(WARNING) << "Track changes are not supported.";
+  std::move(change_completed_cb).Run();
+}
+
+void Renderer::SetPreservesPitch(bool preserves_pitch) {
+  // Not supported by most renderers.
 }
 
 }  // namespace media