BASELINE: Update Chromium to 88.0.4324.208

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

16 files changed, 267 insertions, 80 deletions

diff --git a/chromium/ash/BUILD.gn b/chromium/ash/BUILD.gn
index 9552865cf56..ca5d00dca44 100644
--- a/chromium/ash/BUILD.gn
+++ b/chromium/ash/BUILD.gn
@@ -3,6 +3,7 @@
 # found in the LICENSE file.
 
 import("//build/config/features.gni")
+import("//build/config/python.gni")
 import("//build/config/ui.gni")
 import("//chromeos/assistant/ambient.gni")
 import("//mojo/public/tools/bindings/mojom.gni")
@@ -50,6 +51,7 @@ component("ash") {
     "public/cpp/autotest_desks_api.h",
     "public/cpp/autotest_private_api_utils.h",
     "public/cpp/capture_mode_delegate.h",
+    "public/cpp/capture_mode_test_api.h",
     "public/cpp/debug_utils.h",
     "public/cpp/docked_magnifier_controller.h",
     "public/cpp/event_rewriter_controller.h",
@@ -127,6 +129,8 @@ component("ash") {
     "accelerators/pre_target_accelerator_handler.h",
     "accelerators/spoken_feedback_toggler.cc",
     "accelerators/spoken_feedback_toggler.h",
+    "accelerometer/accelerometer_file_reader.cc",
+    "accelerometer/accelerometer_file_reader.h",
     "accelerometer/accelerometer_reader.cc",
     "accelerometer/accelerometer_reader.h",
     "accelerometer/accelerometer_types.cc",
@@ -194,6 +198,7 @@ component("ash") {
     "ambient/ui/ambient_container_view.cc",
     "ambient/ui/ambient_container_view.h",
     "ambient/ui/ambient_view_delegate.h",
+    "ambient/ui/ambient_view_ids.h",
     "ambient/ui/assistant_response_container_view.cc",
     "ambient/ui/assistant_response_container_view.h",
     "ambient/ui/glanceable_info_view.cc",
@@ -257,26 +262,39 @@ component("ash") {
     "bluetooth_devices_observer.h",
     "cancel_mode.cc",
     "cancel_mode.h",
+    "capture_mode/capture_label_view.cc",
+    "capture_mode/capture_label_view.h",
     "capture_mode/capture_mode_bar_view.cc",
     "capture_mode/capture_mode_bar_view.h",
-    "capture_mode/capture_mode_close_button.cc",
-    "capture_mode/capture_mode_close_button.h",
+    "capture_mode/capture_mode_button.cc",
+    "capture_mode/capture_mode_button.h",
     "capture_mode/capture_mode_constants.h",
     "capture_mode/capture_mode_controller.cc",
     "capture_mode/capture_mode_controller.h",
     "capture_mode/capture_mode_feature_pod_controller.cc",
     "capture_mode/capture_mode_feature_pod_controller.h",
+    "capture_mode/capture_mode_metrics.cc",
+    "capture_mode/capture_mode_metrics.h",
     "capture_mode/capture_mode_session.cc",
     "capture_mode/capture_mode_session.h",
     "capture_mode/capture_mode_source_view.cc",
     "capture_mode/capture_mode_source_view.h",
+    "capture_mode/capture_mode_test_api.cc",
     "capture_mode/capture_mode_toggle_button.cc",
     "capture_mode/capture_mode_toggle_button.h",
     "capture_mode/capture_mode_type_view.cc",
     "capture_mode/capture_mode_type_view.h",
     "capture_mode/capture_mode_types.h",
+    "capture_mode/capture_mode_util.cc",
+    "capture_mode/capture_mode_util.h",
+    "capture_mode/capture_window_observer.cc",
+    "capture_mode/capture_window_observer.h",
     "capture_mode/stop_recording_button_tray.cc",
     "capture_mode/stop_recording_button_tray.h",
+    "capture_mode/video_file_handler.cc",
+    "capture_mode/video_file_handler.h",
+    "capture_mode/video_recording_watcher.cc",
+    "capture_mode/video_recording_watcher.h",
     "capture_mode/view_with_ink_drop.h",
     "child_accounts/parent_access_controller_impl.cc",
     "child_accounts/parent_access_controller_impl.h",
@@ -297,6 +315,8 @@ component("ash") {
     "clipboard/clipboard_nudge_constants.h",
     "clipboard/clipboard_nudge_controller.cc",
     "clipboard/clipboard_nudge_controller.h",
+    "clipboard/scoped_clipboard_history_pause_impl.cc",
+    "clipboard/scoped_clipboard_history_pause_impl.h",
     "clipboard/views/clipboard_history_bitmap_item_view.cc",
     "clipboard/views/clipboard_history_bitmap_item_view.h",
     "clipboard/views/clipboard_history_item_view.cc",
@@ -402,6 +422,7 @@ component("ash") {
     "drag_drop/drag_image_view.h",
     "drag_drop/tab_drag_drop_delegate.cc",
     "drag_drop/tab_drag_drop_delegate.h",
+    "drag_drop/toplevel_window_drag_delegate.h",
     "events/accessibility_event_rewriter.cc",
     "events/accessibility_event_rewriter.h",
     "events/event_rewriter_controller_impl.cc",
@@ -443,6 +464,7 @@ component("ash") {
     "frame/wide_frame_view.cc",
     "frame_throttler/frame_throttling_controller.cc",
     "frame_throttler/frame_throttling_controller.h",
+    "frame_throttler/frame_throttling_observer.h",
     "high_contrast/high_contrast_controller.cc",
     "high_contrast/high_contrast_controller.h",
     "highlighter/highlighter_controller.cc",
@@ -479,12 +501,16 @@ component("ash") {
     "host/root_window_transformer.h",
     "host/transformer_helper.cc",
     "host/transformer_helper.h",
+    "hud_display/compositor_stats.cc",
+    "hud_display/compositor_stats.h",
     "hud_display/cpu_graph_page_view.cc",
     "hud_display/cpu_graph_page_view.h",
     "hud_display/cpu_status.cc",
     "hud_display/cpu_status.h",
     "hud_display/data_source.cc",
     "hud_display/data_source.h",
+    "hud_display/fps_graph_page_view.cc",
+    "hud_display/fps_graph_page_view.h",
     "hud_display/graph.cc",
     "hud_display/graph.h",
     "hud_display/graph_page_view_base.cc",
@@ -525,6 +551,8 @@ component("ash") {
     "in_session_auth/in_session_auth_dialog.h",
     "in_session_auth/in_session_auth_dialog_controller_impl.cc",
     "in_session_auth/in_session_auth_dialog_controller_impl.h",
+    "in_session_auth/webauthn_request_registrar_impl.cc",
+    "in_session_auth/webauthn_request_registrar_impl.h",
     "keyboard/arc/arc_virtual_keyboard_container_layout_manager.cc",
     "keyboard/arc/arc_virtual_keyboard_container_layout_manager.h",
     "keyboard/keyboard_controller_impl.cc",
@@ -604,8 +632,8 @@ component("ash") {
     "login/ui/login_pin_view.h",
     "login/ui/login_public_account_user_view.cc",
     "login/ui/login_public_account_user_view.h",
-    "login/ui/login_unpositioned_tooltip_view.cc",
-    "login/ui/login_unpositioned_tooltip_view.h",
+    "login/ui/login_tooltip_view.cc",
+    "login/ui/login_tooltip_view.h",
     "login/ui/login_user_menu_view.cc",
     "login/ui/login_user_menu_view.h",
     "login/ui/login_user_view.cc",
@@ -697,8 +725,8 @@ component("ash") {
     "quick_answers/ui/quick_answers_pre_target_handler.h",
     "quick_answers/ui/quick_answers_view.cc",
     "quick_answers/ui/quick_answers_view.h",
-    "quick_answers/ui/user_consent_view.cc",
-    "quick_answers/ui/user_consent_view.h",
+    "quick_answers/ui/user_notice_view.cc",
+    "quick_answers/ui/user_notice_view.h",
     "root_window_controller.cc",
     "root_window_settings.cc",
     "root_window_settings.h",
@@ -714,6 +742,8 @@ component("ash") {
     "screen_util.cc",
     "screen_util.h",
     "screenshot_delegate.h",
+    "session/fullscreen_alert_bubble.cc",
+    "session/fullscreen_alert_bubble.h",
     "session/fullscreen_controller.cc",
     "session/fullscreen_controller.h",
     "session/multiprofiles_intro_dialog.cc",
@@ -860,6 +890,10 @@ component("ash") {
     "system/accessibility/floating_menu_button.h",
     "system/accessibility/floating_menu_utils.cc",
     "system/accessibility/floating_menu_utils.h",
+    "system/accessibility/select_to_speak_menu_bubble_controller.cc",
+    "system/accessibility/select_to_speak_menu_bubble_controller.h",
+    "system/accessibility/select_to_speak_menu_view.cc",
+    "system/accessibility/select_to_speak_menu_view.h",
     "system/accessibility/select_to_speak_tray.cc",
     "system/accessibility/select_to_speak_tray.h",
     "system/accessibility/switch_access_back_button_bubble_controller.cc",
@@ -935,12 +969,16 @@ component("ash") {
     "system/enterprise/enterprise_domain_observer.h",
     "system/gesture_education/gesture_education_notification_controller.cc",
     "system/gesture_education/gesture_education_notification_controller.h",
+    "system/holding_space/holding_space_color_provider_impl.cc",
+    "system/holding_space/holding_space_color_provider_impl.h",
+    "system/holding_space/holding_space_drag_util.cc",
+    "system/holding_space/holding_space_drag_util.h",
     "system/holding_space/holding_space_item_chip_view.cc",
     "system/holding_space/holding_space_item_chip_view.h",
     "system/holding_space/holding_space_item_chips_container.cc",
     "system/holding_space/holding_space_item_chips_container.h",
-    "system/holding_space/holding_space_item_screenshot_view.cc",
-    "system/holding_space/holding_space_item_screenshot_view.h",
+    "system/holding_space/holding_space_item_screen_capture_view.cc",
+    "system/holding_space/holding_space_item_screen_capture_view.h",
     "system/holding_space/holding_space_item_view.cc",
     "system/holding_space/holding_space_item_view.h",
     "system/holding_space/holding_space_item_view_delegate.cc",
@@ -951,6 +989,10 @@ component("ash") {
     "system/holding_space/holding_space_tray.h",
     "system/holding_space/holding_space_tray_bubble.cc",
     "system/holding_space/holding_space_tray_bubble.h",
+    "system/holding_space/holding_space_tray_icon.cc",
+    "system/holding_space/holding_space_tray_icon.h",
+    "system/holding_space/holding_space_tray_icon_preview.cc",
+    "system/holding_space/holding_space_tray_icon_preview.h",
     "system/holding_space/pinned_files_container.cc",
     "system/holding_space/pinned_files_container.h",
     "system/holding_space/recent_files_container.cc",
@@ -1133,16 +1175,26 @@ component("ash") {
     "system/phonehub/connection_error_view.h",
     "system/phonehub/continue_browsing_chip.cc",
     "system/phonehub/continue_browsing_chip.h",
+    "system/phonehub/enable_hotspot_quick_action_controller.cc",
+    "system/phonehub/enable_hotspot_quick_action_controller.h",
     "system/phonehub/initial_connecting_view.cc",
     "system/phonehub/initial_connecting_view.h",
+    "system/phonehub/interstitial_view_button.cc",
+    "system/phonehub/interstitial_view_button.h",
+    "system/phonehub/locate_phone_quick_action_controller.cc",
+    "system/phonehub/locate_phone_quick_action_controller.h",
     "system/phonehub/notification_opt_in_view.cc",
     "system/phonehub/notification_opt_in_view.h",
     "system/phonehub/onboarding_view.cc",
     "system/phonehub/onboarding_view.h",
     "system/phonehub/phone_connected_view.cc",
     "system/phonehub/phone_connected_view.h",
+    "system/phonehub/phone_hub_content_view.cc",
+    "system/phonehub/phone_hub_content_view.h",
     "system/phonehub/phone_hub_interstitial_view.cc",
     "system/phonehub/phone_hub_interstitial_view.h",
+    "system/phonehub/phone_hub_metrics.cc",
+    "system/phonehub/phone_hub_metrics.h",
     "system/phonehub/phone_hub_notification_controller.cc",
     "system/phonehub/phone_hub_notification_controller.h",
     "system/phonehub/phone_hub_tray.cc",
@@ -1161,8 +1213,11 @@ component("ash") {
     "system/phonehub/silence_phone_quick_action_controller.h",
     "system/phonehub/task_continuation_view.cc",
     "system/phonehub/task_continuation_view.h",
+    "system/phonehub/ui_constants.h",
     "system/power/backlights_forced_off_setter.cc",
     "system/power/backlights_forced_off_setter.h",
+    "system/power/battery_image_source.cc",
+    "system/power/battery_image_source.h",
     "system/power/battery_notification.cc",
     "system/power/battery_notification.h",
     "system/power/dual_role_notification.cc",
@@ -1280,8 +1335,6 @@ component("ash") {
     "system/tray/tray_item_view.cc",
     "system/tray/tray_item_view.h",
     "system/tray/tray_popup_ink_drop_style.h",
-    "system/tray/tray_popup_item_style.cc",
-    "system/tray/tray_popup_item_style.h",
     "system/tray/tray_popup_utils.cc",
     "system/tray/tray_popup_utils.h",
     "system/tray/tray_utils.cc",
@@ -1291,6 +1344,8 @@ component("ash") {
     "system/tray/unfocusable_label.cc",
     "system/tray/unfocusable_label.h",
     "system/tray/view_click_listener.h",
+    "system/unified/camera_mic_tray_item_view.cc",
+    "system/unified/camera_mic_tray_item_view.h",
     "system/unified/collapse_button.cc",
     "system/unified/collapse_button.h",
     "system/unified/current_locale_view.cc",
@@ -1308,8 +1363,6 @@ component("ash") {
     "system/unified/ime_mode_view.h",
     "system/unified/managed_device_tray_item_view.cc",
     "system/unified/managed_device_tray_item_view.h",
-    "system/unified/media_controls_chip_view.cc",
-    "system/unified/media_controls_chip_view.h",
     "system/unified/notification_counter_view.cc",
     "system/unified/notification_counter_view.h",
     "system/unified/notification_hidden_view.cc",
@@ -1376,9 +1429,9 @@ component("ash") {
     "utility/transformer_util.h",
     "wallpaper/wallpaper_base_view.cc",
     "wallpaper/wallpaper_base_view.h",
+    "wallpaper/wallpaper_constants.h",
     "wallpaper/wallpaper_controller_impl.cc",
     "wallpaper/wallpaper_controller_impl.h",
-    "wallpaper/wallpaper_property.h",
     "wallpaper/wallpaper_utils/wallpaper_color_calculator.cc",
     "wallpaper/wallpaper_utils/wallpaper_color_calculator.h",
     "wallpaper/wallpaper_utils/wallpaper_color_calculator_observer.h",
@@ -1521,8 +1574,6 @@ component("ash") {
     "wm/overview/overview_window_drag_controller.h",
     "wm/overview/rounded_label_widget.cc",
     "wm/overview/rounded_label_widget.h",
-    "wm/overview/rounded_rect_view.cc",
-    "wm/overview/rounded_rect_view.h",
     "wm/overview/scoped_overview_animation_settings.cc",
     "wm/overview/scoped_overview_animation_settings.h",
     "wm/overview/scoped_overview_hide_windows.cc",
@@ -1665,7 +1716,6 @@ component("ash") {
     "//components/discardable_memory/public/mojom",
     "//mojo/public/cpp/bindings",
     "//mojo/public/cpp/system",
-    "//services/content/public/mojom",
     "//services/data_decoder/public/mojom",
     "//services/device/public/cpp/bluetooth",
     "//services/device/public/mojom",
@@ -1694,6 +1744,8 @@ component("ash") {
     "//ash/assistant/util",
     "//ash/keyboard/ui",
     "//ash/login/resources:resources_grit",
+    "//ash/services/recording",
+    "//ash/services/recording/public/mojom",
     "//ash/system/machine_learning:user_settings_event_proto",
     "//base",
     "//base:i18n",
@@ -1708,7 +1760,8 @@ component("ash") {
     "//chromeos/components/phonehub",
     "//chromeos/components/quick_answers",
     "//chromeos/components/quick_answers/public/cpp:prefs",
-    "//chromeos/ui",
+    "//chromeos/ui/base",
+    "//chromeos/ui/frame",
     "//services/viz/public/mojom",
 
     # TODO(https://crbug.com/644336): Make CrasAudioHandler Chrome or Ash only.
@@ -1763,7 +1816,6 @@ component("ash") {
     "//gpu/command_buffer/client:gles2_interface",
     "//media",
     "//net",
-    "//services/content/public/cpp",
     "//services/data_decoder/public/cpp",
     "//services/metrics/public/cpp:ukm_builders",
     "//services/network/public/cpp:cpp",
@@ -1844,7 +1896,8 @@ component("ash") {
   }
 }
 
-action("dbus_service_files") {
+# TODO(crbug.com/1112471): Get this to run cleanly under Python 3.
+python2_action("dbus_service_files") {
   sources = [
     "dbus/org.chromium.DisplayService.conf",
     "dbus/org.chromium.GesturePropertiesService.conf",
@@ -1918,6 +1971,7 @@ test("ash_unittests") {
     "autoclick/autoclick_drag_event_rewriter_unittest.cc",
     "autoclick/autoclick_unittest.cc",
     "capture_mode/capture_mode_unittests.cc",
+    "capture_mode/video_file_handler_unittest.cc",
     "child_accounts/parent_access_controller_impl_unittest.cc",
     "clipboard/clipboard_history_controller_unittest.cc",
     "clipboard/clipboard_history_resource_manager_unittest.cc",
@@ -1979,7 +2033,6 @@ test("ash_unittests") {
     "home_screen/drag_window_from_shelf_controller_test_api.cc",
     "home_screen/drag_window_from_shelf_controller_test_api.h",
     "home_screen/drag_window_from_shelf_controller_unittest.cc",
-    "home_screen/home_launcher_gesture_handler_unittest.cc",
     "home_screen/home_screen_controller_unittest.cc",
     "home_screen/swipe_home_to_overview_controller_unittest.cc",
     "host/ash_window_tree_host_platform_unittest.cc",
@@ -2079,8 +2132,6 @@ test("ash_unittests") {
     "shelf/shelf_window_watcher_unittest.cc",
     "shelf/test/hotseat_state_watcher.cc",
     "shelf/test/hotseat_state_watcher.h",
-    "shelf/test/overview_animation_waiter.cc",
-    "shelf/test/overview_animation_waiter.h",
     "shelf/test/shelf_layout_manager_test_base.cc",
     "shelf/test/shelf_layout_manager_test_base.h",
     "shelf/test/widget_animation_smoothness_inspector.cc",
@@ -2092,6 +2143,7 @@ test("ash_unittests") {
     "system/accessibility/autoclick_menu_bubble_controller_unittest.cc",
     "system/accessibility/dictation_button_tray_unittest.cc",
     "system/accessibility/floating_accessibility_controller_unittest.cc",
+    "system/accessibility/select_to_speak_menu_bubble_controller_unittest.cc",
     "system/accessibility/select_to_speak_tray_unittest.cc",
     "system/accessibility/switch_access_back_button_bubble_controller_unittest.cc",
     "system/accessibility/switch_access_menu_bubble_controller_unittest.cc",
@@ -2101,13 +2153,16 @@ test("ash_unittests") {
     "system/bluetooth/bluetooth_notification_controller_unittest.cc",
     "system/bluetooth/bluetooth_power_controller_unittest.cc",
     "system/bluetooth/tray_bluetooth_helper_legacy_unittest.cc",
+    "system/bluetooth/unified_bluetooth_detailed_view_controller_unittest.cc",
     "system/caps_lock_notification_controller_unittest.cc",
     "system/gesture_education/gesture_education_notification_controller_unittest.cc",
+    "system/holding_space/holding_space_tray_unittest.cc",
     "system/ime/ime_feature_pod_controller_unittest.cc",
     "system/ime_menu/ime_menu_tray_unittest.cc",
     "system/locale/locale_feature_pod_controller_unittest.cc",
     "system/machine_learning/user_settings_event_logger_unittest.cc",
     "system/media/media_tray_unittest.cc",
+    "system/media/unified_media_controls_container_unittest.cc",
     "system/media/unified_media_controls_controller_unittest.cc",
     "system/media/unified_media_controls_detailed_view_controller_unittest.cc",
     "system/message_center/ash_message_popup_collection_unittest.cc",
@@ -2142,6 +2197,7 @@ test("ash_unittests") {
     "system/phonehub/phone_hub_ui_controller_unittest.cc",
     "system/phonehub/phone_status_view_unittest.cc",
     "system/phonehub/quick_actions_view_unittest.cc",
+    "system/phonehub/silence_phone_quick_action_controller_unittest.cc",
     "system/phonehub/task_continuation_view_unittest.cc",
     "system/power/backlights_forced_off_setter_unittest.cc",
     "system/power/peripheral_battery_notifier_unittest.cc",
@@ -2166,8 +2222,8 @@ test("ash_unittests") {
     "system/tray/size_range_layout_unittest.cc",
     "system/tray/status_area_overflow_button_tray_unittest.cc",
     "system/tray/tray_event_filter_unittest.cc",
-    "system/tray/tray_info_label_unittest.cc",
     "system/tray/tri_view_unittest.cc",
+    "system/unified/camera_mic_tray_item_view_unittest.cc",
     "system/unified/feature_pods_container_view_unittest.cc",
     "system/unified/notification_counter_view_unittest.cc",
     "system/unified/page_indicator_view_unittest.cc",
@@ -2201,6 +2257,7 @@ test("ash_unittests") {
     "wm/container_finder_unittest.cc",
     "wm/default_window_resizer_unittest.cc",
     "wm/desks/autotest_desks_api_unittests.cc",
+    "wm/desks/desk_animation_impl_unittest.cc",
     "wm/desks/desks_unittests.cc",
     "wm/desks/root_window_desk_switch_animator_unittest.cc",
     "wm/drag_window_resizer_unittest.cc",
@@ -2305,7 +2362,8 @@ test("ash_unittests") {
     "//build:branding_buildflags",
     "//chromeos:test_support",
     "//chromeos/strings:strings_grit",
-    "//chromeos/ui",
+    "//chromeos/ui/base",
+    "//chromeos/ui/frame",
     "//chromeos/ui/vector_icons",
 
     # TODO(https://crbug.com/644336): Make CrasAudioHandler Chrome or Ash only.
@@ -2330,6 +2388,7 @@ test("ash_unittests") {
     "//chromeos/services/multidevice_setup/public/mojom",
     "//chromeos/services/network_config/public/mojom",
     "//chromeos/system",
+    "//chromeos/ui/frame:test_support",
     "//components/account_id",
     "//components/arc:notification_test_support",
     "//components/media_message_center",
@@ -2461,6 +2520,10 @@ static_library("test_support") {
     "accessibility/test_accessibility_controller_client.h",
     "ambient/test/ambient_ash_test_base.cc",
     "ambient/test/ambient_ash_test_base.h",
+    "ambient/test/ambient_ash_test_helper.cc",
+    "ambient/test/ambient_ash_test_helper.h",
+    "ambient/test/test_ambient_client.cc",
+    "ambient/test/test_ambient_client.h",
     "app_list/app_list_test_api.cc",
     "app_list/test/app_list_test_helper.cc",
     "app_list/test/app_list_test_helper.h",
@@ -2618,11 +2681,13 @@ static_library("test_support") {
     "//ash/assistant/ui:ui",
     "//ash/public/cpp",
     "//ash/public/cpp:test_support",
+    "//ash/services/recording/public/mojom",
     "//base",
     "//base:i18n",
     "//base/test:test_support",
     "//cc:test_support",
     "//chromeos/services/assistant/public/cpp",
+    "//chromeos/ui/frame",
     "//ui/accessibility/mojom",
     "//ui/platform_window/common",
 
diff --git a/chromium/ash/app_list/BUILD.gn b/chromium/ash/app_list/BUILD.gn
index 612b782c33a..a0ab4bc1921 100644
--- a/chromium/ash/app_list/BUILD.gn
+++ b/chromium/ash/app_list/BUILD.gn
@@ -76,8 +76,6 @@ component("app_list") {
     "views/search_result_actions_view.cc",
     "views/search_result_actions_view.h",
     "views/search_result_actions_view_delegate.h",
-    "views/search_result_answer_card_view.cc",
-    "views/search_result_answer_card_view.h",
     "views/search_result_base_view.cc",
     "views/search_result_base_view.h",
     "views/search_result_container_view.cc",
@@ -128,7 +126,6 @@ component("app_list") {
     "//components/keyed_service/core",
     "//components/sync",
     "//mojo/public/cpp/bindings",
-    "//services/content/public/cpp",
     "//skia",
     "//third_party/icu",
     "//ui/accessibility",
@@ -156,7 +153,6 @@ component("app_list") {
     "//ash/public/cpp",
     "//base",
     "//mojo/public/cpp/bindings",
-    "//services/content/public/mojom",
     "//ui/aura",
     "//ui/compositor",
     "//ui/gfx/geometry",
@@ -185,7 +181,6 @@ static_library("test_support") {
   deps = [
     ":app_list",
     "//base",
-    "//services/content/public/cpp/test:test_support",
     "//ui/base:base",
     "//ui/events",
     "//ui/gfx",
@@ -232,7 +227,6 @@ test("app_list_unittests") {
     "views/privacy_container_view_unittest.cc",
     "views/result_selection_controller_unittest.cc",
     "views/search_box_view_unittest.cc",
-    "views/search_result_answer_card_view_unittest.cc",
     "views/search_result_list_view_unittest.cc",
     "views/search_result_page_view_unittest.cc",
     "views/search_result_tile_item_list_view_unittest.cc",
@@ -253,9 +247,6 @@ test("app_list_unittests") {
     "//chromeos/services/assistant/public/cpp",
     "//mojo/core/embedder",
     "//mojo/public/cpp/bindings",
-    "//services/content/public/cpp",
-    "//services/content/public/cpp/test:test_support",
-    "//services/content/public/mojom",
     "//skia",
     "//testing/gtest",
     "//ui/accessibility",
diff --git a/chromium/ash/assistant/model/BUILD.gn b/chromium/ash/assistant/model/BUILD.gn
index d4a63639601..7bbb28d52e3 100644
--- a/chromium/ash/assistant/model/BUILD.gn
+++ b/chromium/ash/assistant/model/BUILD.gn
@@ -50,7 +50,6 @@ component("model") {
     "//ash/public/cpp",
     "//chromeos/services/assistant/public/cpp",
     "//chromeos/services/assistant/public/mojom",
-    "//services/content/public/cpp",
     "//ui/accessibility/mojom",
     "//ui/gfx/geometry",
   ]
diff --git a/chromium/ash/assistant/ui/BUILD.gn b/chromium/ash/assistant/ui/BUILD.gn
index c0e7a6c5931..6ffee877b37 100644
--- a/chromium/ash/assistant/ui/BUILD.gn
+++ b/chromium/ash/assistant/ui/BUILD.gn
@@ -99,7 +99,6 @@ component("ui") {
     "//chromeos/services/assistant/public/cpp",
     "//chromeos/services/assistant/public/mojom",
     "//chromeos/ui/vector_icons",
-    "//services/content/public/cpp",
     "//ui/aura",
     "//ui/compositor",
     "//ui/gfx",
diff --git a/chromium/ash/public/cpp/BUILD.gn b/chromium/ash/public/cpp/BUILD.gn
index 4c4f6071a79..5f5392abd8e 100644
--- a/chromium/ash/public/cpp/BUILD.gn
+++ b/chromium/ash/public/cpp/BUILD.gn
@@ -104,16 +104,6 @@ component("cpp") {
     "assistant/conversation_starters_client.h",
     "back_gesture_contextual_nudge_controller.h",
     "back_gesture_contextual_nudge_delegate.h",
-    "caption_buttons/caption_button_model.h",
-    "caption_buttons/frame_back_button.cc",
-    "caption_buttons/frame_back_button.h",
-    "caption_buttons/frame_caption_button_container_view.cc",
-    "caption_buttons/frame_caption_button_container_view.h",
-    "caption_buttons/frame_size_button.cc",
-    "caption_buttons/frame_size_button.h",
-    "caption_buttons/frame_size_button_delegate.h",
-    "caption_buttons/snap_controller.cc",
-    "caption_buttons/snap_controller.h",
     "cast_config_controller.cc",
     "cast_config_controller.h",
     "child_accounts/parent_access_controller.cc",
@@ -122,8 +112,6 @@ component("cpp") {
     "clipboard_history_controller.h",
     "clipboard_image_model_factory.cc",
     "clipboard_image_model_factory.h",
-    "default_frame_header.cc",
-    "default_frame_header.h",
     "default_scale_factor_retriever.cc",
     "default_scale_factor_retriever.h",
     "desks_helper.cc",
@@ -134,12 +122,10 @@ component("cpp") {
     "file_icon_util.h",
     "fps_counter.cc",
     "fps_counter.h",
-    "frame_header.cc",
-    "frame_header.h",
-    "frame_utils.cc",
-    "frame_utils.h",
     "gesture_action_type.h",
     "holding_space/holding_space_client.h",
+    "holding_space/holding_space_color_provider.cc",
+    "holding_space/holding_space_color_provider.h",
     "holding_space/holding_space_constants.h",
     "holding_space/holding_space_controller.cc",
     "holding_space/holding_space_controller.h",
@@ -162,15 +148,6 @@ component("cpp") {
     "ime_controller_client.h",
     "ime_info.cc",
     "ime_info.h",
-    "immersive/immersive_context.cc",
-    "immersive/immersive_context.h",
-    "immersive/immersive_focus_watcher.cc",
-    "immersive/immersive_focus_watcher.h",
-    "immersive/immersive_fullscreen_controller.cc",
-    "immersive/immersive_fullscreen_controller.h",
-    "immersive/immersive_fullscreen_controller_delegate.h",
-    "immersive/immersive_revealed_lock.cc",
-    "immersive/immersive_revealed_lock.h",
     "in_session_auth_dialog_client.h",
     "in_session_auth_dialog_controller.cc",
     "in_session_auth_dialog_controller.h",
@@ -255,6 +232,7 @@ component("cpp") {
     "rounded_image_view.h",
     "scale_utility.cc",
     "scale_utility.h",
+    "scoped_clipboard_history_pause.h",
     "scoped_guest_button_blocker.h",
     "scoped_singleton_resetter_for_test.h",
     "screen_backlight.cc",
@@ -305,6 +283,8 @@ component("cpp") {
     "update_types.h",
     "view_shadow.cc",
     "view_shadow.h",
+    "vm_camera_mic_constants.cc",
+    "vm_camera_mic_constants.h",
     "wallpaper_controller.cc",
     "wallpaper_controller.h",
     "wallpaper_controller_client.h",
@@ -312,15 +292,13 @@ component("cpp") {
     "wallpaper_controller_observer.h",
     "wallpaper_info.h",
     "wallpaper_types.h",
+    "webauthn_request_registrar.cc",
+    "webauthn_request_registrar.h",
     "window_animation_types.h",
     "window_backdrop.cc",
     "window_backdrop.h",
-    "window_pin_type.cc",
-    "window_pin_type.h",
     "window_properties.cc",
     "window_properties.h",
-    "window_state_type.cc",
-    "window_state_type.h",
   ]
 
   defines = [ "ASH_PUBLIC_IMPLEMENTATION" ]
@@ -338,7 +316,8 @@ component("cpp") {
     "//chromeos/services/assistant/public/cpp",
     "//chromeos/services/cellular_setup:in_process_esim_manager",
     "//chromeos/services/network_config:in_process_instance",
-    "//chromeos/ui",
+    "//chromeos/ui/base",
+    "//chromeos/ui/frame",
     "//chromeos/ui/vector_icons",
     "//components/pref_registry",
     "//components/prefs",
@@ -354,7 +333,6 @@ component("cpp") {
     "//ui/events/devices",
     "//ui/message_center/public/cpp",
     "//ui/views",
-    "//ui/views/window/vector_icons",
     "//ui/wm",
     "//ui/wm/public",
   ]
@@ -410,10 +388,6 @@ source_set("unit_tests") {
 source_set("test_support") {
   testonly = true
   sources = [
-    "immersive/immersive_fullscreen_controller_test_api.cc",
-    "immersive/immersive_fullscreen_controller_test_api.h",
-    "test/test_ambient_client.cc",
-    "test/test_ambient_client.h",
     "test/test_image_downloader.cc",
     "test/test_image_downloader.h",
     "test/test_keyboard_controller_observer.cc",
@@ -424,8 +398,6 @@ source_set("test_support") {
     "test/test_new_window_delegate.h",
     "test/test_system_tray_client.cc",
     "test/test_system_tray_client.h",
-    "test/test_tablet_mode.cc",
-    "test/test_tablet_mode.h",
   ]
 
   deps = [
diff --git a/chromium/ash/public/cpp/app_list/vector_icons/BUILD.gn b/chromium/ash/public/cpp/app_list/vector_icons/BUILD.gn
index c154c9b5e5e..c29fb5aca2f 100644
--- a/chromium/ash/public/cpp/app_list/vector_icons/BUILD.gn
+++ b/chromium/ash/public/cpp/app_list/vector_icons/BUILD.gn
@@ -4,7 +4,7 @@
 
 import("//components/vector_icons/vector_icons.gni")
 
-aggregate_vector_icons2("app_list_vector_icons") {
+aggregate_vector_icons("app_list_vector_icons") {
   icon_directory = "."
 
   sources = [
diff --git a/chromium/ash/public/cpp/external_arc/BUILD.gn b/chromium/ash/public/cpp/external_arc/BUILD.gn
index 7ab7bf85eaf..8f83d7faa86 100644
--- a/chromium/ash/public/cpp/external_arc/BUILD.gn
+++ b/chromium/ash/public/cpp/external_arc/BUILD.gn
@@ -24,6 +24,16 @@ static_library("external_arc") {
     "message_center/arc_notification_surface_manager_impl.h",
     "message_center/arc_notification_view.cc",
     "message_center/arc_notification_view.h",
+    "overlay/arc_overlay_controller.cc",
+    "overlay/arc_overlay_controller.h",
+    "overlay/arc_overlay_controller_impl.cc",
+    "overlay/arc_overlay_controller_impl.h",
+    "overlay/arc_overlay_manager.cc",
+    "overlay/arc_overlay_manager.h",
+    "overlay/test/fake_arc_overlay_controller_impl.cc",
+    "overlay/test/fake_arc_overlay_controller_impl.h",
+    "overlay/test/test_arc_overlay_manager.cc",
+    "overlay/test/test_arc_overlay_manager.h",
     "toast/arc_toast_surface_manager.cc",
     "toast/arc_toast_surface_manager.h",
   ]
@@ -38,6 +48,9 @@ static_library("external_arc") {
     "//components/arc/mojom:notifications",
     "//components/exo",
     "//mojo/public/cpp/system",
+    "//ui/accessibility:accessibility",
+    "//ui/accessibility:ax_base",
+    "//ui/aura",
     "//ui/message_center",
     "//ui/views",
     "//ui/wm",
diff --git a/chromium/ash/public/mojom/BUILD.gn b/chromium/ash/public/mojom/BUILD.gn
index 1aa80861294..a069d914e8b 100644
--- a/chromium/ash/public/mojom/BUILD.gn
+++ b/chromium/ash/public/mojom/BUILD.gn
@@ -19,7 +19,6 @@ mojom("mojom") {
     "//components/account_id/mojom",
     "//components/sync/mojom",
     "//mojo/public/mojom/base",
-    "//services/content/public/mojom",
     "//services/preferences/public/mojom",
     "//skia/public/mojom",
     "//ui/display/mojom:mojom",
diff --git a/chromium/ash/resources/BUILD.gn b/chromium/ash/resources/BUILD.gn
index 4679d526135..4c22393672d 100644
--- a/chromium/ash/resources/BUILD.gn
+++ b/chromium/ash/resources/BUILD.gn
@@ -29,6 +29,7 @@ template("ash_test_resources") {
     if (percent == "100") {
       sources += [
         "$root_gen_dir/mojo/public/js/mojo_bindings_resources.pak",
+        "$root_gen_dir/ui/resources/webui_generated_resources.pak",
         "$root_gen_dir/ui/resources/webui_resources.pak",
       ]
     }
diff --git a/chromium/ash/resources/vector_icons/BUILD.gn b/chromium/ash/resources/vector_icons/BUILD.gn
index 86ee3f5ef7a..4b122a0a17d 100644
--- a/chromium/ash/resources/vector_icons/BUILD.gn
+++ b/chromium/ash/resources/vector_icons/BUILD.gn
@@ -5,7 +5,7 @@
 import("//build/config/chrome_build.gni")
 import("//components/vector_icons/vector_icons.gni")
 
-aggregate_vector_icons2("ash_vector_icons") {
+aggregate_vector_icons("ash_vector_icons") {
   icon_directory = "."
 
   sources = [
@@ -28,9 +28,9 @@ aggregate_vector_icons2("ash_vector_icons") {
     "autoclick_scroll_right.icon",
     "autoclick_scroll_up.icon",
     "battery.icon",
-    "captive_portal.icon",
     "capture_mode.icon",
     "capture_mode_circle_stop.icon",
+    "capture_mode_feedback.icon",
     "capture_mode_fullscreen.icon",
     "capture_mode_image.icon",
     "capture_mode_region.icon",
@@ -79,11 +79,10 @@ aggregate_vector_icons2("ash_vector_icons") {
     "lock_screen_time_limit_moon.icon",
     "lock_screen_time_limit_timer.icon",
     "login_screen_button_dropdown.icon",
-    "login_screen_enterprise.icon",
     "login_screen_menu_dropdown.icon",
     "mic.icon",
+    "music_note.icon",
     "muted_microphone.icon",
-    "network_badge_captive_portal.icon",
     "network_badge_off.icon",
     "network_badge_roaming.icon",
     "network_badge_secure.icon",
@@ -111,7 +110,6 @@ aggregate_vector_icons2("ash_vector_icons") {
     "notification_capslock.icon",
     "notification_center_all_done.icon",
     "notification_center_clear_all.icon",
-    "notification_center_collapse.icon",
     "notification_center_do_not_disturb_off.icon",
     "notification_center_do_not_disturb_on.icon",
     "notification_center_empty.icon",
@@ -143,11 +141,28 @@ aggregate_vector_icons2("ash_vector_icons") {
     "palette_tray_icon_laser_pointer.icon",
     "palette_tray_icon_magnify.icon",
     "palette_tray_icon_metalayer.icon",
+    "phone_hub_battery_saver.icon",
+    "phone_hub_battery_saver_outline.icon",
+    "phone_hub_default_favicon.icon",
+    "phone_hub_enable_hotspot_off.icon",
+    "phone_hub_enable_hotspot_on.icon",
+    "phone_hub_locate_phone_off.icon",
+    "phone_hub_locate_phone_on.icon",
     "phone_hub_mobile_no_connection.icon",
     "phone_hub_mobile_no_sim.icon",
+    "phone_hub_phone.icon",
+    "phone_hub_silence_phone_off.icon",
+    "phone_hub_silence_phone_on.icon",
     "pin_request_lock.icon",
     "pinned.icon",
     "privacy_screen.icon",
+    "select_to_speak_next_paragraph.icon",
+    "select_to_speak_next_sentence.icon",
+    "select_to_speak_pause.icon",
+    "select_to_speak_play.icon",
+    "select_to_speak_prev_paragraph.icon",
+    "select_to_speak_prev_sentence.icon",
+    "select_to_speak_stop.icon",
     "send.icon",
     "settings.icon",
     "shelf_add_person_button.icon",
@@ -186,6 +201,7 @@ aggregate_vector_icons2("ash_vector_icons") {
     "switch_access_move_forward_one_word_of_text.icon",
     "switch_access_move_up_one_line_of_text.icon",
     "switch_access_paste.icon",
+    "switch_access_point_scan.icon",
     "switch_access_scroll_down.icon",
     "switch_access_scroll_left.icon",
     "switch_access_scroll_right.icon",
@@ -320,6 +336,8 @@ aggregate_vector_icons2("ash_vector_icons") {
     "unified_network_badge_vpn.icon",
     "unpinned.icon",
     "unrendered_html_placeholder.icon",
+    "visibility.icon",
+    "visibility_off.icon",
     "wallpaper.icon",
   ]
 
diff --git a/chromium/ash/search_box/BUILD.gn b/chromium/ash/search_box/BUILD.gn
index b3b88141291..0fc821a3287 100644
--- a/chromium/ash/search_box/BUILD.gn
+++ b/chromium/ash/search_box/BUILD.gn
@@ -11,6 +11,7 @@ source_set("search_box") {
   ]
 
   deps = [
+    "//ash/public/cpp",
     "//base",
     "//skia",
     "//ui/base",
diff --git a/chromium/ash/services/recording/BUILD.gn b/chromium/ash/services/recording/BUILD.gn
new file mode 100644
index 00000000000..a38155bed34
--- /dev/null
+++ b/chromium/ash/services/recording/BUILD.gn
@@ -0,0 +1,22 @@
+# Copyright 2020 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.
+
+source_set("recording") {
+  sources = [
+    "recording_encoder_muxer.cc",
+    "recording_encoder_muxer.h",
+    "recording_service.cc",
+    "recording_service.h",
+    "recording_service_constants.h",
+    "video_capture_params.cc",
+    "video_capture_params.h",
+  ]
+
+  deps = [
+    "//ash/services/recording/public/mojom",
+    "//base",
+    "//media",
+    "//services/audio/public/cpp",
+  ]
+}
diff --git a/chromium/ash/services/recording/public/mojom/BUILD.gn b/chromium/ash/services/recording/public/mojom/BUILD.gn
new file mode 100644
index 00000000000..a9eadd3673d
--- /dev/null
+++ b/chromium/ash/services/recording/public/mojom/BUILD.gn
@@ -0,0 +1,15 @@
+# Copyright 2020 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("//mojo/public/tools/bindings/mojom.gni")
+
+mojom("mojom") {
+  sources = [ "recording_service.mojom" ]
+
+  deps = [
+    "//media/mojo/mojom",
+    "//services/audio/public/mojom",
+    "//services/viz/privileged/mojom/compositing",
+  ]
+}
diff --git a/chromium/ash/services/recording/public/mojom/recording_service.mojom b/chromium/ash/services/recording/public/mojom/recording_service.mojom
new file mode 100644
index 00000000000..f53cbeab336
--- /dev/null
+++ b/chromium/ash/services/recording/public/mojom/recording_service.mojom
@@ -0,0 +1,90 @@
+// Copyright 2020 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.
+
+module recording.mojom;
+
+import "mojo/public/mojom/base/big_string.mojom";
+import "services/audio/public/mojom/stream_factory.mojom";
+import "services/viz/privileged/mojom/compositing/frame_sink_video_capture.mojom";
+import "services/viz/public/mojom/compositing/frame_sink_id.mojom";
+import "ui/gfx/geometry/mojom/geometry.mojom";
+
+// Defines the interface for the recording service client (e.g. ash), which
+// lives in a remote process other than that of the recording service itself.
+// The recording services consumes this interface to communicate with the client
+// during video recording and to send over the video chunks.
+interface RecordingServiceClient {
+  // Called repeatedly by the service while video recording is in progress,
+  // to provide the client with final encoded and webm-muxed video and audio
+  // frames. Frames will continue to be provided until OnRecordingEnded() is
+  // called.
+  OnMuxerOutput(mojo_base.mojom.BigString chunk);
+
+  // Called by the service to inform the client that an in-progress video
+  // recording ended, and no further frames will be provided. If |success| is
+  // false, then recording is being terminated by the service itself due to an
+  // internal failure.
+  OnRecordingEnded(bool success);
+};
+
+// Defines the interface of the recording service which is implemented by
+// |recording::RecordingService| and runs in its own utility process. It is
+// launched by the process on which the |RecordingServiceClient| resides, and is
+// used to perform audio/video recording of the whole screen, a partial region
+// of it, or an individual window. The service captures, encodes, and muxes the
+// audio and video frames, and sends the WebM muxed video chunks to the client.
+// Note that a maximum of one screen recording can be done at any time.
+interface RecordingService {
+  // All the below Record*() interfaces, take a pending remote to a client (e.g.
+  // Ash) to which it will send the muxed video chunks, a pending remote bound
+  // to the video capturer on Viz on the GPU process, and another *optional*
+  // pending remote to the audio stream factory on the Audio Service, which if
+  // not provided, the service will not record audio.
+
+  // Starts a fullscreen recording of a root window which has the given
+  // |frame_sink_id|. The resulting video will have a resolution equal to the
+  // given |video_size| in DIPs. Note that if the aspect ratio of |video_size|
+  // is different than that of the captured source, the content will letterbox
+  // or pillarbox as needed.
+  // |frame_sink_id| must be valid.
+  RecordFullscreen(
+      pending_remote<RecordingServiceClient> client,
+      pending_remote<viz.mojom.FrameSinkVideoCapturer> video_capturer,
+      pending_remote<audio.mojom.StreamFactory>? audio_stream_factory,
+      viz.mojom.FrameSinkId frame_sink_id,
+      gfx.mojom.Size video_size);
+
+  // Starts a recording of a window which has the given |frame_sink_id|.
+  // |initial_video_size| and |max_video_size| specify a range of acceptable
+  // capture resolutions in DIPs. The resolution of the output will adapt
+  // dynamically as the window being recorded gets resized by the end user (e.g.
+  // resized, maximized, fullscreened, ... etc.).
+  // Note that if the aspect ratio of |max_video_size| is different than that of
+  // the captured source, the content will letterbox  or pillarbox as needed.
+  // |frame_sink_id| must be valid.
+  RecordWindow(
+      pending_remote<RecordingServiceClient> client,
+      pending_remote<viz.mojom.FrameSinkVideoCapturer> video_capturer,
+      pending_remote<audio.mojom.StreamFactory>? audio_stream_factory,
+      viz.mojom.FrameSinkId frame_sink_id,
+      gfx.mojom.Size initial_video_size,
+      gfx.mojom.Size max_video_size);
+
+  // Starts a recording of a partial region of a root window which has the given
+  // |frame_sink_id|. The video will be captured at a resolution equal to the
+  // given |full_capture_size| in DIPs, but the resulting video frames will be
+  // cropped to the given |crop_region| in DIPs.
+  // |frame_sink_id| must be valid.
+  RecordRegion(
+      pending_remote<RecordingServiceClient> client,
+      pending_remote<viz.mojom.FrameSinkVideoCapturer> video_capturer,
+      pending_remote<audio.mojom.StreamFactory>? audio_stream_factory,
+      viz.mojom.FrameSinkId frame_sink_id,
+      gfx.mojom.Size full_capture_size,
+      gfx.mojom.Rect crop_region);
+
+  // Stops an on-going video recording. The remaining frames will continue being
+  // provided to the client until OnRecordingEnded() is called.
+  StopRecording();
+};
diff --git a/chromium/ash/shortcut_viewer/BUILD.gn b/chromium/ash/shortcut_viewer/BUILD.gn
index d9b54855bdb..25df657cf8d 100644
--- a/chromium/ash/shortcut_viewer/BUILD.gn
+++ b/chromium/ash/shortcut_viewer/BUILD.gn
@@ -32,6 +32,7 @@ source_set("shortcut_viewer") {
     "//ash/shortcut_viewer/strings",
     "//ash/shortcut_viewer/vector_icons",
     "//cc/paint",
+    "//chromeos/ui/base",
     "//ui/accessibility",
     "//ui/aura",
     "//ui/chromeos/events",
@@ -54,5 +55,6 @@ source_set("unit_tests") {
     "//ui/events:test_support",
     "//ui/events/devices:test_support",
     "//ui/views",
+    "//ui/views:test_support",
   ]
 }
diff --git a/chromium/ash/shortcut_viewer/vector_icons/BUILD.gn b/chromium/ash/shortcut_viewer/vector_icons/BUILD.gn
index a1edd835c7c..626286bb853 100644
--- a/chromium/ash/shortcut_viewer/vector_icons/BUILD.gn
+++ b/chromium/ash/shortcut_viewer/vector_icons/BUILD.gn
@@ -4,7 +4,7 @@
 
 import("//components/vector_icons/vector_icons.gni")
 
-aggregate_vector_icons2("ksv_vector_icons") {
+aggregate_vector_icons("ksv_vector_icons") {
   icon_directory = "."
 
   sources = [