BASELINE: Update Chromium to 80.0.3987.136

Change-Id: I98e1649aafae85ba3a83e67af00bb27ef301db7b
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>

2 files changed, 66 insertions, 17 deletions

diff --git a/chromium/chromecast/media/audio/mixer_service/BUILD.gn b/chromium/chromecast/media/audio/mixer_service/BUILD.gn
index 5407f2298e3..ddf4621f8d9 100644
--- a/chromium/chromecast/media/audio/mixer_service/BUILD.gn
+++ b/chromium/chromecast/media/audio/mixer_service/BUILD.gn
@@ -6,6 +6,12 @@ import("//build/buildflag_header.gni")
 import("//chromecast/chromecast.gni")
 import("//third_party/protobuf/proto_library.gni")
 
+buildflag_header("buildflags") {
+  header = "buildflags.h"
+
+  flags = [ "HAVE_FULL_MIXER=$have_full_mixer" ]
+}
+
 proto_library("proto") {
   proto_out_dir = "chromecast/media/audio/mixer_service"
   sources = [
@@ -15,6 +21,7 @@ proto_library("proto") {
 
 cast_source_set("common") {
   sources = [
+    "constants.cc",
     "constants.h",
     "conversions.cc",
     "conversions.h",
@@ -23,7 +30,9 @@ cast_source_set("common") {
   ]
 
   deps = [
+    ":buildflags",
     "//base",
+    "//chromecast/net:io_buffer_pool",
     "//chromecast/public",
     "//chromecast/public/media",
     "//net",
@@ -42,10 +51,10 @@ cast_source_set("connection") {
   ]
 
   deps = [
+    ":audio_socket_service",
     ":common",
     "//base",
     "//chromecast/base",
-    "//chromecast/media/audio:audio_buildflags",
     "//net",
   ]
 }
@@ -59,13 +68,11 @@ cast_source_set("output_stream_connection") {
   deps = [
     ":common",
     ":connection",
+    ":proto",
     "//base",
+    "//chromecast/net:io_buffer_pool",
     "//net",
   ]
-
-  public_deps = [
-    ":proto",
-  ]
 }
 
 cast_source_set("control_connection") {
@@ -84,6 +91,54 @@ cast_source_set("control_connection") {
   ]
 }
 
+cast_source_set("mixer_control") {
+  sources = [
+    "mixer_control.cc",
+    "mixer_control.h",
+  ]
+
+  deps = [
+    ":common",
+    ":control_connection",
+    "//base",
+    "//chromecast/media/audio:audio_io_thread",
+  ]
+}
+
+cast_source_set("loopback_connection") {
+  sources = [
+    "loopback_connection.cc",
+    "loopback_connection.h",
+  ]
+
+  deps = [
+    ":common",
+    ":connection",
+    ":proto",
+    "//base",
+    "//chromecast/net:io_buffer_pool",
+    "//chromecast/public/media",
+    "//net",
+  ]
+}
+
+cast_source_set("redirected_audio_connection") {
+  sources = [
+    "redirected_audio_connection.cc",
+    "redirected_audio_connection.h",
+  ]
+
+  deps = [
+    ":common",
+    ":connection",
+    ":proto",
+    "//base",
+    "//chromecast/net:io_buffer_pool",
+    "//chromecast/public",
+    "//net",
+  ]
+}
+
 cast_source_set("audio_socket_service") {
   sources = [
     "audio_socket_service.cc",
diff --git a/chromium/chromecast/media/audio/mixer_service/receiver/BUILD.gn b/chromium/chromecast/media/audio/mixer_service/receiver/BUILD.gn
index 7cba5198429..221180d6e33 100644
--- a/chromium/chromecast/media/audio/mixer_service/receiver/BUILD.gn
+++ b/chromium/chromecast/media/audio/mixer_service/receiver/BUILD.gn
@@ -48,21 +48,15 @@ cast_source_set("receiver_cma") {
 
 cast_source_set("receiver_creation") {
   sources = [
+    "receiver_creation.cc",
     "receiver_creation.h",
   ]
 
   deps = [
-    ":receiver",
+    ":receiver_cma",
+    "//base",
+    "//chromecast/media/audio:audio_io_thread",
+    "//chromecast/media/audio/mixer_service:buildflags",
+    "//chromecast/media/audio/mixer_service:common",
   ]
-
-  if (have_full_mixer) {
-    sources += [ "receiver_creation_none.cc" ]
-  } else {
-    sources += [ "receiver_creation_cma.cc" ]
-    deps += [
-      ":receiver_cma",
-      "//base",
-      "//chromecast/media/audio:audio_io_thread",
-    ]
-  }
 }