BASELINE: Update Chromium to 91.0.4472.160

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

16 files changed, 116 insertions, 29 deletions

diff --git a/chromium/chromecast/BUILD.gn b/chromium/chromecast/BUILD.gn
index a6aefc0fc30..88c101d8a72 100644
--- a/chromium/chromecast/BUILD.gn
+++ b/chromium/chromecast/BUILD.gn
@@ -8,6 +8,7 @@ import("//build/config/sanitizers/sanitizers.gni")
 import("//build/config/ui.gni")
 import("//chromecast/build/tests/cast_test.gni")
 import("//chromecast/chromecast.gni")
+import("//chromecast/resource_sizes/chromecast_resource_sizes.gni")
 import("//media/media_options.gni")
 import("//tools/grit/repack.gni")
 import("//v8/gni/v8.gni")
@@ -67,6 +68,14 @@ config("iot_service") {
   }
 }
 
+chromecast_resource_sizes_test("resource_sizes_chromecast") {
+  data_deps = [
+    ":cast_shell",
+    ":cast_shell_pak",
+    ":chromecast_locales_pak",
+  ]
+}
+
 # A list of all public test() binaries. This is an organizational target that
 # cannot be depended upon or built directly. Build cast_test_lists instead.
 cast_test_group("cast_tests") {
@@ -489,6 +498,7 @@ cast_executable("cast_shell") {
     ":chromecast_locales_pak",
     "//chromecast/app",
     "//content/public/app",
+    "//third_party/widevine/cdm",
   ]
 }
 
