BASELINE: Update Chromium to 85.0.4183.14085-based

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

3 files changed, 52 insertions, 0 deletions

diff --git a/chromium/chromecast/media/audio/BUILD.gn b/chromium/chromecast/media/audio/BUILD.gn
index 1e8b13a84d8..28f95044461 100644
--- a/chromium/chromecast/media/audio/BUILD.gn
+++ b/chromium/chromecast/media/audio/BUILD.gn
@@ -57,6 +57,24 @@ cast_source_set("interleaved_channel_mixer") {
   ]
 }
 
+cast_source_set("cma_audio_output") {
+  sources = [
+    "cma_audio_output.cc",
+    "cma_audio_output.h",
+  ]
+
+  deps = [
+    "//base",
+    "//chromecast/base",
+    "//chromecast/common/mojom",
+    "//chromecast/media/base",
+    "//chromecast/media/cma/backend",
+    "//chromecast/media/cma/base",
+    "//chromecast/public/media",
+    "//media",
+  ]
+}
+
 cast_source_set("audio") {
   sources = [
     "cast_audio_input_stream.cc",
@@ -74,11 +92,13 @@ cast_source_set("audio") {
 
   deps = [
     ":audio_buildflags",
+    ":cma_audio_output",
     "//base",
     "//chromecast/base",
     "//chromecast/common/mojom",
     "//chromecast/media/api",
     "//chromecast/media/audio/capture_service:receiver",
+    "//chromecast/media/audio/capture_service:utils",
     "//chromecast/media/audio/mixer_service:common",
     "//chromecast/media/audio/mixer_service:output_stream_connection",
     "//chromecast/media/audio/mixer_service:proto",
@@ -103,6 +123,13 @@ cast_source_set("audio") {
     ]
   }
 
+  if (is_android) {
+    sources += [
+      "cast_audio_manager_android.cc",
+      "cast_audio_manager_android.h",
+    ]
+  }
+
   configs += [ "//media/audio:platform_config" ]
 }
 
diff --git a/chromium/chromecast/media/cdm/BUILD.gn b/chromium/chromecast/media/cdm/BUILD.gn
index 571fd098017..c9175279598 100644
--- a/chromium/chromecast/media/cdm/BUILD.gn
+++ b/chromium/chromecast/media/cdm/BUILD.gn
@@ -33,3 +33,15 @@ cast_source_set("cdm") {
     ]
   }
 }
+
+cast_source_set("cdm_origin_provider") {
+  sources = [
+    "cast_cdm_origin_provider.cc",
+    "cast_cdm_origin_provider.h",
+  ]
+
+  deps = [
+    "//media/mojo/mojom",
+    "//mojo/public/cpp/bindings",
+  ]
+}
diff --git a/chromium/chromecast/media/cma/backend/desktop/BUILD.gn b/chromium/chromecast/media/cma/backend/desktop/BUILD.gn
index c4751417760..2c1e71214cf 100644
--- a/chromium/chromecast/media/cma/backend/desktop/BUILD.gn
+++ b/chromium/chromecast/media/cma/backend/desktop/BUILD.gn
@@ -36,3 +36,16 @@ cast_source_set("desktop") {
     sources += [ "volume_control_desktop.cc" ]
   }
 }
+
+cast_source_set("mixer_output") {
+  sources = [
+    "mixer_output_stream_desktop.h",
+    "mixer_output_stream_desktop.cc"
+  ]
+  deps = [
+    "//base",
+    "//chromecast/public/media",
+    "//media",
+  ]
+}
+