BASELINE: Update Chromium to 85.0.4183.14085-based

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

1 files changed, 53 insertions, 43 deletions

diff --git a/chromium/ash/BUILD.gn b/chromium/ash/BUILD.gn
index 68e4247db26..4f9478cf3c5 100644
--- a/chromium/ash/BUILD.gn
+++ b/chromium/ash/BUILD.gn
@@ -21,7 +21,11 @@ assert(use_ozone)
 
 component("ash") {
   # All targets in this file are allowed to access any the headers in ash.
-  friend = [ ":*" ]
+  friend = [
+    ":*",
+    "//components/exo:*",
+    "//components/exo/wayland:*",
+  ]
 
   public = [
     "public/ash_interfaces.h",
@@ -41,9 +45,8 @@ component("ash") {
     # TODO: move MultiUserWindowManager (and delegate) to sources:
     # https://crbug.com/756085
     "multi_user/multi_user_window_manager_impl.h",
-    "public/cpp/arc_custom_tab.h",
     "public/cpp/ash_prefs.h",
-    "public/cpp/assistant/assistant_settings.h",
+    "public/cpp/autotest_ambient_api.h",
     "public/cpp/autotest_desks_api.h",
     "public/cpp/autotest_private_api_utils.h",
     "public/cpp/debug_utils.h",
@@ -173,6 +176,7 @@ component("ash") {
     "ambient/ambient_photo_controller.h",
     "ambient/ambient_view_delegate_impl.cc",
     "ambient/ambient_view_delegate_impl.h",
+    "ambient/autotest_ambient_api.cc",
     "ambient/fake_ambient_backend_controller_impl.cc",
     "ambient/fake_ambient_backend_controller_impl.h",
     "ambient/model/ambient_backend_model.cc",
@@ -187,6 +191,8 @@ component("ash") {
     "ambient/ui/ambient_view_delegate.h",
     "ambient/ui/assistant_response_container_view.cc",
     "ambient/ui/assistant_response_container_view.h",
+    "ambient/ui/glanceable_info_view.cc",
+    "ambient/ui/glanceable_info_view.h",
     "ambient/ui/photo_view.cc",
     "ambient/ui/photo_view.h",
     "ambient/util/ambient_util.cc",
@@ -199,8 +205,8 @@ component("ash") {
     "ash_export.h",
     "ash_interfaces.cc",
     "ash_prefs.cc",
-    "assistant/assistant_alarm_timer_controller.cc",
-    "assistant/assistant_alarm_timer_controller.h",
+    "assistant/assistant_alarm_timer_controller_impl.cc",
+    "assistant/assistant_alarm_timer_controller_impl.h",
     "assistant/assistant_controller_impl.cc",
     "assistant/assistant_controller_impl.h",
     "assistant/assistant_interaction_controller_impl.cc",
@@ -209,11 +215,8 @@ component("ash") {
     "assistant/assistant_notification_controller.h",
     "assistant/assistant_notification_expiry_monitor.cc",
     "assistant/assistant_notification_expiry_monitor.h",
-    "assistant/assistant_proactive_suggestions_controller.cc",
-    "assistant/assistant_proactive_suggestions_controller.h",
-    "assistant/assistant_screen_context_controller.cc",
-    "assistant/assistant_screen_context_controller.h",
-    "assistant/assistant_settings.cc",
+    "assistant/assistant_screen_context_controller_impl.cc",
+    "assistant/assistant_screen_context_controller_impl.h",
     "assistant/assistant_setup_controller.cc",
     "assistant/assistant_setup_controller.h",
     "assistant/assistant_state_controller.cc",
@@ -241,8 +244,6 @@ component("ash") {
     "bluetooth_devices_observer.h",
     "cancel_mode.cc",
     "cancel_mode.h",
-    "custom_tab/arc_custom_tab_view.cc",
-    "custom_tab/arc_custom_tab_view.h",
     "dbus/ash_dbus_services.cc",
     "dbus/ash_dbus_services.h",
     "dbus/display_service_provider.cc",
@@ -261,12 +262,12 @@ component("ash") {
     "detachable_base/detachable_base_notification_controller.h",
     "detachable_base/detachable_base_observer.h",
     "detachable_base/detachable_base_pairing_status.h",
-    "disconnected_app_handler.cc",
-    "disconnected_app_handler.h",
     "display/cros_display_config.cc",
     "display/cros_display_config.h",
     "display/cursor_window_controller.cc",
     "display/cursor_window_controller.h",
+    "display/display_alignment_controller.cc",
+    "display/display_alignment_controller.h",
     "display/display_alignment_indicator.cc",
     "display/display_alignment_indicator.h",
     "display/display_animator.cc",
@@ -421,8 +422,15 @@ component("ash") {
     "hud_display/data_source.h",
     "hud_display/graph.cc",
     "hud_display/graph.h",
+    "hud_display/graphs_container_view.cc",
+    "hud_display/graphs_container_view.h",
+    "hud_display/hud_constants.h",
     "hud_display/hud_display.cc",
     "hud_display/hud_display.h",
+    "hud_display/hud_properties.cc",
+    "hud_display/hud_properties.h",
+    "hud_display/hud_settings_view.cc",
+    "hud_display/hud_settings_view.h",
     "hud_display/memory_status.cc",
     "hud_display/memory_status.h",
     "ime/ime_controller_impl.cc",
@@ -432,6 +440,8 @@ component("ash") {
     "ime/ime_switch_type.h",
     "ime/mode_indicator_observer.cc",
     "ime/mode_indicator_observer.h",
+    "keyboard/arc/arc_virtual_keyboard_container_layout_manager.cc",
+    "keyboard/arc/arc_virtual_keyboard_container_layout_manager.h",
     "keyboard/keyboard_controller_impl.cc",
     "keyboard/keyboard_controller_impl.h",
     "keyboard/keyboard_util.cc",
@@ -604,6 +614,8 @@ component("ash") {
     "quick_answers/quick_answers_controller_impl.h",
     "quick_answers/quick_answers_ui_controller.cc",
     "quick_answers/quick_answers_ui_controller.h",
+    "quick_answers/ui/quick_answers_focus_search.cc",
+    "quick_answers/ui/quick_answers_focus_search.h",
     "quick_answers/ui/quick_answers_pre_target_handler.cc",
     "quick_answers/ui/quick_answers_pre_target_handler.h",
     "quick_answers/ui/quick_answers_view.cc",
@@ -622,8 +634,6 @@ component("ash") {
     "rotator/window_rotation.h",
     "scoped_animation_disabler.cc",
     "scoped_animation_disabler.h",
-    "scoped_root_window_for_new_windows.cc",
-    "scoped_root_window_for_new_windows.h",
     "screen_util.cc",
     "screen_util.h",
     "screenshot_delegate.h",
@@ -685,6 +695,7 @@ component("ash") {
     "shelf/shelf_bubble.h",
     "shelf/shelf_button.cc",
     "shelf/shelf_button.h",
+    "shelf/shelf_button_delegate.cc",
     "shelf/shelf_button_delegate.h",
     "shelf/shelf_button_pressed_metric_tracker.cc",
     "shelf/shelf_button_pressed_metric_tracker.h",
@@ -733,8 +744,6 @@ component("ash") {
     "shell.cc",
     "shell_delegate.cc",
     "shell_init_params.cc",
-    "shell_state.cc",
-    "shell_state.h",
     "shutdown_controller_impl.cc",
     "shutdown_controller_impl.h",
     "shutdown_reason.cc",
@@ -1457,8 +1466,6 @@ component("ash") {
     "wm/wm_highlight_item_border.h",
     "wm/wm_shadow_controller_delegate.cc",
     "wm/wm_shadow_controller_delegate.h",
-    "wm/wm_window_animations.cc",
-    "wm/wm_window_animations.h",
     "wm/work_area_insets.cc",
     "wm/work_area_insets.h",
     "wm/workspace/backdrop_controller.cc",
@@ -1487,7 +1494,6 @@ component("ash") {
     "//ash/public/cpp/vector_icons",
     "//ash/resources/vector_icons",
     "//ash/strings",
-    "//ash/wayland",
     "//chromeos/services/multidevice_setup/public/mojom",
     "//components/discardable_memory/public/mojom",
     "//mojo/public/cpp/bindings",
@@ -1500,7 +1506,7 @@ component("ash") {
     "//services/media_session/public/mojom",
     "//skia",
     "//ui/aura",
-    "//ui/base/cursor",
+    "//ui/base/cursor:cursor_base",
     "//ui/base/cursor/mojom:cursor_type",
     "//ui/events",
     "//ui/gfx",
@@ -1518,11 +1524,9 @@ component("ash") {
     "//ash/assistant/ui",
     "//ash/assistant/ui:constants",
     "//ash/assistant/util",
-    "//ash/keyboard/arc",
     "//ash/keyboard/ui",
     "//ash/login/resources:resources_grit",
     "//ash/system/machine_learning:user_settings_event_proto",
-    "//ash/system/message_center/arc",
     "//base",
     "//base:i18n",
     "//base/third_party/dynamic_annotations",
@@ -1533,6 +1537,7 @@ component("ash") {
     "//cc/paint:paint",
     "//chromeos/assistant:buildflags",
     "//chromeos/components/quick_answers",
+    "//services/viz/public/mojom",
 
     # TODO(https://crbug.com/644336): Make CrasAudioHandler Chrome or Ash only.
     "//chromeos/audio",
@@ -1566,8 +1571,6 @@ component("ash") {
     "//components/country_codes",
     "//components/device_event_log",
     "//components/discardable_memory/service",
-    "//components/exo",
-    "//components/exo/wayland",
     "//components/media_message_center",
     "//components/onc",
     "//components/password_manager/core/browser:hash_password_manager",
@@ -1600,8 +1603,10 @@ component("ash") {
     "//third_party/re2",
     "//ui/accessibility",
     "//ui/accessibility:ax_enums_mojo",
+    "//ui/accessibility/mojom",
     "//ui/base",
     "//ui/base:ui_data_pack",
+    "//ui/base/cursor",
     "//ui/base/ime/chromeos",
     "//ui/base/ime/init",
     "//ui/chromeos",
@@ -1651,11 +1656,7 @@ component("ash") {
     "//ui/base/idle",
   ]
 
-  allow_circular_includes_from = [
-    "//ash/assistant/ui",
-    "//components/exo",
-    "//components/exo/wayland",
-  ]
+  allow_circular_includes_from = [ "//ash/assistant/ui" ]
 
   if (enable_cros_ambient_mode_backend) {
     sources += [
@@ -1821,8 +1822,10 @@ test("ash_unittests") {
     "accessibility/touch_exploration_manager_unittest.cc",
     "ambient/ambient_controller_unittest.cc",
     "ambient/ambient_photo_controller_unittest.cc",
+    "ambient/autotest_ambient_api_unittest.cc",
     "ambient/model/ambient_backend_model_unittest.cc",
     "ambient/ui/ambient_container_view_unittest.cc",
+    "ambient/ui/photo_view_unittest.cc",
     "app_list/app_list_controller_impl_unittest.cc",
     "app_list/app_list_metrics_unittest.cc",
     "app_list/app_list_presenter_delegate_unittest.cc",
@@ -1835,13 +1838,16 @@ test("ash_unittests") {
     "app_menu/notification_menu_view_unittest.cc",
     "app_menu/notification_overflow_view_unittest.cc",
     "assistant/assistant_alarm_timer_controller_unittest.cc",
+    "assistant/assistant_controller_impl_unittest.cc",
     "assistant/assistant_interaction_controller_impl_unittest.cc",
     "assistant/assistant_notification_controller_unittest.cc",
-    "assistant/assistant_screen_context_controller_unittest.cc",
+    "assistant/assistant_screen_context_controller_impl_unittest.cc",
     "assistant/assistant_setup_controller_unittest.cc",
     "assistant/assistant_state_controller_unittest.cc",
+    "assistant/assistant_suggestions_controller_impl_unittest.cc",
     "assistant/model/assistant_query_history_unittest.cc",
     "assistant/ui/assistant_web_container_view_unittest.cc",
+    "assistant/ui/main_stage/assistant_onboarding_view_unittest.cc",
     "assistant/util/deep_link_util_unittest.cc",
     "autoclick/autoclick_drag_event_rewriter_unittest.cc",
     "autoclick/autoclick_unittest.cc",
@@ -1852,6 +1858,7 @@ test("ash_unittests") {
     "dip_unittest.cc",
     "display/cros_display_config_unittest.cc",
     "display/cursor_window_controller_unittest.cc",
+    "display/display_alignment_controller_unittest.cc",
     "display/display_alignment_indicator_unittest.cc",
     "display/display_color_manager_unittest.cc",
     "display/display_configuration_controller_unittest.cc",
@@ -1903,8 +1910,8 @@ test("ash_unittests") {
     "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",
     "ime/ime_controller_impl_unittest.cc",
-    "keyboard/arc/arc_input_method_surface_manager_unittest.cc",
     "keyboard/keyboard_controller_impl_unittest.cc",
     "keyboard/virtual_keyboard_controller_unittest.cc",
     "keyboard/virtual_keyboard_unittest.cc",
@@ -1965,6 +1972,7 @@ test("ash_unittests") {
     "power/hfp_battery_listener_unittest.cc",
     "power/hid_battery_listener_unittest.cc",
     "power/hid_battery_util_unittest.cc",
+    "quick_answers/ui/quick_answers_view_unittest.cc",
     "root_window_controller_unittest.cc",
     "rotator/screen_rotation_animation_unittest.cc",
     "rotator/screen_rotation_animator_unittest.cc",
@@ -2002,7 +2010,6 @@ test("ash_unittests") {
     "shelf/test/shelf_layout_manager_test_base.h",
     "shelf/test/widget_animation_smoothness_inspector.cc",
     "shelf/test/widget_animation_smoothness_inspector.h",
-    "shell_state_unittest.cc",
     "shell_unittest.cc",
     "sticky_keys/sticky_keys_overlay_unittest.cc",
     "sticky_keys/sticky_keys_unittest.cc",
@@ -2011,8 +2018,10 @@ test("ash_unittests") {
     "system/accessibility/dictation_button_tray_unittest.cc",
     "system/accessibility/floating_accessibility_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",
     "system/accessibility/tray_accessibility_unittest.cc",
+    "system/audio/unified_audio_detailed_view_controller_unittest.cc",
     "system/bluetooth/bluetooth_notification_controller_unittest.cc",
     "system/bluetooth/bluetooth_power_controller_unittest.cc",
     "system/bluetooth/tray_bluetooth_helper_legacy_unittest.cc",
@@ -2022,9 +2031,6 @@ test("ash_unittests") {
     "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/message_center/arc/arc_notification_content_view_unittest.cc",
-    "system/message_center/arc/arc_notification_manager_unittest.cc",
-    "system/message_center/arc/arc_notification_view_unittest.cc",
     "system/message_center/ash_message_popup_collection_unittest.cc",
     "system/message_center/inactive_user_notification_blocker_unittest.cc",
     "system/message_center/message_center_ui_controller_unittest.cc",
@@ -2190,20 +2196,20 @@ test("ash_unittests") {
     "//ash/assistant/model",
     "//ash/assistant/ui",
     "//ash/assistant/ui:constants",
+    "//ash/assistant/ui/test_support",
     "//ash/assistant/util",
-    "//ash/keyboard/arc",
     "//ash/keyboard/ui",
     "//ash/keyboard/ui:test_support",
     "//ash/public/cpp",
     "//ash/public/cpp:test_support",
     "//ash/public/cpp:unit_tests",
+    "//ash/public/cpp/external_arc:test_support",
+    "//ash/public/cpp/external_arc:unit_tests",
     "//ash/public/cpp/vector_icons",
     "//ash/resources/vector_icons",
     "//ash/shortcut_viewer:unit_tests",
     "//ash/strings",
     "//ash/system/machine_learning:user_settings_event_proto",
-    "//ash/system/message_center/arc",
-    "//ash/system/message_center/arc:test_support",
     "//base",
     "//base/test:test_support",
     "//base/util/values:values_util",
@@ -2215,6 +2221,7 @@ test("ash_unittests") {
     "//chromeos/audio",
     "//chromeos/constants",
     "//chromeos/dbus:test_support",
+    "//chromeos/dbus/audio",
     "//chromeos/dbus/hammerd",
     "//chromeos/dbus/power",
     "//chromeos/dbus/power:power_manager_proto",
@@ -2231,8 +2238,6 @@ test("ash_unittests") {
     "//chromeos/system",
     "//components/account_id",
     "//components/arc:notification_test_support",
-    "//components/exo",
-    "//components/exo:test_support",
     "//components/media_message_center",
     "//components/password_manager/core/browser:hash_password_manager",
     "//components/prefs:test_support",
@@ -2262,7 +2267,7 @@ test("ash_unittests") {
     "//ui/aura:test_support",
     "//ui/base",
     "//ui/base:test_support",
-    "//ui/base/cursor",
+    "//ui/base/cursor:cursor_base",
     "//ui/base/cursor/mojom:cursor_type",
     "//ui/base/ime",
     "//ui/base/ime/chromeos",
@@ -2288,6 +2293,7 @@ test("ash_unittests") {
     "//ui/message_center",
     "//ui/message_center:test_support",
     "//ui/message_center/public/cpp",
+    "//ui/ozone",
     "//ui/ozone/testhelpers:mock_gesture_properties_service",
     "//ui/resources",
     "//ui/snapshot",
@@ -2391,6 +2397,7 @@ static_library("test_support") {
     "//ash/shortcut_viewer:*",
     "//components/exo:*",
     "//components/exo/wayland:*",
+    "//ash/public/cpp/external_arc:*",
   ]
   public = [
     "public/cpp/test/accessibility_controller_test_api.h",
@@ -2554,6 +2561,7 @@ static_library("test_support") {
     "//base/test:test_support",
     "//cc:test_support",
     "//chromeos/services/assistant/public/cpp",
+    "//ui/accessibility/mojom",
     "//ui/platform_window/common",
 
     # TODO(https://crbug.com/644336): Make CrasAudioHandler Chrome or Ash only.
@@ -2564,6 +2572,7 @@ static_library("test_support") {
     # TODO(https://crbug.com/644336): Remove dependencies on CrasAudioClient.
     "//chromeos/dbus/audio",
     "//chromeos/dbus/power",
+    "//chromeos/dbus/power:power_manager_proto",
     "//chromeos/dbus/system_clock",
 
     # TODO(https://crbug.com/644355): Remove Shill dependencies.
@@ -2576,6 +2585,7 @@ static_library("test_support") {
     "//components/user_manager:user_manager",
     "//components/viz/test:test_support",
     "//device/bluetooth",
+    "//services/device/public/cpp:test_support",
     "//services/device/public/mojom",
     "//skia",
     "//testing/gtest",