BASELINE: Update Chromium to 91.0.4472.160

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

19 files changed, 670 insertions, 191 deletions

diff --git a/chromium/ash/BUILD.gn b/chromium/ash/BUILD.gn
index bf0b085268a..717d56c51e2 100644
--- a/chromium/ash/BUILD.gn
+++ b/chromium/ash/BUILD.gn
@@ -25,6 +25,7 @@ component("ash") {
   # All targets in this file are allowed to access any the headers in ash.
   friend = [
     ":*",
+    "//ash/app_list:*",
     "//components/exo:*",
     "//components/exo/wayland:*",
   ]
@@ -35,14 +36,15 @@ component("ash") {
     # TODO: move the following to source. Do NOT add new files here.
     "accessibility/accessibility_controller_impl.h",
     "accessibility/accessibility_delegate.h",
-    "accessibility/focus_ring_controller.h",
+    "accessibility/magnifier/magnification_controller.h",
+    "accessibility/sticky_keys/sticky_keys_controller.h",
+    "accessibility/ui/focus_ring_controller.h",
     "display/output_protection_delegate.h",
     "display/privacy_screen_controller.h",
     "display/screen_orientation_controller.h",
     "frame/header_view.h",
     "frame/non_client_frame_view_ash.h",
     "frame/wide_frame_view.h",
-    "magnifier/magnification_controller.h",
 
     # TODO: move MultiUserWindowManager (and delegate) to sources:
     # https://crbug.com/756085
@@ -77,7 +79,6 @@ component("ash") {
     "shell_delegate.h",
     "shell_init_params.h",
     "shell_observer.h",
-    "sticky_keys/sticky_keys_controller.h",
     "system/pcie_peripheral/pcie_peripheral_notification_controller.h",
     "system/status_area_widget.h",
     "system/tray/system_tray_notifier.h",
@@ -110,10 +111,10 @@ component("ash") {
   sources = [
     "accelerators/accelerator_commands.cc",
     "accelerators/accelerator_commands.h",
-    "accelerators/accelerator_confirmation_dialog.cc",
-    "accelerators/accelerator_confirmation_dialog.h",
     "accelerators/accelerator_controller_impl.cc",
     "accelerators/accelerator_controller_impl.h",
+    "accelerators/accelerator_history_impl.cc",
+    "accelerators/accelerator_history_impl.h",
     "accelerators/accelerator_ids.h",
     "accelerators/accelerator_table.cc",
     "accelerators/accelerator_table.h",
@@ -139,48 +140,72 @@ component("ash") {
     "accelerometer/accelerometer_types.cc",
     "accelerometer/accelerometer_types.h",
     "accessibility/accessibility_controller_impl.cc",
-    "accessibility/accessibility_cursor_ring_layer.cc",
-    "accessibility/accessibility_cursor_ring_layer.h",
-    "accessibility/accessibility_focus_ring.cc",
-    "accessibility/accessibility_focus_ring.h",
-    "accessibility/accessibility_focus_ring_controller_impl.cc",
-    "accessibility/accessibility_focus_ring_controller_impl.h",
-    "accessibility/accessibility_focus_ring_group.cc",
-    "accessibility/accessibility_focus_ring_group.h",
-    "accessibility/accessibility_focus_ring_layer.cc",
-    "accessibility/accessibility_focus_ring_layer.h",
-    "accessibility/accessibility_highlight_controller.cc",
-    "accessibility/accessibility_highlight_controller.h",
-    "accessibility/accessibility_highlight_layer.cc",
-    "accessibility/accessibility_highlight_layer.h",
-    "accessibility/accessibility_layer.cc",
-    "accessibility/accessibility_layer.h",
     "accessibility/accessibility_observer.h",
-    "accessibility/accessibility_panel_layout_manager.cc",
-    "accessibility/accessibility_panel_layout_manager.h",
+    "accessibility/autoclick/autoclick_controller.cc",
+    "accessibility/autoclick/autoclick_controller.h",
+    "accessibility/autoclick/autoclick_drag_event_rewriter.cc",
+    "accessibility/autoclick/autoclick_drag_event_rewriter.h",
+    "accessibility/autoclick/autoclick_ring_handler.cc",
+    "accessibility/autoclick/autoclick_ring_handler.h",
+    "accessibility/autoclick/autoclick_scroll_position_handler.cc",
+    "accessibility/autoclick/autoclick_scroll_position_handler.h",
+    "accessibility/chromevox/key_accessibility_enabler.cc",
+    "accessibility/chromevox/key_accessibility_enabler.h",
+    "accessibility/chromevox/spoken_feedback_enabler.cc",
+    "accessibility/chromevox/spoken_feedback_enabler.h",
+    "accessibility/chromevox/touch_accessibility_enabler.cc",
+    "accessibility/chromevox/touch_accessibility_enabler.h",
+    "accessibility/chromevox/touch_exploration_controller.cc",
+    "accessibility/chromevox/touch_exploration_controller.h",
+    "accessibility/chromevox/touch_exploration_manager.cc",
+    "accessibility/chromevox/touch_exploration_manager.h",
     "accessibility/default_accessibility_delegate.cc",
     "accessibility/default_accessibility_delegate.h",
-    "accessibility/focus_ring_controller.cc",
-    "accessibility/focus_ring_layer.cc",
-    "accessibility/focus_ring_layer.h",
-    "accessibility/key_accessibility_enabler.cc",
-    "accessibility/key_accessibility_enabler.h",
-    "accessibility/layer_animation_info.cc",
-    "accessibility/layer_animation_info.h",
-    "accessibility/point_scan_controller.cc",
-    "accessibility/point_scan_controller.h",
-    "accessibility/point_scan_layer.cc",
-    "accessibility/point_scan_layer.h",
-    "accessibility/point_scan_layer_animation_info.cc",
-    "accessibility/point_scan_layer_animation_info.h",
-    "accessibility/spoken_feedback_enabler.cc",
-    "accessibility/spoken_feedback_enabler.h",
-    "accessibility/touch_accessibility_enabler.cc",
-    "accessibility/touch_accessibility_enabler.h",
-    "accessibility/touch_exploration_controller.cc",
-    "accessibility/touch_exploration_controller.h",
-    "accessibility/touch_exploration_manager.cc",
-    "accessibility/touch_exploration_manager.h",
+    "accessibility/magnifier/docked_magnifier_controller_impl.cc",
+    "accessibility/magnifier/docked_magnifier_controller_impl.h",
+    "accessibility/magnifier/magnification_controller.cc",
+    "accessibility/magnifier/magnification_controller.h",
+    "accessibility/magnifier/magnifier_glass.cc",
+    "accessibility/magnifier/magnifier_glass.h",
+    "accessibility/magnifier/magnifier_utils.cc",
+    "accessibility/magnifier/magnifier_utils.h",
+    "accessibility/magnifier/partial_magnification_controller.cc",
+    "accessibility/magnifier/partial_magnification_controller.h",
+    "accessibility/sticky_keys/sticky_keys_controller.cc",
+    "accessibility/sticky_keys/sticky_keys_overlay.cc",
+    "accessibility/sticky_keys/sticky_keys_overlay.h",
+    "accessibility/sticky_keys/sticky_keys_state.h",
+    "accessibility/switch_access/point_scan_controller.cc",
+    "accessibility/switch_access/point_scan_controller.h",
+    "accessibility/switch_access/point_scan_layer.cc",
+    "accessibility/switch_access/point_scan_layer.h",
+    "accessibility/switch_access/point_scan_layer_animation_info.cc",
+    "accessibility/switch_access/point_scan_layer_animation_info.h",
+    "accessibility/ui/accessibility_confirmation_dialog.cc",
+    "accessibility/ui/accessibility_confirmation_dialog.h",
+    "accessibility/ui/accessibility_cursor_ring_layer.cc",
+    "accessibility/ui/accessibility_cursor_ring_layer.h",
+    "accessibility/ui/accessibility_focus_ring.cc",
+    "accessibility/ui/accessibility_focus_ring.h",
+    "accessibility/ui/accessibility_focus_ring_controller_impl.cc",
+    "accessibility/ui/accessibility_focus_ring_controller_impl.h",
+    "accessibility/ui/accessibility_focus_ring_group.cc",
+    "accessibility/ui/accessibility_focus_ring_group.h",
+    "accessibility/ui/accessibility_focus_ring_layer.cc",
+    "accessibility/ui/accessibility_focus_ring_layer.h",
+    "accessibility/ui/accessibility_highlight_controller.cc",
+    "accessibility/ui/accessibility_highlight_controller.h",
+    "accessibility/ui/accessibility_highlight_layer.cc",
+    "accessibility/ui/accessibility_highlight_layer.h",
+    "accessibility/ui/accessibility_layer.cc",
+    "accessibility/ui/accessibility_layer.h",
+    "accessibility/ui/accessibility_panel_layout_manager.cc",
+    "accessibility/ui/accessibility_panel_layout_manager.h",
+    "accessibility/ui/focus_ring_controller.cc",
+    "accessibility/ui/focus_ring_layer.cc",
+    "accessibility/ui/focus_ring_layer.h",
+    "accessibility/ui/layer_animation_info.cc",
+    "accessibility/ui/layer_animation_info.h",
     "ambient/ambient_access_token_controller.cc",
     "ambient/ambient_access_token_controller.h",
     "ambient/ambient_constants.h",
@@ -215,12 +240,6 @@ component("ash") {
     "ambient/util/ambient_util.cc",
     "ambient/util/ambient_util.h",
     "animation/animation_change_type.h",
-    "app_list/app_list_color_provider_impl.cc",
-    "app_list/app_list_color_provider_impl.h",
-    "app_list/app_list_controller_impl.cc",
-    "app_list/app_list_controller_impl.h",
-    "app_list/app_list_presenter_delegate_impl.cc",
-    "app_list/app_list_presenter_delegate_impl.h",
     "ash_export.h",
     "ash_interfaces.cc",
     "ash_prefs.cc",
@@ -250,14 +269,6 @@ component("ash") {
     "assistant/assistant_web_ui_controller.h",
     "assistant/assistant_web_view_delegate_impl.cc",
     "assistant/assistant_web_view_delegate_impl.h",
-    "autoclick/autoclick_controller.cc",
-    "autoclick/autoclick_controller.h",
-    "autoclick/autoclick_drag_event_rewriter.cc",
-    "autoclick/autoclick_drag_event_rewriter.h",
-    "autoclick/autoclick_ring_handler.cc",
-    "autoclick/autoclick_ring_handler.h",
-    "autoclick/autoclick_scroll_position_handler.cc",
-    "autoclick/autoclick_scroll_position_handler.h",
     "autotest_private_api_utils.cc",
     "bluetooth_devices_observer.cc",
     "bluetooth_devices_observer.h",
@@ -491,17 +502,6 @@ component("ash") {
     "highlighter/highlighter_result_view.h",
     "highlighter/highlighter_view.cc",
     "highlighter/highlighter_view.h",
-    "home_screen/drag_window_from_shelf_controller.cc",
-    "home_screen/drag_window_from_shelf_controller.h",
-    "home_screen/home_screen_controller.cc",
-    "home_screen/home_screen_controller.h",
-    "home_screen/home_screen_delegate.h",
-    "home_screen/home_screen_presenter.cc",
-    "home_screen/home_screen_presenter.h",
-    "home_screen/swipe_home_to_overview_controller.cc",
-    "home_screen/swipe_home_to_overview_controller.h",
-    "home_screen/window_scale_animation.cc",
-    "home_screen/window_scale_animation.h",
     "host/ash_window_tree_host.cc",
     "host/ash_window_tree_host.h",
     "host/ash_window_tree_host_init_params.h",
@@ -673,16 +673,8 @@ component("ash") {
     "login/ui/views_utils.cc",
     "login/ui/views_utils.h",
     "login_status.h",
-    "magnifier/docked_magnifier_controller_impl.cc",
-    "magnifier/docked_magnifier_controller_impl.h",
-    "magnifier/magnification_controller.cc",
-    "magnifier/magnification_controller.h",
-    "magnifier/magnifier_glass.cc",
-    "magnifier/magnifier_glass.h",
-    "magnifier/magnifier_utils.cc",
-    "magnifier/magnifier_utils.h",
-    "magnifier/partial_magnification_controller.cc",
-    "magnifier/partial_magnification_controller.h",
+    "marker/marker_controller.cc",
+    "marker/marker_controller.h",
     "media/media_controller_impl.cc",
     "media/media_controller_impl.h",
     "media/media_notification_constants.cc",
@@ -723,6 +715,8 @@ component("ash") {
     "policy/policy_recommendation_restorer.h",
     "power/hid_battery_util.cc",
     "power/hid_battery_util.h",
+    "projector/model/projector_session_impl.cc",
+    "projector/model/projector_session_impl.h",
     "projector/model/projector_ui_model.cc",
     "projector/model/projector_ui_model.h",
     "projector/projector_controller_impl.cc",
@@ -796,6 +790,8 @@ component("ash") {
     "shelf/contextual_tooltip.h",
     "shelf/drag_handle.cc",
     "shelf/drag_handle.h",
+    "shelf/drag_window_from_shelf_controller.cc",
+    "shelf/drag_window_from_shelf_controller.h",
     "shelf/gradient_layer_delegate.cc",
     "shelf/gradient_layer_delegate.h",
     "shelf/home_button.cc",
@@ -874,8 +870,12 @@ component("ash") {
     "shelf/shelf_window_watcher.h",
     "shelf/shelf_window_watcher_item_delegate.cc",
     "shelf/shelf_window_watcher_item_delegate.h",
+    "shelf/swipe_home_to_overview_controller.cc",
+    "shelf/swipe_home_to_overview_controller.h",
     "shelf/window_preview.cc",
     "shelf/window_preview.h",
+    "shelf/window_scale_animation.cc",
+    "shelf/window_scale_animation.h",
     "shell.cc",
     "shell_delegate.cc",
     "shell_init_params.cc",
@@ -885,10 +885,6 @@ component("ash") {
     "shutdown_controller_impl.h",
     "shutdown_reason.cc",
     "shutdown_reason.h",
-    "sticky_keys/sticky_keys_controller.cc",
-    "sticky_keys/sticky_keys_overlay.cc",
-    "sticky_keys/sticky_keys_overlay.h",
-    "sticky_keys/sticky_keys_state.h",
     "style/ash_color_provider.cc",
     "style/ash_color_provider.h",
     "style/default_color_constants.h",
@@ -1475,8 +1471,12 @@ component("ash") {
     "tray_action/tray_action.cc",
     "tray_action/tray_action.h",
     "tray_action/tray_action_observer.h",
+    "utility/layer_copy_animator.cc",
+    "utility/layer_copy_animator.h",
     "utility/layer_util.cc",
     "utility/layer_util.h",
+    "utility/occlusion_tracker_pauser.cc",
+    "utility/occlusion_tracker_pauser.h",
     "utility/screenshot_controller.cc",
     "utility/screenshot_controller.h",
     "utility/transformer_util.cc",
@@ -1793,6 +1793,7 @@ component("ash") {
     "//ui/base/cursor",
     "//ui/base/cursor:cursor_base",
     "//ui/base/cursor/mojom:cursor_type",
+    "//ui/base/dragdrop:types",
     "//ui/base/dragdrop/mojom:mojom_shared",
     "//ui/events",
     "//ui/gfx",
@@ -1837,6 +1838,8 @@ component("ash") {
     "//chromeos/dbus/audio",
     "//chromeos/dbus/constants",
     "//chromeos/dbus/hammerd",
+    "//chromeos/dbus/hermes:hermes_clients",
+    "//chromeos/dbus/hermes:hermes_fakes",
     "//chromeos/dbus/power",
     "//chromeos/dbus/power:power_manager_proto",
     "//chromeos/dbus/services:services",
@@ -1847,6 +1850,7 @@ component("ash") {
     "//chromeos/services/assistant/public/cpp",
     "//chromeos/services/assistant/public/mojom",
     "//chromeos/services/libassistant/public/cpp:structs",
+    "//chromeos/services/libassistant/public/mojom",
     "//chromeos/services/multidevice_setup/public/mojom",
     "//chromeos/services/nearby/public/cpp",
     "//chromeos/services/network_config/public/cpp",
@@ -1947,7 +1951,10 @@ component("ash") {
     "//ui/base/idle",
   ]
 
-  allow_circular_includes_from = [ "//ash/assistant/ui" ]
+  allow_circular_includes_from = [
+    "//ash/app_list",
+    "//ash/assistant/ui",
+  ]
 
   if (enable_cros_ambient_mode_backend) {
     sources += [
@@ -2003,22 +2010,33 @@ test("ash_unittests") {
     "accelerators/accelerator_commands_unittest.cc",
     "accelerators/accelerator_controller_unittest.cc",
     "accelerators/accelerator_filter_unittest.cc",
+    "accelerators/accelerator_history_unittest.cc",
     "accelerators/accelerator_table_unittest.cc",
     "accelerators/accelerator_unittest.cc",
     "accelerators/magnifier_key_scroller_unittest.cc",
     "accelerators/spoken_feedback_toggler_unittest.cc",
     "accessibility/accessibility_controller_unittest.cc",
-    "accessibility/accessibility_focus_ring_controller_unittest.cc",
-    "accessibility/accessibility_focus_ring_group_unittest.cc",
-    "accessibility/accessibility_highlight_controller_unittest.cc",
-    "accessibility/accessibility_panel_layout_manager_unittest.cc",
-    "accessibility/key_accessibility_enabler_unittest.cc",
-    "accessibility/mock_touch_exploration_controller_delegate.cc",
-    "accessibility/mock_touch_exploration_controller_delegate.h",
-    "accessibility/point_scan_controller_unittest.cc",
-    "accessibility/touch_accessibility_enabler_unittest.cc",
-    "accessibility/touch_exploration_controller_unittest.cc",
-    "accessibility/touch_exploration_manager_unittest.cc",
+    "accessibility/autoclick/autoclick_drag_event_rewriter_unittest.cc",
+    "accessibility/autoclick/autoclick_unittest.cc",
+    "accessibility/chromevox/key_accessibility_enabler_unittest.cc",
+    "accessibility/chromevox/mock_touch_exploration_controller_delegate.cc",
+    "accessibility/chromevox/mock_touch_exploration_controller_delegate.h",
+    "accessibility/chromevox/touch_accessibility_enabler_unittest.cc",
+    "accessibility/chromevox/touch_exploration_controller_unittest.cc",
+    "accessibility/chromevox/touch_exploration_manager_unittest.cc",
+    "accessibility/magnifier/docked_magnifier_controller_impl_unittest.cc",
+    "accessibility/magnifier/magnification_controller_unittest.cc",
+    "accessibility/magnifier/magnifier_test_utils.cc",
+    "accessibility/magnifier/magnifier_test_utils.h",
+    "accessibility/magnifier/magnifier_utils_unittest.cc",
+    "accessibility/magnifier/partial_magnification_controller_unittest.cc",
+    "accessibility/sticky_keys/sticky_keys_overlay_unittest.cc",
+    "accessibility/sticky_keys/sticky_keys_unittest.cc",
+    "accessibility/switch_access/point_scan_controller_unittest.cc",
+    "accessibility/ui/accessibility_focus_ring_controller_unittest.cc",
+    "accessibility/ui/accessibility_focus_ring_group_unittest.cc",
+    "accessibility/ui/accessibility_highlight_controller_unittest.cc",
+    "accessibility/ui/accessibility_panel_layout_manager_unittest.cc",
     "ambient/ambient_controller_unittest.cc",
     "ambient/ambient_photo_cache_unittest.cc",
     "ambient/ambient_photo_controller_unittest.cc",
@@ -2027,14 +2045,6 @@ test("ash_unittests") {
     "ambient/ui/ambient_container_view_unittest.cc",
     "ambient/ui/media_string_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",
-    "app_list/app_list_presenter_impl_unittest.cc",
-    "app_list/app_list_unittest.cc",
-    "app_list/model/app_list_item_list_unittest.cc",
-    "app_list/model/app_list_model_unittest.cc",
-    "app_list/views/assistant/assistant_page_view_unittest.cc",
     "app_menu/notification_menu_controller_unittest.cc",
     "app_menu/notification_menu_view_unittest.cc",
     "app_menu/notification_overflow_view_unittest.cc",
@@ -2052,8 +2062,6 @@ test("ash_unittests") {
     "assistant/ui/main_stage/suggestion_chip_view_unittest.cc",
     "assistant/util/deep_link_util_unittest.cc",
     "assistant/util/resource_util_unittest.cc",
-    "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",
@@ -2113,11 +2121,6 @@ test("ash_unittests") {
     "frame/non_client_frame_view_ash_unittest.cc",
     "highlighter/highlighter_controller_unittest.cc",
     "highlighter/highlighter_gesture_util_unittest.cc",
-    "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_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",
     "in_session_auth/in_session_auth_dialog_controller_impl_unittest.cc",
@@ -2158,12 +2161,7 @@ test("ash_unittests") {
     "login/ui/note_action_launch_button_unittest.cc",
     "login/ui/pin_request_view_unittest.cc",
     "login/ui/views_utils_unittest.cc",
-    "magnifier/docked_magnifier_controller_impl_unittest.cc",
-    "magnifier/magnification_controller_unittest.cc",
-    "magnifier/magnifier_test_utils.cc",
-    "magnifier/magnifier_test_utils.h",
-    "magnifier/magnifier_utils_unittest.cc",
-    "magnifier/partial_magnification_controller_unittest.cc",
+    "marker/marker_controller_unittest.cc",
     "media/media_controller_unittest.cc",
     "media/media_notification_controller_impl_unittest.cc",
     "metrics/demo_session_metrics_recorder_unittest.cc",
@@ -2178,8 +2176,10 @@ test("ash_unittests") {
     "multi_device_setup/multi_device_notification_presenter_unittest.cc",
     "policy/policy_recommendation_restorer_unittest.cc",
     "power/hid_battery_util_unittest.cc",
+    "projector/model/projector_session_impl_unittest.cc",
     "projector/projector_controller_unittest.cc",
     "projector/projector_metadata_model_unittest.cc",
+    "projector/projector_ui_controller_unittest.cc",
     "quick_answers/quick_answers_controller_unittest.cc",
     "quick_answers/quick_answers_ui_controller_unittest.cc",
     "quick_answers/ui/quick_answers_view_unittest.cc",
@@ -2191,6 +2191,9 @@ test("ash_unittests") {
     "shelf/back_button_unittest.cc",
     "shelf/contextual_tooltip_unittest.cc",
     "shelf/drag_handle_unittest.cc",
+    "shelf/drag_window_from_shelf_controller_test_api.cc",
+    "shelf/drag_window_from_shelf_controller_test_api.h",
+    "shelf/drag_window_from_shelf_controller_unittest.cc",
     "shelf/home_button_unittest.cc",
     "shelf/home_to_overview_nudge_controller_unittest.cc",
     "shelf/hotseat_widget_unittest.cc",
@@ -2206,13 +2209,12 @@ test("ash_unittests") {
     "shelf/shelf_drag_handle_unittest.cc",
     "shelf/shelf_layout_manager_unittest.cc",
     "shelf/shelf_locking_manager_unittest.cc",
-    "shelf/shelf_test_util.cc",
-    "shelf/shelf_test_util.h",
     "shelf/shelf_tooltip_manager_unittest.cc",
     "shelf/shelf_unittest.cc",
     "shelf/shelf_view_unittest.cc",
     "shelf/shelf_widget_unittest.cc",
     "shelf/shelf_window_watcher_unittest.cc",
+    "shelf/swipe_home_to_overview_controller_unittest.cc",
     "shelf/test/hotseat_state_watcher.cc",
     "shelf/test/hotseat_state_watcher.h",
     "shelf/test/shelf_layout_manager_test_base.cc",
@@ -2220,8 +2222,6 @@ test("ash_unittests") {
     "shelf/test/widget_animation_smoothness_inspector.cc",
     "shelf/test/widget_animation_smoothness_inspector.h",
     "shell_unittest.cc",
-    "sticky_keys/sticky_keys_overlay_unittest.cc",
-    "sticky_keys/sticky_keys_unittest.cc",
     "system/accessibility/accessibility_feature_pod_controller_unittest.cc",
     "system/accessibility/autoclick_menu_bubble_controller_unittest.cc",
     "system/accessibility/dictation_button_tray_unittest.cc",
@@ -2309,6 +2309,7 @@ test("ash_unittests") {
     "system/tracing_notification_controller_unittest.cc",
     "system/tray/size_range_layout_unittest.cc",
     "system/tray/status_area_overflow_button_tray_unittest.cc",
+    "system/tray/tray_background_view_unittest.cc",
     "system/tray/tray_event_filter_unittest.cc",
     "system/tray/tri_view_unittest.cc",
     "system/unified/camera_mic_tray_item_view_unittest.cc",
@@ -2332,7 +2333,9 @@ test("ash_unittests") {
     "tray_action/test_tray_action_client.cc",
     "tray_action/test_tray_action_client.h",
     "tray_action/tray_action_unittest.cc",
+    "utility/layer_copy_animator_unittest.cc",
     "utility/layer_util_unittest.cc",
+    "utility/occlusion_tracker_pauser_unittest.cc",
     "utility/screenshot_controller_unittest.cc",
     "wallpaper/wallpaper_controller_unittest.cc",
     "wallpaper/wallpaper_utils/wallpaper_color_calculator_unittest.cc",
@@ -2430,10 +2433,12 @@ test("ash_unittests") {
     ":test_support",
     "//ash/app_list",
     "//ash/app_list:test_support",
+    "//ash/app_list:unit_tests",
     "//ash/app_menu",
     "//ash/assistant/model",
     "//ash/assistant/ui",
-    "//ash/assistant/ui:constants",
+
+    ###"//ash/assistant/ui:constants",
     "//ash/assistant/ui/test_support",
     "//ash/assistant/util",
     "//ash/components:unit_tests",
@@ -2481,6 +2486,7 @@ test("ash_unittests") {
     "//chromeos/ui/vector_icons",
     "//components/account_id",
     "//components/arc:notification_test_support",
+    "//components/full_restore",
     "//components/media_message_center",
     "//components/password_manager/core/browser:hash_password_manager",
     "//components/prefs:test_support",
@@ -2516,6 +2522,7 @@ test("ash_unittests") {
     "//ui/base:test_support",
     "//ui/base/cursor:cursor_base",
     "//ui/base/cursor/mojom:cursor_type",
+    "//ui/base/dragdrop:types",
     "//ui/base/dragdrop/mojom",
     "//ui/base/ime",
     "//ui/base/ime/chromeos",
@@ -2607,6 +2614,7 @@ static_library("test_support") {
   testonly = true
   friend = [
     ":*",
+    "//ash/app_list:*",
     "//ash/shortcut_viewer:*",
     "//components/exo:*",
     "//components/exo/wayland:*",
@@ -2632,8 +2640,8 @@ static_library("test_support") {
     "app_list/app_list_test_api.cc",
     "app_list/test/app_list_test_helper.cc",
     "app_list/test/app_list_test_helper.h",
-    "app_list/test/test_app_list_client.cc",
-    "app_list/test/test_app_list_client.h",
+    "app_list/test_app_list_client.cc",
+    "app_list/test_app_list_client.h",
     "app_list/views/assistant/assistant_test_api_impl.cc",
     "app_list/views/assistant/assistant_test_api_impl.h",
     "app_menu/notification_menu_view_test_api.cc",
@@ -2678,6 +2686,8 @@ static_library("test_support") {
     "lock_screen_action/test_lock_screen_action_background_controller.cc",
     "lock_screen_action/test_lock_screen_action_background_controller.h",
     "login/login_screen_test_api.cc",
+    "marker/marker_controller_test_api.cc",
+    "marker/marker_controller_test_api.h",
     "metrics/task_switch_time_tracker_test_api.cc",
     "metrics/task_switch_time_tracker_test_api.h",
     "metrics/user_metrics_recorder_test_api.cc",
@@ -2697,6 +2707,8 @@ static_library("test_support") {
     "shelf/shelf_button_pressed_metric_tracker_test_api.h",
     "shelf/shelf_focus_cycler.cc",
     "shelf/shelf_focus_cycler.h",
+    "shelf/shelf_test_util.cc",
+    "shelf/shelf_test_util.h",
     "shelf/shelf_view_test_api.cc",
     "shelf/shelf_view_test_api.h",
     "shelf/test/widget_animation_waiter.cc",
diff --git a/chromium/ash/app_list/BUILD.gn b/chromium/ash/app_list/BUILD.gn
index 79712b1cac1..c70ec08dcff 100644
--- a/chromium/ash/app_list/BUILD.gn
+++ b/chromium/ash/app_list/BUILD.gn
@@ -7,17 +7,23 @@ import("//testing/test.gni")
 
 assert(is_chromeos)
 
-component("app_list") {
+source_set("app_list") {
   sources = [
-    "app_list_export.h",
+    "app_list_color_provider_impl.cc",
+    "app_list_color_provider_impl.h",
+    "app_list_controller_impl.cc",
+    "app_list_controller_impl.h",
     "app_list_metrics.cc",
     "app_list_metrics.h",
     "app_list_presenter_delegate.h",
+    "app_list_presenter_delegate_impl.cc",
+    "app_list_presenter_delegate_impl.h",
     "app_list_presenter_impl.cc",
     "app_list_presenter_impl.h",
     "app_list_util.cc",
     "app_list_util.h",
     "app_list_view_delegate.h",
+    "home_launcher_animation_info.h",
     "paged_view_structure.cc",
     "paged_view_structure.h",
     "views/app_list_drag_and_drop_host.h",
@@ -100,7 +106,8 @@ component("app_list") {
     "views/top_icon_animation_view.h",
   ]
 
-  defines = [ "APP_LIST_IMPLEMENTATION" ]
+  # Needed because this source_set implements part of the "ash" component.
+  defines = [ "ASH_IMPLEMENTATION" ]
 
   deps = [
     "//ash/app_list/resources",
@@ -122,7 +129,11 @@ component("app_list") {
     "//chromeos/services/assistant/public/cpp",
     "//chromeos/ui/vector_icons",
     "//components/keyed_service/core",
+    "//components/pref_registry",
+    "//components/prefs",
+    "//components/services/app_service/public/cpp:app_update",
     "//components/sync",
+    "//extensions/common:common_constants",
     "//mojo/public/cpp/bindings",
     "//skia",
     "//third_party/icu",
@@ -134,9 +145,11 @@ component("app_list") {
     "//ui/compositor",
     "//ui/compositor_extra",
     "//ui/display",
+    "//ui/display/manager",
     "//ui/events",
     "//ui/gfx",
     "//ui/gfx/geometry",
+    "//ui/native_theme",
     "//ui/resources",
     "//ui/strings",
     "//ui/views",
@@ -147,7 +160,6 @@ component("app_list") {
   # TODO(hejq): Remove this once app_list is migrated. http://crbug.com/733662
   public_deps = [
     "//ash/app_list/model:app_list_model",
-    "//ash/app_list/model:search_model",
     "//ash/public/cpp",
     "//base",
     "//mojo/public/cpp/bindings",
@@ -160,18 +172,18 @@ component("app_list") {
   ]
 }
 
-static_library("test_support") {
+source_set("test_support") {
   testonly = true
 
   sources = [
-    "test/app_list_test_model.cc",
-    "test/app_list_test_model.h",
-    "test/app_list_test_view_delegate.cc",
-    "test/app_list_test_view_delegate.h",
-    "test/test_search_result.cc",
-    "test/test_search_result.h",
-    "views/test/apps_grid_view_test_api.cc",
-    "views/test/apps_grid_view_test_api.h",
+    "app_list_test_view_delegate.cc",
+    "app_list_test_view_delegate.h",
+    "model/app_list_test_model.cc",
+    "model/app_list_test_model.h",
+    "model/search/test_search_result.cc",
+    "model/search/test_search_result.h",
+    "views/apps_grid_view_test_api.cc",
+    "views/apps_grid_view_test_api.h",
   ]
 
   deps = [
@@ -185,39 +197,23 @@ static_library("test_support") {
   ]
 }
 
-executable("app_list_demo") {
+source_set("unit_tests") {
   testonly = true
 
-  sources = [ "demo/app_list_demo_views.cc" ]
-
-  deps = [
-    ":app_list",
-    ":test_support",
-    "//base",
-    "//build/win:default_exe_manifest",
-    "//content",
-    "//content/public/browser",
-    "//skia",
-    "//ui/base",
-    "//ui/events",
-    "//ui/resources",
-    "//ui/resources:ui_test_pak",
-    "//ui/views",
-    "//ui/views_content_client",
-    "//url",
-  ]
-}
-
-test("app_list_unittests") {
-  use_xvfb = use_xvfb_in_this_config
-
   sources = [
+    "app_list_controller_impl_unittest.cc",
+    "app_list_metrics_unittest.cc",
+    "app_list_presenter_delegate_unittest.cc",
+    "app_list_presenter_impl_unittest.cc",
+    "app_list_unittest.cc",
     "folder_image_unittest.cc",
-    "test/run_all_unittests.cc",
+    "model/app_list_item_list_unittest.cc",
+    "model/app_list_model_unittest.cc",
     "views/app_list_main_view_unittest.cc",
     "views/app_list_menu_model_adapter_unittest.cc",
     "views/app_list_view_unittest.cc",
     "views/apps_grid_view_unittest.cc",
+    "views/assistant/assistant_page_view_unittest.cc",
     "views/folder_header_view_unittest.cc",
     "views/privacy_container_view_unittest.cc",
     "views/result_selection_controller_unittest.cc",
@@ -232,8 +228,13 @@ test("app_list_unittests") {
   deps = [
     ":app_list",
     ":test_support",
+    "//ash:test_support",
+    "//ash/assistant/model",
+    "//ash/assistant/ui",
+    "//ash/assistant/ui:constants",
     "//ash/constants",
     "//ash/keyboard/ui",
+    "//ash/keyboard/ui:test_support",
     "//ash/public/cpp",
     "//ash/public/cpp:test_support",
     "//ash/public/cpp/app_list/vector_icons",
@@ -246,12 +247,16 @@ test("app_list_unittests") {
     "//skia",
     "//testing/gtest",
     "//ui/accessibility",
+    "//ui/aura:test_support",
     "//ui/base",
     "//ui/compositor",
+    "//ui/display:display_manager_test_api",
     "//ui/events:test_support",
     "//ui/gfx:test_support",
     "//ui/gl:test_support",
+    "//ui/message_center",
     "//ui/resources",
+    "//ui/touch_selection",
     "//ui/views",
     "//ui/views:test_support",
   ]
diff --git a/chromium/ash/app_list/model/BUILD.gn b/chromium/ash/app_list/model/BUILD.gn
index 76bbc61a980..6451c9caf66 100644
--- a/chromium/ash/app_list/model/BUILD.gn
+++ b/chromium/ash/app_list/model/BUILD.gn
@@ -10,31 +10,17 @@ component("app_list_model") {
     "app_list_item.h",
     "app_list_item_list.cc",
     "app_list_item_list.h",
+    "app_list_item_list_observer.cc",
     "app_list_item_list_observer.h",
+    "app_list_item_observer.cc",
     "app_list_item_observer.h",
     "app_list_model.cc",
     "app_list_model.h",
+    "app_list_model_export.h",
+    "app_list_model_observer.cc",
     "app_list_model_observer.h",
     "folder_image.cc",
     "folder_image.h",
-  ]
-
-  defines = [ "APP_LIST_MODEL_IMPLEMENTATION" ]
-
-  deps = [
-    "//ash/public/cpp:cpp",
-    "//base:i18n",
-    "//cc/paint",
-    "//components/sync",
-    "//skia",
-    "//third_party/icu",
-    "//ui/base",
-    "//ui/gfx",
-  ]
-}
-
-component("search_model") {
-  sources = [
     "search/search_box_model.cc",
     "search/search_box_model.h",
     "search/search_box_model_observer.h",
@@ -50,6 +36,10 @@ component("search_model") {
   deps = [
     "//ash/public/cpp:cpp",
     "//base:i18n",
+    "//cc/paint",
+    "//components/sync",
+    "//skia",
+    "//third_party/icu",
     "//ui/base",
     "//ui/gfx",
   ]
diff --git a/chromium/ash/assistant/ui/BUILD.gn b/chromium/ash/assistant/ui/BUILD.gn
index 6ffee877b37..d3c372995fd 100644
--- a/chromium/ash/assistant/ui/BUILD.gn
+++ b/chromium/ash/assistant/ui/BUILD.gn
@@ -98,6 +98,7 @@ component("ui") {
     "//chromeos/assistant:buildflags",
     "//chromeos/services/assistant/public/cpp",
     "//chromeos/services/assistant/public/mojom",
+    "//chromeos/services/libassistant/public/cpp:structs",
     "//chromeos/ui/vector_icons",
     "//ui/aura",
     "//ui/compositor",
diff --git a/chromium/ash/components/account_manager/BUILD.gn b/chromium/ash/components/account_manager/BUILD.gn
index d60eec29f84..9b131d98a36 100644
--- a/chromium/ash/components/account_manager/BUILD.gn
+++ b/chromium/ash/components/account_manager/BUILD.gn
@@ -9,6 +9,8 @@ assert(is_chromeos_ash, "Non-ChromeOS builds cannot depend on //ash")
 
 component("account_manager") {
   sources = [
+    "access_token_fetcher.cc",
+    "access_token_fetcher.h",
     "account_manager.cc",
     "account_manager.h",
     "account_manager_ash.cc",
@@ -50,6 +52,7 @@ source_set("unit_tests") {
     "//base/test:test_support",
     "//chromeos/crosapi/mojom",
     "//components/prefs:test_support",
+    "//google_apis",
     "//net",
     "//services/network:test_support",
     "//services/network/public/cpp:cpp",
diff --git a/chromium/ash/components/pcie_peripheral/BUILD.gn b/chromium/ash/components/pcie_peripheral/BUILD.gn
index 569d73e546c..65d0ce87030 100644
--- a/chromium/ash/components/pcie_peripheral/BUILD.gn
+++ b/chromium/ash/components/pcie_peripheral/BUILD.gn
@@ -11,6 +11,7 @@ component("pcie_peripheral") {
 
   deps = [
     "//base",
+    "//chromeos/dbus/pciguard",
     "//chromeos/dbus/typecd",
   ]
 
@@ -28,6 +29,7 @@ source_set("unit_tests") {
   deps = [
     ":pcie_peripheral",
     "//base/test:test_support",
+    "//chromeos/dbus/pciguard",
     "//chromeos/dbus/typecd",
     "//services/device/public/cpp:test_support",
     "//testing/gtest",
diff --git a/chromium/ash/components/resources/BUILD.gn b/chromium/ash/components/resources/BUILD.gn
new file mode 100644
index 00000000000..71d99dfbccc
--- /dev/null
+++ b/chromium/ash/components/resources/BUILD.gn
@@ -0,0 +1,25 @@
+# Copyright 2021 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//tools/grit/grit_rule.gni")
+
+assert(is_chromeos_ash, "Non-ChromeOS builds cannot depend on //ash")
+
+grit("scanning_app_resources") {
+  source = "../../content/scanning/resources/scanning_app_resources.grd"
+
+  deps = [
+    "../../content/scanning/mojom:mojom_js",
+    "../../content/scanning/resources:web_components",
+  ]
+
+  outputs = [
+    "ash_scanning_app_resources.pak",
+    "grit/ash_scanning_app_resources.h",
+    "grit/ash_scanning_app_resources_map.cc",
+    "grit/ash_scanning_app_resources_map.h",
+  ]
+
+  output_dir = "$root_gen_dir/ash"
+}
diff --git a/chromium/ash/content/BUILD.gn b/chromium/ash/content/BUILD.gn
new file mode 100644
index 00000000000..50e4443aeac
--- /dev/null
+++ b/chromium/ash/content/BUILD.gn
@@ -0,0 +1,25 @@
+# Copyright 2021 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//testing/test.gni")
+
+assert(is_chromeos_ash, "Non-ChromeOS builds cannot depend on //ash")
+
+# To add a unit test to this target, make a "unit_test" source_set in your
+# component and add a reference here.
+test("ash_content_unittests") {
+  sources = [ "run_all_unittests.cc" ]
+
+  deps = [
+    "//ash/content/scanning:unit_tests",
+    "//base",
+    "//base/test:test_support",
+    "//build:chromeos_buildflags",
+  ]
+}
+
+group("closure_compile") {
+  testonly = true
+  deps = [ "//ash/content/scanning:closure_compile" ]
+}
diff --git a/chromium/ash/content/scanning/BUILD.gn b/chromium/ash/content/scanning/BUILD.gn
new file mode 100644
index 00000000000..8f6fd6169fc
--- /dev/null
+++ b/chromium/ash/content/scanning/BUILD.gn
@@ -0,0 +1,55 @@
+# 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("//testing/test.gni")
+
+assert(is_chromeos, "Scanning App is Chrome OS only")
+
+static_library("scanning") {
+  sources = [
+    "scanning_app_delegate.h",
+    "scanning_handler.cc",
+    "scanning_handler.h",
+    "scanning_metrics_handler.cc",
+    "scanning_metrics_handler.h",
+    "scanning_ui.cc",
+    "scanning_ui.h",
+    "scanning_uma.cc",
+    "scanning_uma.h",
+    "url_constants.cc",
+    "url_constants.h",
+  ]
+
+  deps = [
+    "//ash/components/resources:scanning_app_resources",
+    "//ash/constants",
+    "//ash/content/scanning/mojom",
+    "//chromeos/strings/",
+    "//content/public/browser",
+    "//ui/base",
+    "//ui/gfx",
+    "//ui/resources",
+    "//ui/shell_dialogs",
+    "//ui/webui",
+  ]
+}
+
+group("closure_compile") {
+  deps = [ "resources:closure_compile_module" ]
+}
+
+source_set("unit_tests") {
+  testonly = true
+
+  sources = [ "scanning_handler_unittest.cc" ]
+
+  deps = [
+    ":scanning",
+    "//ash/constants",
+    "//base",
+    "//content/test:test_support",
+    "//testing/gtest",
+    "//ui/shell_dialogs",
+  ]
+}
diff --git a/chromium/ash/content/scanning/mojom/BUILD.gn b/chromium/ash/content/scanning/mojom/BUILD.gn
new file mode 100644
index 00000000000..60853662f61
--- /dev/null
+++ b/chromium/ash/content/scanning/mojom/BUILD.gn
@@ -0,0 +1,11 @@
+# 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 = [ "scanning.mojom" ]
+
+  public_deps = [ "//mojo/public/mojom/base" ]
+}
diff --git a/chromium/ash/content/scanning/mojom/scanning.mojom b/chromium/ash/content/scanning/mojom/scanning.mojom
new file mode 100644
index 00000000000..17d46f93be7
--- /dev/null
+++ b/chromium/ash/content/scanning/mojom/scanning.mojom
@@ -0,0 +1,163 @@
+// 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 ash.scanning.mojom;
+
+import "mojo/public/mojom/base/file_path.mojom";
+import "mojo/public/mojom/base/string16.mojom";
+import "mojo/public/mojom/base/unguessable_token.mojom";
+
+// These values are persisted to logs. Entries should not be renumbered and
+// numeric values should never be reused. Updates should be reflected in the
+// ScanJobSettings histogram enumeration.
+
+// The color modes that can be used to perform a scan.
+enum ColorMode {
+  kBlackAndWhite,
+  kGrayscale,
+  kColor,
+};
+
+// The file types that can be used when saving scanned images.
+enum FileType {
+  kJpg,
+  kPdf,
+  kPng,
+};
+
+// The source types from which a scan can be obtained.
+enum SourceType {
+  // An unknown source type.
+  kUnknown,
+  // A flatbed that scans a single page.
+  kFlatbed,
+  // An automatic document feeder that scans a single side of each page.
+  kAdfSimplex,
+  // An automatic document feeder that scans both sides of each page.
+  kAdfDuplex,
+  // The implicit source type used for scanners that do not report any source
+  // options.
+  kDefault,
+};
+
+// The page sizes that can be used to perform a scan.
+enum PageSize {
+  // ISO A4 (210 x 297 mm).
+  kIsoA4,
+  // NA Letter (216 x 279 mm).
+  kNaLetter,
+  // The page size resulting from scanning the scanner's entire scannable area.
+  kMax,
+};
+
+// The source from which a scan can be obtained.
+struct ScanSource {
+  // The type of this source.
+  SourceType type;
+  // The name of this source. Source names are unique to each SANE backend and
+  // are required to perform scans.
+  string name;
+  // The page sizes supported by this source.
+  array<PageSize> page_sizes;
+};
+
+// The capabilities a scanner supports.
+struct ScannerCapabilities {
+  array<ScanSource> sources;
+  array<ColorMode> color_modes;
+  array<uint32> resolutions;
+};
+
+// Settings used to perform a scan.
+struct ScanSettings {
+  // The SANE name of the ScanSource from which to scan.
+  string source_name;
+  // The location to save scanned images to.
+  mojo_base.mojom.FilePath scan_to_path;
+  // The file type to use when saving scanned images.
+  FileType file_type;
+  // The color mode with which to scan.
+  ColorMode color_mode;
+  // The page size with which to scan.
+  PageSize page_size;
+  // The resolution with which to scan in DPI.
+  uint32 resolution_dpi;
+};
+
+// Represents a connected scanner.
+struct Scanner {
+  // The scanner's unique identifier.
+  mojo_base.mojom.UnguessableToken id;
+  // The scanner's display name.
+  mojo_base.mojom.String16 display_name;
+};
+
+// The result of a scan job.
+enum ScanResult {
+  // The scan completed successfully.
+  kSuccess,
+  // An unknown or generic error occurred.
+  kUnknownError,
+  // The device is busy.
+  kDeviceBusy,
+  // The document feeder is jammed.
+  kAdfJammed,
+  // The document feeder is empty.
+  kAdfEmpty,
+  // The flatbed cover is open.
+  kFlatbedOpen,
+  // An error occurred while communicating with the device.
+  kIoError,
+};
+
+// Observer interface used to send remote updates about an in-progress scan job
+// to the Scan app (chrome://scanning) receiver. When the corresponding scan job
+// is complete, the remote and receiver are disconnected.
+interface ScanJobObserver {
+  // Called when the progress percent of the page currently being scanned
+  // changes. |page_number| indicates which page the update is for.
+  OnPageProgress(uint32 page_number, uint32 progress_percent);
+
+  // Called when scanning a page is complete. |page_data| contains the page's
+  // image data encoded as a PNG.
+  // TODO(b/184747389): Send a lower resolution preview.
+  OnPageComplete(array<uint8> page_data);
+
+  // Called when the scan is complete. |result| indicates the result of the scan
+  // and is set to kSuccess when the scan completes successfully.
+  // |scanned_file_paths| contains all the file paths of the pages scanned in a
+  // scan job. |scanned_file_paths| is an empty array for failed scans.
+  OnScanComplete(ScanResult result,
+      array<mojo_base.mojom.FilePath> scanned_file_paths);
+
+  // Called when canceling the current scan job is complete. |success|
+  // indicates whether the scan job was cancelled successfully.
+  OnCancelComplete(bool success);
+};
+
+// Interface used to obtain information about and interact with connected
+// scanners. It is implemented in the browser and exposed to the Scan app
+// (chrome://scanning).
+interface ScanService {
+  // Returns the connected scanners. Obtaining a scanner's capabilities is
+  // implemented in a separate method to minimize the amount of time clients
+  // must wait before receiving the scanners and displaying their display names.
+  GetScanners() => (array<Scanner> scanners);
+
+  // Returns the capabilities of the scanner identified by |scanner_id|.
+  // TODO(b/184747756): Return a boolean to indicate whether the capabilities
+  // were obtained via a secure protocol.
+  GetScannerCapabilities(mojo_base.mojom.UnguessableToken scanner_id)
+      => (ScannerCapabilities capabilities);
+
+  // Starts a scan with the scanner identified by |scanner_id| using the
+  // provided |settings|. Scan job events are reported to the client via the
+  // |observer|. |success| indicates whether the scan started successfully.
+  StartScan(mojo_base.mojom.UnguessableToken scanner_id, ScanSettings settings,
+      pending_remote<ScanJobObserver> observer) => (bool success);
+
+  // Attempts to cancel the currently running scan job. The success of the
+  // cancel attempt is reported through the ScanJobObserver.
+  CancelScan();
+};
diff --git a/chromium/ash/content/scanning/resources/BUILD.gn b/chromium/ash/content/scanning/resources/BUILD.gn
new file mode 100644
index 00000000000..b22c7289c7e
--- /dev/null
+++ b/chromium/ash/content/scanning/resources/BUILD.gn
@@ -0,0 +1,181 @@
+# 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("//third_party/closure_compiler/compile_js.gni")
+import("//tools/grit/grit_rule.gni")
+import("//tools/grit/repack.gni")
+import("//tools/polymer/html_to_js.gni")
+
+js_type_check("closure_compile_module") {
+  is_polymer3 = true
+  deps = [
+    ":color_mode_select",
+    ":file_type_select",
+    ":loading_page",
+    ":mojo_interface_provider",
+    ":page_size_select",
+    ":resolution_select",
+    ":scan_done_section",
+    ":scan_preview",
+    ":scan_to_select",
+    ":scanner_select",
+    ":scanning_app",
+    ":scanning_app_types",
+    ":scanning_app_util",
+    ":scanning_browser_proxy",
+    ":select_behavior",
+    ":source_select",
+  ]
+}
+
+js_library("color_mode_select") {
+  deps = [
+    ":scanning_app_util",
+    ":select_behavior",
+    "//ash/content/scanning/mojom:mojom_js_library_for_compile",
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/js:i18n_behavior.m",
+  ]
+}
+
+js_library("loading_page") {
+  deps = [
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/js:i18n_behavior.m",
+  ]
+}
+
+js_library("file_type_select") {
+  deps = [
+    "//ash/content/scanning/mojom:mojom_js_library_for_compile",
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/js:i18n_behavior.m",
+  ]
+}
+
+js_library("page_size_select") {
+  deps = [
+    ":scanning_app_util",
+    ":select_behavior",
+    "//ash/content/scanning/mojom:mojom_js_library_for_compile",
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/js:i18n_behavior.m",
+  ]
+}
+
+js_library("resolution_select") {
+  deps = [
+    ":select_behavior",
+    "//ash/content/scanning/mojom:mojom_js_library_for_compile",
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/js:i18n_behavior.m",
+  ]
+}
+
+js_library("scan_done_section") {
+  deps = [
+    ":scanning_app_types",
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/js:i18n_behavior.m",
+  ]
+}
+
+js_library("scan_preview") {
+  deps = [
+    ":scanning_app_types",
+    ":scanning_app_util",
+    "//ash/content/scanning/mojom:mojom_js_library_for_compile",
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/js:i18n_behavior.m",
+  ]
+}
+
+js_library("scan_to_select") {
+  deps = [
+    "//ash/content/scanning/mojom:mojom_js_library_for_compile",
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/js:i18n_behavior.m",
+  ]
+}
+
+js_library("scanner_select") {
+  deps = [
+    ":scanning_app_types",
+    ":scanning_app_util",
+    "//ash/content/scanning/mojom:mojom_js_library_for_compile",
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/js:i18n_behavior.m",
+  ]
+}
+
+js_library("scanning_app") {
+  deps = [
+    ":color_mode_select",
+    ":file_type_select",
+    ":loading_page",
+    ":mojo_interface_provider",
+    ":page_size_select",
+    ":resolution_select",
+    ":scan_preview",
+    ":scan_to_select",
+    ":scanner_select",
+    ":scanning_app_types",
+    ":scanning_app_util",
+    ":scanning_browser_proxy",
+    ":source_select",
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/cr_elements:cr_container_shadow_behavior.m",
+    "//ui/webui/resources/cr_elements/cr_toast:cr_toast.m",
+    "//ui/webui/resources/js:i18n_behavior.m",
+  ]
+}
+
+js_library("scanning_app_types") {
+}
+
+js_library("scanning_app_util") {
+}
+
+js_library("select_behavior") {
+}
+
+js_library("source_select") {
+  deps = [
+    ":scanning_app_util",
+    ":select_behavior",
+    "//ash/content/scanning/mojom:mojom_js_library_for_compile",
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/js:i18n_behavior.m",
+  ]
+}
+
+js_library("scanning_browser_proxy") {
+  deps = [ "//ui/webui/resources/js:cr.m" ]
+}
+
+js_library("mojo_interface_provider") {
+  deps = [
+    "//ash/content/scanning/mojom:mojom_js_library_for_compile",
+    "//ui/webui/resources/js:cr.m",
+  ]
+}
+
+html_to_js("web_components") {
+  js_files = [
+    "color_mode_select.js",
+    "file_type_select.js",
+    "loading_page.js",
+    "page_size_select.js",
+    "resolution_select.js",
+    "scan_preview.js",
+    "scan_done_section.js",
+    "scan_settings_section.js",
+    "scanner_select.js",
+    "scan_to_select.js",
+    "scanning_app.js",
+    "scanning_fonts_css.js",
+    "scanning_shared_css.js",
+    "source_select.js",
+  ]
+}
diff --git a/chromium/ash/public/cpp/BUILD.gn b/chromium/ash/public/cpp/BUILD.gn
index 655315d8d4f..4a49bb28149 100644
--- a/chromium/ash/public/cpp/BUILD.gn
+++ b/chromium/ash/public/cpp/BUILD.gn
@@ -227,10 +227,14 @@ component("cpp") {
     "projector/projector_client.h",
     "projector/projector_controller.cc",
     "projector/projector_controller.h",
+    "projector/projector_session.cc",
+    "projector/projector_session.h",
     "quick_answers/controller/quick_answers_browser_client.cc",
     "quick_answers/controller/quick_answers_browser_client.h",
     "quick_answers/controller/quick_answers_controller.cc",
     "quick_answers/controller/quick_answers_controller.h",
+    "quick_answers/quick_answers_state.cc",
+    "quick_answers/quick_answers_state.h",
     "rounded_corner_decorator.cc",
     "rounded_corner_decorator.h",
     "rounded_image_view.cc",
@@ -280,7 +284,7 @@ component("cpp") {
     "system_tray.cc",
     "system_tray.h",
     "system_tray_client.h",
-    "system_tray_focus_observer.h",
+    "system_tray_observer.h",
     "tablet_mode.cc",
     "tablet_mode.h",
     "tablet_mode_observer.h",
@@ -322,6 +326,7 @@ component("cpp") {
   deps = [
     "//ash/constants",
     "//base/util/values:values_util",
+    "//chromeos/components/quick_answers/public/cpp:prefs",
     "//chromeos/dbus/power:power_manager_proto",
     "//chromeos/services/assistant/public/cpp",
     "//chromeos/services/cellular_setup:in_process_esim_manager",
diff --git a/chromium/ash/public/mojom/cros_display_config.mojom b/chromium/ash/public/mojom/cros_display_config.mojom
index 61b51204b71..00db9b52ceb 100644
--- a/chromium/ash/public/mojom/cros_display_config.mojom
+++ b/chromium/ash/public/mojom/cros_display_config.mojom
@@ -190,8 +190,9 @@ struct DisplayUnitInfo {
   bool is_internal;
   // True if this display is enabled.
   bool is_enabled;
-  // True when the device is in tablet physical state.
-  bool is_in_tablet_physical_state;
+  // True if auto-rotation is allowed. It happens when the device is in a
+  // physical tablet state or kSupportsClamshellAutoRotation is set.
+  bool is_auto_rotation_allowed;
   // True if this display has a touch input device associated with it.
   bool has_touch_support;
   // True if this display has an accelerometer associated with it.
@@ -229,8 +230,8 @@ struct DisplayConfigProperties {
   // Note: overscan values may not be negative or larger than a half of the
   // screen's size. Overscan cannot be changed on the internal monitor.
   gfx.mojom.Insets? overscan;
-  // If provided updates the display's rotation, or if the device is in a
-  // physical tablet state, it can be used to set or clear the user rotation
+  // If provided updates the display's rotation, or if the auto-rotation is
+  // allowed in the device, it can be used to set or clear the user rotation
   // lock, enabling or disabling auto-rotation.
   DisplayRotation? rotation;
   // If provided, updates the display's logical bounds origin. Note: when
diff --git a/chromium/ash/resources/vector_icons/BUILD.gn b/chromium/ash/resources/vector_icons/BUILD.gn
index 726c8c4f2d2..91f1e6e2239 100644
--- a/chromium/ash/resources/vector_icons/BUILD.gn
+++ b/chromium/ash/resources/vector_icons/BUILD.gn
@@ -177,6 +177,7 @@ aggregate_vector_icons("ash_vector_icons") {
     "privacy_screen.icon",
     "projector_drag_handle.icon",
     "projector_key_idea.icon",
+    "projector_marker.icon",
     "remove_circle_outline.icon",
     "select_to_speak_next_paragraph.icon",
     "select_to_speak_next_sentence.icon",
diff --git a/chromium/ash/services/recording/public/mojom/BUILD.gn b/chromium/ash/services/recording/public/mojom/BUILD.gn
index b59b7b0156f..99626923a21 100644
--- a/chromium/ash/services/recording/public/mojom/BUILD.gn
+++ b/chromium/ash/services/recording/public/mojom/BUILD.gn
@@ -9,7 +9,6 @@ mojom("mojom") {
 
   deps = [
     "//media/mojo/mojom",
-    "//services/audio/public/mojom",
     "//services/viz/privileged/mojom/compositing",
     "//ui/gfx/image/mojom",
   ]
diff --git a/chromium/ash/services/recording/public/mojom/recording_service.mojom b/chromium/ash/services/recording/public/mojom/recording_service.mojom
index 30bbd81fd8e..6744cde67ed 100644
--- a/chromium/ash/services/recording/public/mojom/recording_service.mojom
+++ b/chromium/ash/services/recording/public/mojom/recording_service.mojom
@@ -4,8 +4,8 @@
 
 module recording.mojom;
 
+import "media/mojo/mojom/audio_stream_factory.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 "services/viz/public/mojom/compositing/subtree_capture_id.mojom";
@@ -57,7 +57,7 @@ interface RecordingService {
   RecordFullscreen(
       pending_remote<RecordingServiceClient> client,
       pending_remote<viz.mojom.FrameSinkVideoCapturer> video_capturer,
-      pending_remote<audio.mojom.StreamFactory>? audio_stream_factory,
+      pending_remote<media.mojom.AudioStreamFactory>? audio_stream_factory,
       viz.mojom.FrameSinkId frame_sink_id,
       gfx.mojom.Size frame_sink_size);
 
@@ -83,7 +83,7 @@ interface RecordingService {
   RecordWindow(
       pending_remote<RecordingServiceClient> client,
       pending_remote<viz.mojom.FrameSinkVideoCapturer> video_capturer,
-      pending_remote<audio.mojom.StreamFactory>? audio_stream_factory,
+      pending_remote<media.mojom.AudioStreamFactory>? audio_stream_factory,
       viz.mojom.FrameSinkId frame_sink_id,
       gfx.mojom.Size frame_sink_size,
       viz.mojom.SubtreeCaptureId subtree_capture_id,
@@ -102,7 +102,7 @@ interface RecordingService {
   RecordRegion(
       pending_remote<RecordingServiceClient> client,
       pending_remote<viz.mojom.FrameSinkVideoCapturer> video_capturer,
-      pending_remote<audio.mojom.StreamFactory>? audio_stream_factory,
+      pending_remote<media.mojom.AudioStreamFactory>? audio_stream_factory,
       viz.mojom.FrameSinkId frame_sink_id,
       gfx.mojom.Size frame_sink_size,
       gfx.mojom.Rect crop_region);
diff --git a/chromium/ash/shortcut_viewer/strings/BUILD.gn b/chromium/ash/shortcut_viewer/strings/BUILD.gn
index a2f8a466963..37f46425d2d 100644
--- a/chromium/ash/shortcut_viewer/strings/BUILD.gn
+++ b/chromium/ash/shortcut_viewer/strings/BUILD.gn
@@ -9,6 +9,6 @@ grit("strings") {
   source = "../shortcut_viewer_strings.grd"
   outputs = [ "grit/shortcut_viewer_strings.h" ] +
             process_file_template(
-                locales_with_fake_bidi,
+                locales_with_pseudolocales,
                 [ "shortcut_viewer_strings_{{source_name_part}}.pak" ])
 }
diff --git a/chromium/ash/strings/BUILD.gn b/chromium/ash/strings/BUILD.gn
index 48b58a51be3..12462fcb9c0 100644
--- a/chromium/ash/strings/BUILD.gn
+++ b/chromium/ash/strings/BUILD.gn
@@ -12,7 +12,7 @@ grit("strings") {
   source = "../ash_strings.grd"
   defines = [ "is_chrome_branded=$is_chrome_branded" ]
   outputs = [ "grit/ash_strings.h" ] +
-            process_file_template(locales_with_fake_bidi,
+            process_file_template(locales_with_pseudolocales,
                                   [ "ash_strings_{{source_name_part}}.pak" ])
 }