BASELINE: Update Chromium to 85.0.4183.14085-based

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

15 files changed, 259 insertions, 283 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",
diff --git a/chromium/ash/app_list/BUILD.gn b/chromium/ash/app_list/BUILD.gn
index 09a7b81ca3c..aa9ee6b378e 100644
--- a/chromium/ash/app_list/BUILD.gn
+++ b/chromium/ash/app_list/BUILD.gn
@@ -46,8 +46,8 @@ component("app_list") {
     "views/assistant/assistant_main_view.h",
     "views/assistant/assistant_page_view.cc",
     "views/assistant/assistant_page_view.h",
-    "views/assistant/privacy_info_view.cc",
-    "views/assistant/privacy_info_view.h",
+    "views/assistant/assistant_privacy_info_view.cc",
+    "views/assistant/assistant_privacy_info_view.h",
     "views/contents_view.cc",
     "views/contents_view.h",
     "views/expand_arrow_view.cc",
@@ -61,6 +61,8 @@ component("app_list") {
     "views/ghost_image_view.h",
     "views/page_switcher.cc",
     "views/page_switcher.h",
+    "views/privacy_info_view.cc",
+    "views/privacy_info_view.h",
     "views/pulsing_block_view.cc",
     "views/pulsing_block_view.h",
     "views/remove_query_confirmation_dialog.cc",
@@ -92,6 +94,8 @@ component("app_list") {
     "views/search_result_tile_item_view.h",
     "views/search_result_view.cc",
     "views/search_result_view.h",
+    "views/suggested_content_info_view.cc",
+    "views/suggested_content_info_view.h",
     "views/suggestion_chip_container_view.cc",
     "views/suggestion_chip_container_view.h",
     "views/top_icon_animation_view.cc",
diff --git a/chromium/ash/assistant/model/BUILD.gn b/chromium/ash/assistant/model/BUILD.gn
index ecf60409e13..1cbf09de39d 100644
--- a/chromium/ash/assistant/model/BUILD.gn
+++ b/chromium/ash/assistant/model/BUILD.gn
@@ -49,6 +49,7 @@ component("model") {
     "//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 571027ec0e4..f61e5003c92 100644
--- a/chromium/ash/assistant/ui/BUILD.gn
+++ b/chromium/ash/assistant/ui/BUILD.gn
@@ -54,6 +54,8 @@ component("ui") {
     "main_stage/assistant_card_element_view.h",
     "main_stage/assistant_footer_view.cc",
     "main_stage/assistant_footer_view.h",
+    "main_stage/assistant_onboarding_view.cc",
+    "main_stage/assistant_onboarding_view.h",
     "main_stage/assistant_opt_in_view.cc",
     "main_stage/assistant_opt_in_view.h",
     "main_stage/assistant_progress_indicator.cc",
@@ -66,6 +68,8 @@ component("ui") {
     "main_stage/assistant_ui_element_view.h",
     "main_stage/assistant_ui_element_view_factory.cc",
     "main_stage/assistant_ui_element_view_factory.h",
+    "main_stage/assistant_zero_state_view.cc",
+    "main_stage/assistant_zero_state_view.h",
     "main_stage/element_animator.cc",
     "main_stage/element_animator.h",
     "main_stage/suggestion_chip_view.cc",
@@ -74,12 +78,6 @@ component("ui") {
     "main_stage/suggestion_container_view.h",
     "main_stage/ui_element_container_view.cc",
     "main_stage/ui_element_container_view.h",
-    "proactive_suggestions_rich_view.cc",
-    "proactive_suggestions_rich_view.h",
-    "proactive_suggestions_simple_view.cc",
-    "proactive_suggestions_simple_view.h",
-    "proactive_suggestions_view.cc",
-    "proactive_suggestions_view.h",
   ]
 
   deps = [
diff --git a/chromium/ash/assistant/ui/test_support/BUILD.gn b/chromium/ash/assistant/ui/test_support/BUILD.gn
new file mode 100644
index 00000000000..9402c816c1d
--- /dev/null
+++ b/chromium/ash/assistant/ui/test_support/BUILD.gn
@@ -0,0 +1,20 @@
+# 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.
+
+static_library("test_support") {
+  testonly = true
+
+  sources = [
+    "mock_assistant_view_delegate.cc",
+    "mock_assistant_view_delegate.h",
+  ]
+
+  deps = [
+    "//ash/assistant/ui",
+    "//base",
+    "//testing/gmock",
+    "//testing/gtest",
+    "//ui/gfx",
+  ]
+}
diff --git a/chromium/ash/assistant/util/BUILD.gn b/chromium/ash/assistant/util/BUILD.gn
index 92902ef5f9a..6e6a2125c5c 100644
--- a/chromium/ash/assistant/util/BUILD.gn
+++ b/chromium/ash/assistant/util/BUILD.gn
@@ -27,6 +27,7 @@ component("util") {
     "//base",
     "//base:i18n",
     "//chromeos/constants",
+    "//chromeos/services/assistant/public/cpp",
     "//chromeos/services/assistant/public/mojom",
     "//net",
     "//ui/base",
diff --git a/chromium/ash/keyboard/arc/BUILD.gn b/chromium/ash/keyboard/arc/BUILD.gn
deleted file mode 100644
index 7e69efe7e01..00000000000
--- a/chromium/ash/keyboard/arc/BUILD.gn
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2018 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/ui.gni")
-
-static_library("arc") {
-  sources = [
-    "arc_input_method_surface_manager.cc",
-    "arc_input_method_surface_manager.h",
-    "arc_virtual_keyboard_container_layout_manager.cc",
-    "arc_virtual_keyboard_container_layout_manager.h",
-  ]
-
-  deps = [
-    "//ash/public/cpp",
-    "//base",
-    "//components/exo",
-    "//ui/aura",
-    "//ui/gfx/geometry",
-  ]
-}
diff --git a/chromium/ash/public/cpp/BUILD.gn b/chromium/ash/public/cpp/BUILD.gn
index 911b526aa92..118697ba72e 100644
--- a/chromium/ash/public/cpp/BUILD.gn
+++ b/chromium/ash/public/cpp/BUILD.gn
@@ -21,10 +21,12 @@ component("cpp") {
     "ambient/ambient_backend_controller.h",
     "ambient/ambient_client.cc",
     "ambient/ambient_client.h",
-    "ambient/ambient_mode_state.cc",
-    "ambient/ambient_mode_state.h",
     "ambient/ambient_prefs.cc",
     "ambient/ambient_prefs.h",
+    "ambient/ambient_ui_model.cc",
+    "ambient/ambient_ui_model.h",
+    "ambient/common/ambient_settings.cc",
+    "ambient/common/ambient_settings.h",
     "android_intent_helper.cc",
     "android_intent_helper.h",
     "app_list/app_list_client.h",
@@ -49,10 +51,6 @@ component("cpp") {
     "app_types.h",
     "arc_app_id_provider.cc",
     "arc_app_id_provider.h",
-    "arc_notification_manager_base.cc",
-    "arc_notification_manager_base.h",
-    "arc_notifications_host_initializer.cc",
-    "arc_notifications_host_initializer.h",
     "ash_constants.h",
     "ash_features.cc",
     "ash_features.h",
@@ -78,11 +76,15 @@ component("cpp") {
     "assistant/assistant_web_view.h",
     "assistant/assistant_web_view_factory.cc",
     "assistant/assistant_web_view_factory.h",
+    "assistant/controller/assistant_alarm_timer_controller.cc",
+    "assistant/controller/assistant_alarm_timer_controller.h",
     "assistant/controller/assistant_controller.cc",
     "assistant/controller/assistant_controller.h",
     "assistant/controller/assistant_controller_observer.h",
     "assistant/controller/assistant_interaction_controller.cc",
     "assistant/controller/assistant_interaction_controller.h",
+    "assistant/controller/assistant_screen_context_controller.cc",
+    "assistant/controller/assistant_screen_context_controller.h",
     "assistant/controller/assistant_suggestions_controller.cc",
     "assistant/controller/assistant_suggestions_controller.h",
     "assistant/controller/assistant_ui_controller.cc",
@@ -91,12 +93,6 @@ component("cpp") {
     "assistant/conversation_starter.h",
     "assistant/conversation_starters_client.cc",
     "assistant/conversation_starters_client.h",
-    "assistant/proactive_suggestions.cc",
-    "assistant/proactive_suggestions.h",
-    "assistant/proactive_suggestions_client.cc",
-    "assistant/proactive_suggestions_client.h",
-    "assistant/util/histogram_util.cc",
-    "assistant/util/histogram_util.h",
     "back_gesture_contextual_nudge_controller.h",
     "back_gesture_contextual_nudge_delegate.h",
     "caption_buttons/caption_button_model.h",
@@ -140,6 +136,8 @@ component("cpp") {
     "immersive/immersive_fullscreen_controller_delegate.h",
     "immersive/immersive_revealed_lock.cc",
     "immersive/immersive_revealed_lock.h",
+    "keyboard/arc/arc_input_method_bounds_tracker.cc",
+    "keyboard/arc/arc_input_method_bounds_tracker.h",
     "keyboard/keyboard_config.h",
     "keyboard/keyboard_controller.cc",
     "keyboard/keyboard_controller.h",
@@ -166,6 +164,14 @@ component("cpp") {
     "media_client.h",
     "media_controller.cc",
     "media_controller.h",
+    "message_center/arc_notification_constants.h",
+    "message_center/arc_notification_manager_base.cc",
+    "message_center/arc_notification_manager_base.h",
+    "message_center/arc_notification_manager_delegate.h",
+    "message_center/arc_notifications_host_initializer.cc",
+    "message_center/arc_notifications_host_initializer.h",
+    "metrics_util.cc",
+    "metrics_util.h",
     "network_config_service.cc",
     "network_config_service.h",
     "network_icon_image_source.cc",
@@ -192,13 +198,18 @@ component("cpp") {
     "power_utils.h",
     "presentation_time_recorder.cc",
     "presentation_time_recorder.h",
-    "quick_answers_controller.cc",
-    "quick_answers_controller.h",
+    "quick_answers/controller/quick_answers_controller.cc",
+    "quick_answers/controller/quick_answers_controller.h",
     "rounded_corner_decorator.cc",
     "rounded_corner_decorator.h",
     "scale_utility.cc",
     "scale_utility.h",
     "scoped_guest_button_blocker.h",
+    "scoped_singleton_resetter_for_test.h",
+    "screen_backlight.cc",
+    "screen_backlight.h",
+    "screen_backlight_observer.h",
+    "screen_backlight_type.h",
     "select_to_speak_event_handler_delegate.h",
     "session/session_activation_observer.h",
     "session/session_controller.cc",
@@ -352,6 +363,7 @@ source_set("test_support") {
   deps = [
     ":cpp",
     "//base",
+    "//services/device/public/cpp:test_support",
     "//services/network/public/cpp:cpp",
     "//ui/aura",
     "//ui/aura:test_support",
diff --git a/chromium/ash/public/cpp/external_arc/BUILD.gn b/chromium/ash/public/cpp/external_arc/BUILD.gn
new file mode 100644
index 00000000000..036ad65ec52
--- /dev/null
+++ b/chromium/ash/public/cpp/external_arc/BUILD.gn
@@ -0,0 +1,89 @@
+# 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("//build/config/ui.gni")
+static_library("external_arc") {
+  sources = [
+    "keyboard/arc_input_method_surface_manager.cc",
+    "keyboard/arc_input_method_surface_manager.h",
+    "message_center/arc_notification_content_view.cc",
+    "message_center/arc_notification_content_view.h",
+    "message_center/arc_notification_delegate.cc",
+    "message_center/arc_notification_delegate.h",
+    "message_center/arc_notification_item.h",
+    "message_center/arc_notification_item_impl.cc",
+    "message_center/arc_notification_item_impl.h",
+    "message_center/arc_notification_manager.cc",
+    "message_center/arc_notification_manager.h",
+    "message_center/arc_notification_surface.h",
+    "message_center/arc_notification_surface_impl.cc",
+    "message_center/arc_notification_surface_impl.h",
+    "message_center/arc_notification_surface_manager.cc",
+    "message_center/arc_notification_surface_manager.h",
+    "message_center/arc_notification_surface_manager_impl.cc",
+    "message_center/arc_notification_surface_manager_impl.h",
+    "message_center/arc_notification_view.cc",
+    "message_center/arc_notification_view.h",
+  ]
+  defines = [ "ASH_PUBLIC_IMPLEMENTATION" ]
+  deps = [
+    "//ash/public/cpp",
+    "//base",
+    "//components/account_id",
+    "//components/arc:arc_metrics_constants",
+    "//components/arc:connection_holder",
+    "//components/arc/mojom:notifications",
+    "//components/exo",
+    "//mojo/public/cpp/system",
+    "//ui/message_center",
+    "//ui/views",
+    "//ui/wm",
+  ]
+}
+
+source_set("unit_tests") {
+  testonly = true
+  sources = [
+    "keyboard/arc_input_method_surface_manager_unittest.cc",
+    "message_center/arc_notification_content_view_unittest.cc",
+    "message_center/arc_notification_manager_unittest.cc",
+    "message_center/arc_notification_view_unittest.cc",
+  ]
+  public_deps = [ "//ash:test_support" ]
+  deps = [
+    ":external_arc",
+    ":test_support",
+    "//ash",
+    "//ash:test_support",
+    "//ash/public/cpp",
+    "//base/test:test_support",
+    "//components/arc:connection_holder",
+    "//components/arc:notification_test_support",
+    "//components/exo",
+    "//components/exo:test_support",
+    "//testing/gmock",
+    "//ui/aura:test_support",
+    "//ui/base:test_support",
+    "//ui/events:test_support",
+    "//ui/message_center:test_support",
+    "//ui/views:test_support",
+  ]
+
+  assert_no_deps = [ "//compponents/arc:arc_base" ]
+}
+
+source_set("test_support") {
+  testonly = true
+  sources = [
+    "message_center/mock_arc_notification_item.cc",
+    "message_center/mock_arc_notification_item.h",
+    "message_center/mock_arc_notification_surface.cc",
+    "message_center/mock_arc_notification_surface.h",
+  ]
+  deps = [
+    ":external_arc",
+    "//ash/public/cpp",
+    "//base",
+    "//ui/aura",
+  ]
+}
diff --git a/chromium/ash/public/mojom/assistant_controller.mojom b/chromium/ash/public/mojom/assistant_controller.mojom
index fcfe47f94ca..f3fd9538d3a 100644
--- a/chromium/ash/public/mojom/assistant_controller.mojom
+++ b/chromium/ash/public/mojom/assistant_controller.mojom
@@ -5,41 +5,6 @@
 module ash.mojom;
 
 import "chromeos/services/assistant/public/mojom/assistant_notification.mojom";
-import "mojo/public/mojom/base/time.mojom";
-import "ui/gfx/geometry/mojom/geometry.mojom";
-
-// Represents the current state of an Assistant timer.
-enum AssistantTimerState {
-  kUnknown,
-
-  // The timer is scheduled to fire at some future date.
-  kScheduled,
-
-  // The timer will not fire but is kept in the queue of scheduled events;
-  // it can be resumed after which it will fire in |remaining_time|.
-  kPaused,
-
-  // The timer has fired. In the simplest case this means the timer has
-  // begun ringing.
-  kFired,
-};
-
-// Models an Assistant timer.
-struct AssistantTimer {
-  string id;
-  string label;
-  AssistantTimerState state;
-  mojo_base.mojom.Time fire_time;
-  mojo_base.mojom.TimeDelta remaining_time;
-};
-
-// Interface to the AssistantAlarmTimerController which is owned by the
-// AssistantController. Currently used by the Assistant service to notify Ash
-// of changes to the underlying alarm/timer state in LibAssistant.
-interface AssistantAlarmTimerController {
-  // Invoked when timer state has changed. Note that |timers| may be empty.
-  OnTimerStateChanged(array<AssistantTimer> timers);
-};
 
 // Interface to the AssistantNotificationController which is owned by the
 // AssistantController. Currently used by the Assistant service to modify
@@ -67,13 +32,3 @@ interface AssistantNotificationController {
   // Changes the quiet mode state in the message center.
   SetQuietMode(bool enabled);
 };
-
-// Interface to the AssistantScreenContextController which is owned by the
-// AssistantController. Currently used by the Assistant service to request
-// screenshots.
-interface AssistantScreenContextController {
-  // Requests a screenshot of the region enclosed by |rect| and returns the
-  // screenshot encoded in JPEG format. If |rect| is empty, it returns a
-  // fullscreen screenshot.
-  RequestScreenshot(gfx.mojom.Rect rect) => (array<uint8> screenshot);
-};
diff --git a/chromium/ash/resources/vector_icons/BUILD.gn b/chromium/ash/resources/vector_icons/BUILD.gn
index dea38cf61bb..b38d10fbf51 100644
--- a/chromium/ash/resources/vector_icons/BUILD.gn
+++ b/chromium/ash/resources/vector_icons/BUILD.gn
@@ -146,6 +146,7 @@ aggregate_vector_icons("ash_vector_icons") {
     "shelf_unlock_button.icon",
     "switch_access.icon",
     "switch_access_back.icon",
+    "switch_access_close.icon",
     "switch_access_copy.icon",
     "switch_access_cut.icon",
     "switch_access_decrement.icon",
@@ -217,6 +218,7 @@ aggregate_vector_icons("ash_vector_icons") {
     "system_menu_tracing.icon",
     "system_menu_timer.icon",
     "system_menu_new_user.icon",
+    "system_menu_update.icon",
     "system_menu_usb.icon",
     "system_menu_videocam.icon",
     "system_menu_volume_high.icon",
diff --git a/chromium/ash/shortcut_viewer/strings/BUILD.gn b/chromium/ash/shortcut_viewer/strings/BUILD.gn
index 10791172466..04202153115 100644
--- a/chromium/ash/shortcut_viewer/strings/BUILD.gn
+++ b/chromium/ash/shortcut_viewer/strings/BUILD.gn
@@ -5,62 +5,62 @@
 import("//tools/grit/grit_rule.gni")
 
 grit("strings") {
-  source = "../ash_components_strings.grd"
+  source = "../shortcut_viewer_strings.grd"
   outputs = [
-    "grit/ash_components_strings.h",
-    "ash_components_strings_am.pak",
-    "ash_components_strings_ar.pak",
-    "ash_components_strings_bg.pak",
-    "ash_components_strings_bn.pak",
-    "ash_components_strings_ca.pak",
-    "ash_components_strings_cs.pak",
-    "ash_components_strings_da.pak",
-    "ash_components_strings_de.pak",
-    "ash_components_strings_el.pak",
-    "ash_components_strings_en-GB.pak",
-    "ash_components_strings_en-US.pak",
-    "ash_components_strings_es-419.pak",
-    "ash_components_strings_es.pak",
-    "ash_components_strings_et.pak",
-    "ash_components_strings_fake-bidi.pak",
-    "ash_components_strings_fa.pak",
-    "ash_components_strings_fil.pak",
-    "ash_components_strings_fi.pak",
-    "ash_components_strings_fr.pak",
-    "ash_components_strings_gu.pak",
-    "ash_components_strings_he.pak",
-    "ash_components_strings_hi.pak",
-    "ash_components_strings_hr.pak",
-    "ash_components_strings_hu.pak",
-    "ash_components_strings_id.pak",
-    "ash_components_strings_it.pak",
-    "ash_components_strings_ja.pak",
-    "ash_components_strings_kn.pak",
-    "ash_components_strings_ko.pak",
-    "ash_components_strings_lt.pak",
-    "ash_components_strings_lv.pak",
-    "ash_components_strings_ml.pak",
-    "ash_components_strings_mr.pak",
-    "ash_components_strings_ms.pak",
-    "ash_components_strings_nb.pak",
-    "ash_components_strings_nl.pak",
-    "ash_components_strings_pl.pak",
-    "ash_components_strings_pt-BR.pak",
-    "ash_components_strings_pt-PT.pak",
-    "ash_components_strings_ro.pak",
-    "ash_components_strings_ru.pak",
-    "ash_components_strings_sk.pak",
-    "ash_components_strings_sl.pak",
-    "ash_components_strings_sr.pak",
-    "ash_components_strings_sv.pak",
-    "ash_components_strings_sw.pak",
-    "ash_components_strings_ta.pak",
-    "ash_components_strings_te.pak",
-    "ash_components_strings_th.pak",
-    "ash_components_strings_tr.pak",
-    "ash_components_strings_uk.pak",
-    "ash_components_strings_vi.pak",
-    "ash_components_strings_zh-CN.pak",
-    "ash_components_strings_zh-TW.pak",
+    "grit/shortcut_viewer_strings.h",
+    "shortcut_viewer_strings_am.pak",
+    "shortcut_viewer_strings_ar.pak",
+    "shortcut_viewer_strings_bg.pak",
+    "shortcut_viewer_strings_bn.pak",
+    "shortcut_viewer_strings_ca.pak",
+    "shortcut_viewer_strings_cs.pak",
+    "shortcut_viewer_strings_da.pak",
+    "shortcut_viewer_strings_de.pak",
+    "shortcut_viewer_strings_el.pak",
+    "shortcut_viewer_strings_en-GB.pak",
+    "shortcut_viewer_strings_en-US.pak",
+    "shortcut_viewer_strings_es-419.pak",
+    "shortcut_viewer_strings_es.pak",
+    "shortcut_viewer_strings_et.pak",
+    "shortcut_viewer_strings_fake-bidi.pak",
+    "shortcut_viewer_strings_fa.pak",
+    "shortcut_viewer_strings_fil.pak",
+    "shortcut_viewer_strings_fi.pak",
+    "shortcut_viewer_strings_fr.pak",
+    "shortcut_viewer_strings_gu.pak",
+    "shortcut_viewer_strings_he.pak",
+    "shortcut_viewer_strings_hi.pak",
+    "shortcut_viewer_strings_hr.pak",
+    "shortcut_viewer_strings_hu.pak",
+    "shortcut_viewer_strings_id.pak",
+    "shortcut_viewer_strings_it.pak",
+    "shortcut_viewer_strings_ja.pak",
+    "shortcut_viewer_strings_kn.pak",
+    "shortcut_viewer_strings_ko.pak",
+    "shortcut_viewer_strings_lt.pak",
+    "shortcut_viewer_strings_lv.pak",
+    "shortcut_viewer_strings_ml.pak",
+    "shortcut_viewer_strings_mr.pak",
+    "shortcut_viewer_strings_ms.pak",
+    "shortcut_viewer_strings_nb.pak",
+    "shortcut_viewer_strings_nl.pak",
+    "shortcut_viewer_strings_pl.pak",
+    "shortcut_viewer_strings_pt-BR.pak",
+    "shortcut_viewer_strings_pt-PT.pak",
+    "shortcut_viewer_strings_ro.pak",
+    "shortcut_viewer_strings_ru.pak",
+    "shortcut_viewer_strings_sk.pak",
+    "shortcut_viewer_strings_sl.pak",
+    "shortcut_viewer_strings_sr.pak",
+    "shortcut_viewer_strings_sv.pak",
+    "shortcut_viewer_strings_sw.pak",
+    "shortcut_viewer_strings_ta.pak",
+    "shortcut_viewer_strings_te.pak",
+    "shortcut_viewer_strings_th.pak",
+    "shortcut_viewer_strings_tr.pak",
+    "shortcut_viewer_strings_uk.pak",
+    "shortcut_viewer_strings_vi.pak",
+    "shortcut_viewer_strings_zh-CN.pak",
+    "shortcut_viewer_strings_zh-TW.pak",
   ]
 }
diff --git a/chromium/ash/strings/BUILD.gn b/chromium/ash/strings/BUILD.gn
index c637fc4d5f4..f4a002f03a3 100644
--- a/chromium/ash/strings/BUILD.gn
+++ b/chromium/ash/strings/BUILD.gn
@@ -79,7 +79,7 @@ template("repack_one_locale_ash") {
   repack(target_name) {
     # Each input pak file should also have a deps line for completeness.
     sources = [
-      "$root_gen_dir/ash/shortcut_viewer/strings/ash_components_strings_${locale}.pak",
+      "$root_gen_dir/ash/shortcut_viewer/strings/shortcut_viewer_strings_${locale}.pak",
       "$root_gen_dir/ash/strings/ash_strings_${locale}.pak",
       "$root_gen_dir/chromeos/strings/chromeos_strings_${locale}.pak",
       "$root_gen_dir/components/strings/components_strings_${locale}.pak",
diff --git a/chromium/ash/system/message_center/arc/BUILD.gn b/chromium/ash/system/message_center/arc/BUILD.gn
deleted file mode 100644
index 8ecf076bb97..00000000000
--- a/chromium/ash/system/message_center/arc/BUILD.gn
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 2016 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/ui.gni")
-import("//testing/test.gni")
-
-static_library("arc") {
-  sources = [
-    "arc_notification_constants.h",
-    "arc_notification_content_view.cc",
-    "arc_notification_content_view.h",
-    "arc_notification_delegate.cc",
-    "arc_notification_delegate.h",
-    "arc_notification_item.h",
-    "arc_notification_item_impl.cc",
-    "arc_notification_item_impl.h",
-    "arc_notification_manager.cc",
-    "arc_notification_manager.h",
-    "arc_notification_manager_delegate.h",
-    "arc_notification_surface.h",
-    "arc_notification_surface_impl.cc",
-    "arc_notification_surface_impl.h",
-    "arc_notification_surface_manager.cc",
-    "arc_notification_surface_manager.h",
-    "arc_notification_surface_manager_impl.cc",
-    "arc_notification_surface_manager_impl.h",
-    "arc_notification_view.cc",
-    "arc_notification_view.h",
-  ]
-
-  deps = [
-    "//ash/public/cpp:cpp",
-    "//base",
-    "//components/account_id",
-    "//components/arc:arc_metrics_constants",
-    "//components/arc:connection_holder",
-    "//components/arc/mojom:notifications",
-    "//components/exo",
-    "//mojo/public/cpp/system",
-    "//skia",
-    "//ui/accessibility",
-    "//ui/aura",
-    "//ui/base",
-    "//ui/compositor",
-    "//ui/display",
-    "//ui/events",
-    "//ui/gfx",
-    "//ui/message_center",
-    "//ui/message_center/public/cpp",
-    "//ui/resources",
-    "//ui/strings",
-    "//ui/views",
-    "//ui/wm",
-  ]
-}
-
-static_library("test_support") {
-  testonly = true
-  sources = [
-    "mock_arc_notification_item.cc",
-    "mock_arc_notification_item.h",
-    "mock_arc_notification_surface.cc",
-    "mock_arc_notification_surface.h",
-  ]
-
-  deps = [
-    ":arc",
-    "//ui/aura",
-    "//ui/gl:test_support",
-  ]
-}
diff --git a/chromium/ash/wayland/BUILD.gn b/chromium/ash/wayland/BUILD.gn
deleted file mode 100644
index 95d8e5bea31..00000000000
--- a/chromium/ash/wayland/BUILD.gn
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2017 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.
-
-assert(is_chromeos)
-
-source_set("wayland") {
-  sources = [
-    "wayland_server_controller.cc",
-    "wayland_server_controller.h",
-  ]
-
-  deps = [
-    "//ash/keyboard/arc",
-    "//ash/public/cpp",
-    "//ash/system/message_center/arc",
-    "//base",
-    "//components/exo",
-    "//components/exo/wayland",
-    "//skia",
-  ]
-}