@@ -588,8 +598,9 @@ group("chromecast_locales_pak") {
 
 buildflag_header("chromecast_buildflags") {
   header = "chromecast_buildflags.h"
+  _command_line_flags = string_join(",", default_command_line_flags)
   flags = [
-    "DEFAULT_COMMAND_LINE_FLAGS=\"$default_command_line_flags\"",
+    "DEFAULT_COMMAND_LINE_FLAGS=\"$_command_line_flags\"",
     "DISABLE_SECURE_FLAC_OPUS_DECODING=$disable_secure_flac_and_opus_decoding",
     "ENABLE_ASSISTANT=$enable_assistant",
     "ENABLE_CAST_FRAGMENT=$enable_cast_fragment",
@@ -597,7 +608,6 @@ buildflag_header("chromecast_buildflags") {
     "ENABLE_EXTERNAL_MOJO_SERVICES=$enable_external_mojo_services",
     "ENABLE_PLAYREADY=$enable_playready",
     "ENABLE_VIDEO_CAPTURE_SERVICE=$enable_video_capture_service",
-    "ENABLE_VOLUME_TABLES_ACCESS=$enable_volume_tables_access",
     "IS_ANDROID_APPLIANCE=$is_android_appliance",
     "IS_ANDROID_THINGS=$is_android_things",
     "IS_ANDROID_THINGS_NON_PUBLIC=$is_android_things_non_public",
diff --git a/chromium/chromecast/base/BUILD.gn b/chromium/chromecast/base/BUILD.gn
index c56a3739285..d4556fae22f 100644
--- a/chromium/chromecast/base/BUILD.gn
+++ b/chromium/chromecast/base/BUILD.gn
@@ -90,6 +90,7 @@ cast_source_set("base") {
   deps = [
     "//base",
     "//chromecast:chromecast_buildflags",
+    "//third_party/widevine/cdm:buildflags",
   ]
 
   if (chromecast_branding == "public") {
@@ -353,7 +354,6 @@ if (is_android) {
 
     deps = [
       "//base:base_java",
-      "//base:jni_java",
       "//third_party/androidx:androidx_annotation_annotation_java",
     ]
     annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
@@ -383,6 +383,7 @@ if (is_android) {
       "$java_test_dir/org/chromium/chromecast/base/ObservableAndTest.java",
       "$java_test_dir/org/chromium/chromecast/base/ObservableAndThenTest.java",
       "$java_test_dir/org/chromium/chromecast/base/ObservableFilterTest.java",
+      "$java_test_dir/org/chromium/chromecast/base/ObservableFlatMapTest.java",
       "$java_test_dir/org/chromium/chromecast/base/ObservableMapTest.java",
       "$java_test_dir/org/chromium/chromecast/base/ObservableMiscellaneousTest.java",
       "$java_test_dir/org/chromium/chromecast/base/ObservableNotTest.java",
diff --git a/chromium/chromecast/browser/BUILD.gn b/chromium/chromecast/browser/BUILD.gn
index 0fd3ad3136a..3456994ebe9 100644
--- a/chromium/chromecast/browser/BUILD.gn
+++ b/chromium/chromecast/browser/BUILD.gn
@@ -416,8 +416,9 @@ cast_source_set("browser_base") {
     ]
     if (use_aura) {
       sources += [
-        "accessibility/accessibility_manager.cc",
         "accessibility/accessibility_manager.h",
+        "accessibility/accessibility_manager_impl.cc",
+        "accessibility/accessibility_manager_impl.h",
         "accessibility/accessibility_sound_player.h",
         "accessibility/accessibility_sound_proxy.cc",
         "accessibility/accessibility_sound_proxy.h",
@@ -616,6 +617,7 @@ cast_source_set("browsertests") {
     "//chromecast/base",
     "//chromecast/base:chromecast_switches",
     "//chromecast/base/metrics",
+    "//chromecast/graphics:graphics",
     "//components/keyed_service/content",
     "//components/prefs",
     "//content/public/browser",
@@ -626,6 +628,10 @@ cast_source_set("browsertests") {
     "//services/service_manager/public/mojom",
   ]
 
+  if (use_aura) {
+    deps += [ "//ui/aura" ]
+  }
+
   data = [
     "//chromecast/browser/test/data/",
     "//media/test/data/",
diff --git a/chromium/chromecast/browser/android/BUILD.gn b/chromium/chromecast/browser/android/BUILD.gn
index b2b19f099ff..557089fd2b2 100644
--- a/chromium/chromecast/browser/android/BUILD.gn
+++ b/chromium/chromecast/browser/android/BUILD.gn
@@ -172,7 +172,6 @@ android_library("cast_shell_java") {
     ":reactive_android_java",
     ":resume_intents_java",
     "//base:base_java",
-    "//base:jni_java",
     "//chromecast/base:base_java",
     "//chromecast/media/cma/backend/android:audio_track_java",
     "//components/crash/android:java",
diff --git a/chromium/chromecast/chromecast.gni b/chromium/chromecast/chromecast.gni
index e53e6cc1f6d..6b57ba9eb51 100644
--- a/chromium/chromecast/chromecast.gni
+++ b/chromium/chromecast/chromecast.gni
@@ -86,10 +86,10 @@ declare_args() {
   use_android_user_agent = false
 
   # Contain default command line switches we want to set.
-  # The syntax: "test-flag-one=public,test-flag-two=true,test-flag-three=1,".
-  # This arg can be overridden but not supports += operator.
+  # This will get joined into a comma-separated list that looks like:
+  #   "test-flag-one=public,test-flag-two=true,test-flag-three=1,"
   # TODO(ziyangch): make the parsing logic have ability to quote/escape characters.
-  default_command_line_flags = ""
+  default_command_line_flags = []
 
   # Set to true to disable secure flac/opus support in EME, when using
   # cast CMA media backend and supporting Widevine or Playready.
@@ -135,8 +135,6 @@ declare_args() {
 }
 
 declare_args() {
-  enable_volume_tables_access =
-      is_android_things && chromecast_branding != "public"
   is_android_things_non_public =
       is_android_things && chromecast_branding != "public"
 }
@@ -157,9 +155,11 @@ if (chromecast_branding == "public") {
 }
 
 # All locales supported by Cast builds. This provides a single point of
-# reference for all GN files referencing a locales list. |locales| is declared
-# in //build/config/locales.gni.
-cast_locales = locales
+# reference for all GN files referencing a locales list.
+# |locales_without_pseudolocales| is declared in //build/config/locales.gni.
+# See https://chromium-review.googlesource.com/488166/ for why we can't use
+# pseudolocales in chromecast.
+cast_locales = locales_without_pseudolocales
 
 # Android currently supports more locales than Desktop and ChromeOS.
 # If Cast will also the android files update this and the Cast grd files.
diff --git a/chromium/chromecast/common/BUILD.gn b/chromium/chromecast/common/BUILD.gn
index 620b6459680..0324706ba5a 100644
--- a/chromium/chromecast/common/BUILD.gn
+++ b/chromium/chromecast/common/BUILD.gn
@@ -4,6 +4,7 @@
 
 import("//chromecast/chromecast.gni")
 import("//mojo/public/tools/bindings/mojom.gni")
+import("//third_party/widevine/cdm/widevine.gni")
 
 cast_source_set("queryable_data") {
   sources = [
@@ -75,10 +76,13 @@ cast_source_set("common") {
     "//chromecast/base:cast_version",
     "//chromecast/common/media",
     "//chromecast/common/mojom",
+    "//components/cdm/common:common",
     "//content/public/common",
+    "//media:media_buildflags",
     "//mojo/public/cpp/bindings",
     "//net",
     "//services/network/public/cpp:cpp",
+    "//third_party/widevine/cdm:buildflags",
     "//ui/base",
     "//url:url",
   ]
@@ -111,4 +115,8 @@ cast_source_set("common") {
   if (!is_fuchsia) {
     deps += [ "//components/services/heap_profiling/public/cpp" ]
   }
+
+  if (enable_library_cdms) {
+    deps += [ "//media/cdm:cdm_paths" ]  # Needed by cast_content_client.cc
+  }
 }
diff --git a/chromium/chromecast/common/mojom/multiroom.mojom b/chromium/chromecast/common/mojom/multiroom.mojom
index a997134346c..5533428b52b 100644
--- a/chromium/chromecast/common/mojom/multiroom.mojom
+++ b/chromium/chromecast/common/mojom/multiroom.mojom
@@ -21,6 +21,9 @@ struct MultiroomInfo {
 
   // Intrinsic output delay of this device.
   mojo_base.mojom.TimeDelta output_delay;
+
+  // Desired audio output device ID. If this is empty, use the normal default.
+  string output_device_id;
 };
 
 interface MultiroomManager {
diff --git a/chromium/chromecast/media/audio/BUILD.gn b/chromium/chromecast/media/audio/BUILD.gn
index bd179b63c7e..af057affb1e 100644
--- a/chromium/chromecast/media/audio/BUILD.gn
+++ b/chromium/chromecast/media/audio/BUILD.gn
@@ -47,6 +47,19 @@ cast_source_set("processing") {
   cflags = [ "-ffast-math" ]
 }
 
+cast_source_set("playback_rate_shifter") {
+  sources = [
+    "playback_rate_shifter.cc",
+    "playback_rate_shifter.h",
+  ]
+
+  deps = [
+    ":processing",
+    "//base",
+    "//media",
+  ]
+}
+
 cast_source_set("interleaved_channel_mixer") {
   sources = [
     "interleaved_channel_mixer.cc",
@@ -77,6 +90,16 @@ cast_source_set("cma_audio_output") {
   ]
 }
 
+cast_source_set("resampler") {
+  sources = [ "cast_audio_resampler_impl.cc" ]
+
+  deps = [
+    "//base",
+    "//chromecast/media/api",
+    "//media",
+  ]
+}
+
 cast_source_set("audio") {
   sources = [
     "cast_audio_input_stream.cc",
@@ -89,7 +112,8 @@ cast_source_set("audio") {
     "cast_audio_mixer.h",
     "cast_audio_output_stream.cc",
     "cast_audio_output_stream.h",
-    "cast_audio_resampler_impl.cc",
+    "cast_audio_output_utils.cc",
+    "cast_audio_output_utils.h",
     "cma_audio_output_stream.cc",
     "cma_audio_output_stream.h",
   ]
@@ -212,11 +236,13 @@ cast_source_set("unittests") {
     "audio_clock_simulator_unittest.cc",
     "audio_fader_unittest.cc",
     "interleaved_channel_mixer_unittest.cc",
+    "playback_rate_shifter_unittest.cc",
     "rate_adjuster_unittest.cc",
   ]
 
   deps = [
     ":interleaved_channel_mixer",
+    ":playback_rate_shifter",
     ":processing",
     ":rate_adjuster",
     "//base",
diff --git a/chromium/chromecast/media/cma/BUILD.gn b/chromium/chromecast/media/cma/BUILD.gn
index 8f4cbbd2ce1..ca864d2f239 100644
--- a/chromium/chromecast/media/cma/BUILD.gn
+++ b/chromium/chromecast/media/cma/BUILD.gn
@@ -84,7 +84,9 @@ cast_source_set("unittests") {
       "backend/proxy/audio_decoder_pipeline_node_unittest.cc",
       "backend/proxy/buffer_id_manager_unittest.cc",
       "backend/proxy/cma_backend_proxy_unittest.cc",
+      "backend/proxy/media_pipeline_buffer_extension_unittest.cc",
       "backend/proxy/proxy_call_translator_unittest.cc",
+      "backend/proxy/push_buffer_pending_handler_unittest.cc",
       "backend/proxy/push_buffer_queue_unittest.cc",
     ]
     deps += [
diff --git a/chromium/chromecast/media/cma/backend/alsa/BUILD.gn b/chromium/chromecast/media/cma/backend/alsa/BUILD.gn
index 289891ae374..ed3dc904fd2 100644
--- a/chromium/chromecast/media/cma/backend/alsa/BUILD.gn
+++ b/chromium/chromecast/media/cma/backend/alsa/BUILD.gn
@@ -53,6 +53,7 @@ cast_source_set("volume_control") {
   deps = [
     "//base",
     "//chromecast/base:chromecast_switches",
+    "//chromecast/base/metrics",
     "//chromecast/media/cma/backend:public",
     "//media",
   ]
diff --git a/chromium/chromecast/media/cma/backend/android/BUILD.gn b/chromium/chromecast/media/cma/backend/android/BUILD.gn
index 4d079ccdd6f..95e982d444e 100644
--- a/chromium/chromecast/media/cma/backend/android/BUILD.gn
+++ b/chromium/chromecast/media/cma/backend/android/BUILD.gn
@@ -46,13 +46,8 @@ generate_jni("audio_track_jni_headers") {
   sources = [
     "java/src/org/chromium/chromecast/cma/backend/android/AudioSinkAudioTrackImpl.java",
     "java/src/org/chromium/chromecast/cma/backend/android/VolumeControl.java",
+    "java/src/org/chromium/chromecast/cma/backend/android/VolumeMap.java",
   ]
-
-  if (enable_volume_tables_access) {
-    sources += [
-      "java/src/org/chromium/chromecast/cma/backend/android/VolumeMap.java",
-    ]
-  }
 }
 
 android_library("audio_track_java") {
@@ -60,17 +55,11 @@ android_library("audio_track_java") {
     "java/src/org/chromium/chromecast/cma/backend/android/AudioSinkAudioTrackImpl.java",
     "java/src/org/chromium/chromecast/cma/backend/android/ThrottledLog.java",
     "java/src/org/chromium/chromecast/cma/backend/android/VolumeControl.java",
+    "java/src/org/chromium/chromecast/cma/backend/android/VolumeMap.java",
   ]
 
-  if (enable_volume_tables_access) {
-    sources += [
-      "java/src/org/chromium/chromecast/cma/backend/android/VolumeMap.java",
-    ]
-  }
-
   deps = [
     "//base:base_java",
-    "//base:jni_java",
     "//chromecast/base:base_java",
     "//chromecast/public:volume_control_enums_java",
     "//third_party/androidx:androidx_annotation_annotation_java",
diff --git a/chromium/chromecast/media/cma/backend/mixer/BUILD.gn b/chromium/chromecast/media/cma/backend/mixer/BUILD.gn
index ee162aed503..9488a2fcc0b 100644
--- a/chromium/chromecast/media/cma/backend/mixer/BUILD.gn
+++ b/chromium/chromecast/media/cma/backend/mixer/BUILD.gn
@@ -87,6 +87,7 @@ cast_source_set("mixer") {
     "//chromecast/media/audio:audio_log",
     "//chromecast/media/audio:interleaved_channel_mixer",
     "//chromecast/media/audio:libcast_external_audio_pipeline_1.0",
+    "//chromecast/media/audio:playback_rate_shifter",
     "//chromecast/media/audio:processing",
     "//chromecast/media/audio/mixer_service:common",
     "//chromecast/media/audio/mixer_service:proto",
diff --git a/chromium/chromecast/media/cma/backend/proxy/BUILD.gn b/chromium/chromecast/media/cma/backend/proxy/BUILD.gn
index 2465acf71a4..f60dd446d5c 100644
--- a/chromium/chromecast/media/cma/backend/proxy/BUILD.gn
+++ b/chromium/chromecast/media/cma/backend/proxy/BUILD.gn
@@ -29,25 +29,33 @@ chromecast_media_grpc_library("cast_audio_decoder_service_proto") {
   # as both `protobuf_lite` and `protobuf_full` are present.
   assert(!is_android)
 
-  sources = [ "//third_party/openscreen/src/cast/cast_core/api/runtime/cast_audio_decoder_service.proto" ]
+  sources = [ "//third_party/openscreen/src/cast/cast_core/api/runtime/cast_audio_channel_service.proto" ]
 }
 
 cast_source_set("proxy") {
   sources = [
+    "audio_channel_broker_impl.cc",
+    "audio_channel_broker_impl.h",
+    "audio_channel_push_buffer_handler.h",
     "audio_decoder_pipeline_node.cc",
     "audio_decoder_pipeline_node.h",
     "buffer_id_manager.cc",
     "buffer_id_manager.h",
     "cast_runtime_audio_channel_broker.cc",
     "cast_runtime_audio_channel_broker.h",
+    "cast_runtime_audio_channel_endpoint_manager.h",
     "cma_backend_proxy.cc",
     "cma_backend_proxy.h",
     "cma_proxy_handler.h",
+    "media_pipeline_buffer_extension.cc",
+    "media_pipeline_buffer_extension.h",
     "multizone_audio_decoder_proxy.h",
     "multizone_audio_decoder_proxy_impl.cc",
     "multizone_audio_decoder_proxy_impl.h",
     "proxy_call_translator.cc",
     "proxy_call_translator.h",
+    "push_buffer_pending_handler.cc",
+    "push_buffer_pending_handler.h",
     "push_buffer_queue.cc",
     "push_buffer_queue.h",
   ]
@@ -64,6 +72,6 @@ cast_source_set("proxy") {
 
   if (!enable_chromium_runtime_cast_renderer ||
       chromecast_branding == "public") {
-    sources += [ "audio_channel_broker_simple.cc" ]
+    sources += [ "cast_runtime_audio_channel_endpoint_simple.cc" ]
   }
 }
diff --git a/chromium/chromecast/renderer/BUILD.gn b/chromium/chromecast/renderer/BUILD.gn
index 8bb10d63c69..874fe010168 100644
--- a/chromium/chromecast/renderer/BUILD.gn
+++ b/chromium/chromecast/renderer/BUILD.gn
@@ -116,6 +116,7 @@ cast_source_set("renderer_base") {
       "//chromecast/renderer:extensions_resources",
       "//components/version_info:version_info",
       "//extensions/common",
+      "//extensions/common:mojom",
       "//extensions/common/api",
       "//extensions/renderer",
       "//gin:gin",
diff --git a/chromium/chromecast/resource_sizes/BUILD.gn b/chromium/chromecast/resource_sizes/BUILD.gn
new file mode 100644
index 00000000000..26ad704c49b
--- /dev/null
+++ b/chromium/chromecast/resource_sizes/BUILD.gn
@@ -0,0 +1,11 @@
+# Copyright 2021 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build/config/python.gni")
+
+python_library("chromecast_resource_sizes_py") {
+  pydeps_file = "chromecast_resource_sizes.pydeps"
+  data = [ "//buildtools/third_party/eu-strip/bin/eu-strip" ]
+  data_deps = [ "//third_party/catapult/tracing:convert_chart_json" ]
+}
diff --git a/chromium/chromecast/resource_sizes/chromecast_resource_sizes.gni b/chromium/chromecast/resource_sizes/chromecast_resource_sizes.gni
new file mode 100644
index 00000000000..78603d65e2a
--- /dev/null
+++ b/chromium/chromecast/resource_sizes/chromecast_resource_sizes.gni
@@ -0,0 +1,21 @@
+# Copyright 2021 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build/util/generate_wrapper.gni")
+
+# Generates a script in the bin directory that runs
+# //chromecast/resource_sizes/chromecast_resource_sizes.py for the provided configuration.
+template("chromecast_resource_sizes_test") {
+  generate_wrapper(target_name) {
+    forward_variables_from(invoker, [ "data_deps" ])
+    executable = "//chromecast/resource_sizes/chromecast_resource_sizes.py"
+    wrapper_script = "$root_out_dir/bin/run_${target_name}"
+
+    deps = [ "//chromecast/resource_sizes:chromecast_resource_sizes_py" ]
+    executable_args = [
+      "--chromium-output-directory",
+      "@WrappedPath(.)",
+    ]
+  }
+}