BASELINE: Update Chromium to 87.0.4280.67

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

14 files changed, 261 insertions, 127 deletions

diff --git a/chromium/ash/BUILD.gn b/chromium/ash/BUILD.gn
index 5e4ecc9c3d5..9552865cf56 100644
--- a/chromium/ash/BUILD.gn
+++ b/chromium/ash/BUILD.gn
@@ -205,6 +205,8 @@ 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",
@@ -247,6 +249,10 @@ component("ash") {
     "autoclick/autoclick_scroll_position_handler.cc",
     "autoclick/autoclick_scroll_position_handler.h",
     "autotest_private_api_utils.cc",
+    "bloom/bloom_ui_controller_impl.cc",
+    "bloom/bloom_ui_controller_impl.h",
+    "bloom/bloom_ui_delegate_impl.cc",
+    "bloom/bloom_ui_delegate_impl.h",
     "bluetooth_devices_observer.cc",
     "bluetooth_devices_observer.h",
     "cancel_mode.cc",
@@ -272,14 +278,31 @@ component("ash") {
     "capture_mode/stop_recording_button_tray.cc",
     "capture_mode/stop_recording_button_tray.h",
     "capture_mode/view_with_ink_drop.h",
+    "child_accounts/parent_access_controller_impl.cc",
+    "child_accounts/parent_access_controller_impl.h",
     "clipboard/clipboard_history.cc",
     "clipboard/clipboard_history.h",
-    "clipboard/clipboard_history_controller.cc",
-    "clipboard/clipboard_history_controller.h",
-    "clipboard/clipboard_history_helper.cc",
-    "clipboard/clipboard_history_helper.h",
+    "clipboard/clipboard_history_controller_impl.cc",
+    "clipboard/clipboard_history_controller_impl.h",
+    "clipboard/clipboard_history_item.cc",
+    "clipboard/clipboard_history_item.h",
     "clipboard/clipboard_history_menu_model_adapter.cc",
     "clipboard/clipboard_history_menu_model_adapter.h",
+    "clipboard/clipboard_history_resource_manager.cc",
+    "clipboard/clipboard_history_resource_manager.h",
+    "clipboard/clipboard_history_util.cc",
+    "clipboard/clipboard_history_util.h",
+    "clipboard/clipboard_nudge.cc",
+    "clipboard/clipboard_nudge.h",
+    "clipboard/clipboard_nudge_constants.h",
+    "clipboard/clipboard_nudge_controller.cc",
+    "clipboard/clipboard_nudge_controller.h",
+    "clipboard/views/clipboard_history_bitmap_item_view.cc",
+    "clipboard/views/clipboard_history_bitmap_item_view.h",
+    "clipboard/views/clipboard_history_item_view.cc",
+    "clipboard/views/clipboard_history_item_view.h",
+    "clipboard/views/clipboard_history_text_item_view.cc",
+    "clipboard/views/clipboard_history_text_item_view.h",
     "dbus/ash_dbus_services.cc",
     "dbus/ash_dbus_services.h",
     "dbus/display_service_provider.cc",
@@ -430,8 +453,6 @@ component("ash") {
     "highlighter/highlighter_result_view.h",
     "highlighter/highlighter_view.cc",
     "highlighter/highlighter_view.h",
-    "holding_space/holding_space_presenter.cc",
-    "holding_space/holding_space_presenter.h",
     "home_screen/drag_window_from_shelf_controller.cc",
     "home_screen/drag_window_from_shelf_controller.h",
     "home_screen/home_launcher_gesture_handler.cc",
@@ -470,6 +491,8 @@ component("ash") {
     "hud_display/graph_page_view_base.h",
     "hud_display/graphs_container_view.cc",
     "hud_display/graphs_container_view.h",
+    "hud_display/grid.cc",
+    "hud_display/grid.h",
     "hud_display/hud_constants.h",
     "hud_display/hud_display.cc",
     "hud_display/hud_display.h",
@@ -479,10 +502,14 @@ component("ash") {
     "hud_display/hud_properties.h",
     "hud_display/hud_settings_view.cc",
     "hud_display/hud_settings_view.h",
+    "hud_display/legend.cc",
+    "hud_display/legend.h",
     "hud_display/memory_graph_page_view.cc",
     "hud_display/memory_graph_page_view.h",
     "hud_display/memory_status.cc",
     "hud_display/memory_status.h",
+    "hud_display/solid_source_background.cc",
+    "hud_display/solid_source_background.h",
     "hud_display/tab_strip.cc",
     "hud_display/tab_strip.h",
     "ime/ime_controller_impl.cc",
@@ -524,8 +551,6 @@ component("ash") {
     "lock_screen_action/lock_screen_note_launcher.h",
     "login/login_screen_controller.cc",
     "login/login_screen_controller.h",
-    "login/parent_access_controller.cc",
-    "login/parent_access_controller.h",
     "login/security_token_request_controller.cc",
     "login/security_token_request_controller.h",
     "login/ui/access_code_input.cc",
@@ -579,8 +604,8 @@ component("ash") {
     "login/ui/login_pin_view.h",
     "login/ui/login_public_account_user_view.cc",
     "login/ui/login_public_account_user_view.h",
-    "login/ui/login_tooltip_view.cc",
-    "login/ui/login_tooltip_view.h",
+    "login/ui/login_unpositioned_tooltip_view.cc",
+    "login/ui/login_unpositioned_tooltip_view.h",
     "login/ui/login_user_menu_view.cc",
     "login/ui/login_user_menu_view.h",
     "login/ui/login_user_view.cc",
@@ -794,6 +819,8 @@ component("ash") {
     "shell.cc",
     "shell_delegate.cc",
     "shell_init_params.cc",
+    "shell_tab_handler.cc",
+    "shell_tab_handler.h",
     "shutdown_controller_impl.cc",
     "shutdown_controller_impl.h",
     "shutdown_reason.cc",
@@ -805,6 +832,10 @@ component("ash") {
     "style/ash_color_provider.cc",
     "style/ash_color_provider.h",
     "style/default_color_constants.h",
+    "style/default_colors.cc",
+    "style/default_colors.h",
+    "style/scoped_light_mode_as_default.cc",
+    "style/scoped_light_mode_as_default.h",
     "system/accessibility/accessibility_feature_disable_dialog.cc",
     "system/accessibility/accessibility_feature_disable_dialog.h",
     "system/accessibility/accessibility_feature_pod_controller.cc",
@@ -859,6 +890,8 @@ component("ash") {
     "system/audio/unified_volume_slider_controller.h",
     "system/audio/unified_volume_view.cc",
     "system/audio/unified_volume_view.h",
+    "system/bloom/bloom_tray.cc",
+    "system/bloom/bloom_tray.h",
     "system/bluetooth/bluetooth_detailed_view.cc",
     "system/bluetooth/bluetooth_detailed_view.h",
     "system/bluetooth/bluetooth_feature_pod_controller.cc",
@@ -892,6 +925,7 @@ component("ash") {
     "system/cast/tray_cast.h",
     "system/cast/unified_cast_detailed_view_controller.cc",
     "system/cast/unified_cast_detailed_view_controller.h",
+    "system/dark_mode/color_mode_observer.h",
     "system/dark_mode/dark_mode_detailed_view.cc",
     "system/dark_mode/dark_mode_detailed_view.h",
     "system/dark_mode/dark_mode_detailed_view_controller.cc",
@@ -901,8 +935,22 @@ component("ash") {
     "system/enterprise/enterprise_domain_observer.h",
     "system/gesture_education/gesture_education_notification_controller.cc",
     "system/gesture_education/gesture_education_notification_controller.h",
+    "system/holding_space/holding_space_item_chip_view.cc",
+    "system/holding_space/holding_space_item_chip_view.h",
+    "system/holding_space/holding_space_item_chips_container.cc",
+    "system/holding_space/holding_space_item_chips_container.h",
+    "system/holding_space/holding_space_item_screenshot_view.cc",
+    "system/holding_space/holding_space_item_screenshot_view.h",
+    "system/holding_space/holding_space_item_view.cc",
+    "system/holding_space/holding_space_item_view.h",
+    "system/holding_space/holding_space_item_view_delegate.cc",
+    "system/holding_space/holding_space_item_view_delegate.h",
+    "system/holding_space/holding_space_item_views_container.cc",
+    "system/holding_space/holding_space_item_views_container.h",
     "system/holding_space/holding_space_tray.cc",
     "system/holding_space/holding_space_tray.h",
+    "system/holding_space/holding_space_tray_bubble.cc",
+    "system/holding_space/holding_space_tray_bubble.h",
     "system/holding_space/pinned_files_container.cc",
     "system/holding_space/pinned_files_container.h",
     "system/holding_space/recent_files_container.cc",
@@ -933,6 +981,18 @@ component("ash") {
     "system/locale/unified_locale_detailed_view_controller.h",
     "system/machine_learning/user_settings_event_logger.cc",
     "system/machine_learning/user_settings_event_logger.h",
+    "system/media/media_tray.cc",
+    "system/media/media_tray.h",
+    "system/media/unified_media_controls_container.cc",
+    "system/media/unified_media_controls_container.h",
+    "system/media/unified_media_controls_controller.cc",
+    "system/media/unified_media_controls_controller.h",
+    "system/media/unified_media_controls_detailed_view.cc",
+    "system/media/unified_media_controls_detailed_view.h",
+    "system/media/unified_media_controls_detailed_view_controller.cc",
+    "system/media/unified_media_controls_detailed_view_controller.h",
+    "system/media/unified_media_controls_view.cc",
+    "system/media/unified_media_controls_view.h",
     "system/message_center/arc_notification_manager_delegate_impl.cc",
     "system/message_center/arc_notification_manager_delegate_impl.h",
     "system/message_center/ash_message_center_lock_screen_controller.cc",
@@ -984,6 +1044,10 @@ component("ash") {
     "system/model/update_model.h",
     "system/model/virtual_keyboard_model.cc",
     "system/model/virtual_keyboard_model.h",
+    "system/nearby_share/nearby_share_controller_impl.cc",
+    "system/nearby_share/nearby_share_controller_impl.h",
+    "system/nearby_share/nearby_share_feature_pod_controller.cc",
+    "system/nearby_share/nearby_share_feature_pod_controller.h",
     "system/network/active_network_icon.cc",
     "system/network/active_network_icon.h",
     "system/network/auto_connect_notifier.cc",
@@ -1063,6 +1127,40 @@ component("ash") {
     "system/palette/tools/magnifier_mode.h",
     "system/palette/tools/metalayer_mode.cc",
     "system/palette/tools/metalayer_mode.h",
+    "system/phonehub/bluetooth_disabled_view.cc",
+    "system/phonehub/bluetooth_disabled_view.h",
+    "system/phonehub/connection_error_view.cc",
+    "system/phonehub/connection_error_view.h",
+    "system/phonehub/continue_browsing_chip.cc",
+    "system/phonehub/continue_browsing_chip.h",
+    "system/phonehub/initial_connecting_view.cc",
+    "system/phonehub/initial_connecting_view.h",
+    "system/phonehub/notification_opt_in_view.cc",
+    "system/phonehub/notification_opt_in_view.h",
+    "system/phonehub/onboarding_view.cc",
+    "system/phonehub/onboarding_view.h",
+    "system/phonehub/phone_connected_view.cc",
+    "system/phonehub/phone_connected_view.h",
+    "system/phonehub/phone_hub_interstitial_view.cc",
+    "system/phonehub/phone_hub_interstitial_view.h",
+    "system/phonehub/phone_hub_notification_controller.cc",
+    "system/phonehub/phone_hub_notification_controller.h",
+    "system/phonehub/phone_hub_tray.cc",
+    "system/phonehub/phone_hub_tray.h",
+    "system/phonehub/phone_hub_ui_controller.cc",
+    "system/phonehub/phone_hub_ui_controller.h",
+    "system/phonehub/phone_hub_view_ids.h",
+    "system/phonehub/phone_status_view.cc",
+    "system/phonehub/phone_status_view.h",
+    "system/phonehub/quick_action_controller_base.h",
+    "system/phonehub/quick_action_item.cc",
+    "system/phonehub/quick_action_item.h",
+    "system/phonehub/quick_actions_view.cc",
+    "system/phonehub/quick_actions_view.h",
+    "system/phonehub/silence_phone_quick_action_controller.cc",
+    "system/phonehub/silence_phone_quick_action_controller.h",
+    "system/phonehub/task_continuation_view.cc",
+    "system/phonehub/task_continuation_view.h",
     "system/power/backlights_forced_off_setter.cc",
     "system/power/backlights_forced_off_setter.h",
     "system/power/battery_notification.cc",
@@ -1255,8 +1353,6 @@ component("ash") {
     "system/update/update_notification_controller.h",
     "system/user/login_status.cc",
     "system/user/login_status.h",
-    "system/user/rounded_image_view.cc",
-    "system/user/rounded_image_view.h",
     "system/virtual_keyboard/virtual_keyboard_observer.h",
     "system/virtual_keyboard/virtual_keyboard_tray.cc",
     "system/virtual_keyboard/virtual_keyboard_tray.h",
@@ -1561,10 +1657,11 @@ component("ash") {
 
   public_deps = [
     "//ash/public/cpp",
-    "//ash/public/cpp/vector_icons",
+    "//ash/public/cpp/resources:ash_public_unscaled_resources",
     "//ash/resources/vector_icons",
     "//ash/strings",
     "//chromeos/services/multidevice_setup/public/mojom",
+    "//chromeos/ui/vector_icons",
     "//components/discardable_memory/public/mojom",
     "//mojo/public/cpp/bindings",
     "//mojo/public/cpp/system",
@@ -1607,8 +1704,11 @@ component("ash") {
     "//cc/debug",
     "//cc/paint:paint",
     "//chromeos/assistant:buildflags",
+    "//chromeos/components/bloom/public/cpp",
+    "//chromeos/components/phonehub",
     "//chromeos/components/quick_answers",
     "//chromeos/components/quick_answers/public/cpp:prefs",
+    "//chromeos/ui",
     "//services/viz/public/mojom",
 
     # TODO(https://crbug.com/644336): Make CrasAudioHandler Chrome or Ash only.
@@ -1761,6 +1861,8 @@ action("dbus_service_files") {
 }
 
 test("ash_unittests") {
+  use_xvfb = use_xvfb_in_this_config
+
   sources = [
     "accelerators/accelerator_commands_unittest.cc",
     "accelerators/accelerator_controller_unittest.cc",
@@ -1816,8 +1918,12 @@ test("ash_unittests") {
     "autoclick/autoclick_drag_event_rewriter_unittest.cc",
     "autoclick/autoclick_unittest.cc",
     "capture_mode/capture_mode_unittests.cc",
-    "clipboard/clipboard_history_helper_unittest.cc",
+    "child_accounts/parent_access_controller_impl_unittest.cc",
+    "clipboard/clipboard_history_controller_unittest.cc",
+    "clipboard/clipboard_history_resource_manager_unittest.cc",
     "clipboard/clipboard_history_unittest.cc",
+    "clipboard/clipboard_history_util_unittest.cc",
+    "clipboard/clipboard_nudge_controller_unittest.cc",
     "dbus/gesture_properties_service_provider_unittest.cc",
     "dbus/url_handler_service_provider_unittest.cc",
     "detachable_base/detachable_base_handler_unittest.cc",
@@ -1870,7 +1976,6 @@ test("ash_unittests") {
     "frame/non_client_frame_view_ash_unittest.cc",
     "highlighter/highlighter_controller_unittest.cc",
     "highlighter/highlighter_gesture_util_unittest.cc",
-    "holding_space/holding_space_presenter_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",
@@ -1891,7 +1996,6 @@ test("ash_unittests") {
     "login/login_screen_controller_unittest.cc",
     "login/mock_login_screen_client.cc",
     "login/mock_login_screen_client.h",
-    "login/parent_access_controller_unittest.cc",
     "login/security_token_request_controller_unittest.cc",
     "login/ui/fake_login_detachable_base_model.cc",
     "login/ui/fake_login_detachable_base_model.h",
@@ -1993,6 +2097,7 @@ test("ash_unittests") {
     "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/bloom/bloom_tray_unittest.cc",
     "system/bluetooth/bluetooth_notification_controller_unittest.cc",
     "system/bluetooth/bluetooth_power_controller_unittest.cc",
     "system/bluetooth/tray_bluetooth_helper_legacy_unittest.cc",
@@ -2002,6 +2107,9 @@ 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/media/media_tray_unittest.cc",
+    "system/media/unified_media_controls_controller_unittest.cc",
+    "system/media/unified_media_controls_detailed_view_controller_unittest.cc",
     "system/message_center/ash_message_popup_collection_unittest.cc",
     "system/message_center/inactive_user_notification_blocker_unittest.cc",
     "system/message_center/message_center_ui_controller_unittest.cc",
@@ -2011,6 +2119,7 @@ test("ash_unittests") {
     "system/message_center/unified_message_center_bubble_unittest.cc",
     "system/message_center/unified_message_center_view_unittest.cc",
     "system/message_center/unified_message_list_view_unittest.cc",
+    "system/nearby_share/nearby_share_feature_pod_controller_unittest.cc",
     "system/network/active_network_icon_unittest.cc",
     "system/network/auto_connect_notifier_unittest.cc",
     "system/network/network_icon_unittest.cc",
@@ -2028,6 +2137,12 @@ test("ash_unittests") {
     "system/palette/tools/create_note_unittest.cc",
     "system/palette/tools/metalayer_unittest.cc",
     "system/palette/tools/screenshot_unittest.cc",
+    "system/phonehub/phone_hub_notification_controller_unittest.cc",
+    "system/phonehub/phone_hub_tray_unittest.cc",
+    "system/phonehub/phone_hub_ui_controller_unittest.cc",
+    "system/phonehub/phone_status_view_unittest.cc",
+    "system/phonehub/quick_actions_view_unittest.cc",
+    "system/phonehub/task_continuation_view_unittest.cc",
     "system/power/backlights_forced_off_setter_unittest.cc",
     "system/power/peripheral_battery_notifier_unittest.cc",
     "system/power/power_button_controller_unittest.cc",
@@ -2087,6 +2202,7 @@ test("ash_unittests") {
     "wm/default_window_resizer_unittest.cc",
     "wm/desks/autotest_desks_api_unittests.cc",
     "wm/desks/desks_unittests.cc",
+    "wm/desks/root_window_desk_switch_animator_unittest.cc",
     "wm/drag_window_resizer_unittest.cc",
     "wm/fullscreen_window_finder_unittest.cc",
     "wm/gestures/back_gesture/back_gesture_affordance_unittest.cc",
@@ -2179,7 +2295,6 @@ test("ash_unittests") {
     "//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",
@@ -2190,9 +2305,13 @@ test("ash_unittests") {
     "//build:branding_buildflags",
     "//chromeos:test_support",
     "//chromeos/strings:strings_grit",
+    "//chromeos/ui",
+    "//chromeos/ui/vector_icons",
 
     # TODO(https://crbug.com/644336): Make CrasAudioHandler Chrome or Ash only.
     "//chromeos/audio",
+    "//chromeos/components/bloom/public/cpp",
+    "//chromeos/components/phonehub:test_support",
     "//chromeos/components/quick_answers:quick_answers",
     "//chromeos/constants",
     "//chromeos/dbus:test_support",
@@ -2331,6 +2450,7 @@ static_library("test_support") {
     "//ash/public/cpp/external_arc:*",
   ]
   public = [
+    "public/cpp/holding_space/holding_space_test_api.h",
     "public/cpp/test/accessibility_controller_test_api.h",
     "public/cpp/test/assistant_test_api.h",
   ]
@@ -2366,6 +2486,8 @@ static_library("test_support") {
     "assistant/test/test_assistant_web_view_factory.h",
     "capture_mode/test_capture_mode_delegate.cc",
     "capture_mode/test_capture_mode_delegate.h",
+    "clipboard/test_support/clipboard_history_item_builder.cc",
+    "clipboard/test_support/clipboard_history_item_builder.h",
     "display/display_configuration_controller_test_api.cc",
     "display/display_configuration_controller_test_api.h",
     "display/mirror_window_test_api.cc",
@@ -2409,6 +2531,7 @@ static_library("test_support") {
     "shelf/test/widget_animation_waiter.cc",
     "shelf/test/widget_animation_waiter.h",
     "shell_test_api.cc",
+    "system/holding_space/holding_space_test_api.cc",
     "system/message_center/test_notifier_settings_controller.cc",
     "system/message_center/test_notifier_settings_controller.h",
     "system/palette/palette_tray_test_api.cc",
@@ -2450,6 +2573,8 @@ static_library("test_support") {
     "wm/cursor_manager_test_api.h",
     "wm/desks/desks_test_util.cc",
     "wm/desks/desks_test_util.h",
+    "wm/desks/root_window_desk_switch_animator_test_api.cc",
+    "wm/desks/root_window_desk_switch_animator_test_api.h",
     "wm/gestures/back_gesture/test_back_gesture_contextual_nudge_delegate.cc",
     "wm/gestures/back_gesture/test_back_gesture_contextual_nudge_delegate.h",
     "wm/lock_state_controller_test_api.cc",
diff --git a/chromium/ash/app_list/BUILD.gn b/chromium/ash/app_list/BUILD.gn
index fab00922430..612b782c33a 100644
--- a/chromium/ash/app_list/BUILD.gn
+++ b/chromium/ash/app_list/BUILD.gn
@@ -115,8 +115,8 @@ component("app_list") {
     "//ash/assistant/util",
     "//ash/keyboard/ui",
     "//ash/public/cpp/app_list/vector_icons",
-    "//ash/public/cpp/vector_icons",
     "//ash/resources/vector_icons",
+    "//ash/search_box",
     "//ash/strings",
     "//base",
     "//base:i18n",
@@ -124,6 +124,7 @@ component("app_list") {
     "//cc/paint",
     "//chromeos:chromeos",
     "//chromeos/services/assistant/public/cpp",
+    "//chromeos/ui/vector_icons",
     "//components/keyed_service/core",
     "//components/sync",
     "//mojo/public/cpp/bindings",
@@ -135,7 +136,6 @@ component("app_list") {
     "//ui/base",
     "//ui/base/ime",
     "//ui/base/ime/chromeos",
-    "//ui/chromeos/search_box",
     "//ui/compositor",
     "//ui/compositor_extra",
     "//ui/display",
@@ -174,6 +174,8 @@ static_library("test_support") {
     "test/app_list_test_model.h",
     "test/app_list_test_view_delegate.cc",
     "test/app_list_test_view_delegate.h",
+    "test/test_app_list_color_provider.cc",
+    "test/test_app_list_color_provider.h",
     "test/test_search_result.cc",
     "test/test_search_result.h",
     "views/test/apps_grid_view_test_api.cc",
@@ -216,9 +218,12 @@ executable("app_list_demo") {
 }
 
 test("app_list_unittests") {
+  use_xvfb = use_xvfb_in_this_config
+
   sources = [
     "folder_image_unittest.cc",
     "test/run_all_unittests.cc",
+    "views/app_list_item_view_unittest.cc",
     "views/app_list_main_view_unittest.cc",
     "views/app_list_menu_model_adapter_unittest.cc",
     "views/app_list_view_unittest.cc",
@@ -239,7 +244,9 @@ test("app_list_unittests") {
     ":app_list",
     ":test_support",
     "//ash/keyboard/ui",
+    "//ash/public/cpp",
     "//ash/public/cpp/app_list/vector_icons",
+    "//ash/search_box",
     "//base",
     "//base/test:test_support",
     "//chromeos/constants",
@@ -253,7 +260,6 @@ test("app_list_unittests") {
     "//testing/gtest",
     "//ui/accessibility",
     "//ui/base",
-    "//ui/chromeos/search_box",
     "//ui/compositor",
     "//ui/events:test_support",
     "//ui/gfx:test_support",
diff --git a/chromium/ash/assistant/ui/BUILD.gn b/chromium/ash/assistant/ui/BUILD.gn
index 07cd341ac94..c0e7a6c5931 100644
--- a/chromium/ash/assistant/ui/BUILD.gn
+++ b/chromium/ash/assistant/ui/BUILD.gn
@@ -92,13 +92,13 @@ component("ui") {
     "//ash/assistant/util",
     "//ash/keyboard/ui",
     "//ash/public/cpp",
-    "//ash/public/cpp/vector_icons",
     "//ash/resources/vector_icons",
     "//ash/strings",
     "//base",
     "//chromeos/assistant:buildflags",
     "//chromeos/services/assistant/public/cpp",
     "//chromeos/services/assistant/public/mojom",
+    "//chromeos/ui/vector_icons",
     "//services/content/public/cpp",
     "//ui/aura",
     "//ui/compositor",
diff --git a/chromium/ash/assistant/util/BUILD.gn b/chromium/ash/assistant/util/BUILD.gn
index 31a4675c065..14d1fd0a451 100644
--- a/chromium/ash/assistant/util/BUILD.gn
+++ b/chromium/ash/assistant/util/BUILD.gn
@@ -27,12 +27,12 @@ component("util") {
   deps = [
     "//ash/assistant/model",
     "//ash/public/cpp",
-    "//ash/public/cpp/vector_icons",
     "//base",
     "//base:i18n",
     "//chromeos/constants",
     "//chromeos/services/assistant/public/cpp",
     "//chromeos/services/assistant/public/mojom",
+    "//chromeos/ui/vector_icons",
     "//net",
     "//ui/base",
     "//ui/gfx",
diff --git a/chromium/ash/keyboard/ui/BUILD.gn b/chromium/ash/keyboard/ui/BUILD.gn
index 9ca2f7be41b..9ab4d1a7437 100644
--- a/chromium/ash/keyboard/ui/BUILD.gn
+++ b/chromium/ash/keyboard/ui/BUILD.gn
@@ -133,6 +133,8 @@ build_closure("inputview") {
 }
 
 test("keyboard_unittests") {
+  use_xvfb = use_xvfb_in_this_config
+
   sources = [
     "container_floating_behavior_unittest.cc",
     "container_full_width_behavior_unittest.cc",
diff --git a/chromium/ash/public/cpp/BUILD.gn b/chromium/ash/public/cpp/BUILD.gn
index 6f78acda124..4c4f6071a79 100644
--- a/chromium/ash/public/cpp/BUILD.gn
+++ b/chromium/ash/public/cpp/BUILD.gn
@@ -35,6 +35,8 @@ component("cpp") {
     "android_intent_helper.cc",
     "android_intent_helper.h",
     "app_list/app_list_client.h",
+    "app_list/app_list_color_provider.cc",
+    "app_list/app_list_color_provider.h",
     "app_list/app_list_config.cc",
     "app_list/app_list_config.h",
     "app_list/app_list_config_provider.cc",
@@ -114,6 +116,12 @@ component("cpp") {
     "caption_buttons/snap_controller.h",
     "cast_config_controller.cc",
     "cast_config_controller.h",
+    "child_accounts/parent_access_controller.cc",
+    "child_accounts/parent_access_controller.h",
+    "clipboard_history_controller.cc",
+    "clipboard_history_controller.h",
+    "clipboard_image_model_factory.cc",
+    "clipboard_image_model_factory.h",
     "default_frame_header.cc",
     "default_frame_header.h",
     "default_scale_factor_retriever.cc",
@@ -122,6 +130,8 @@ component("cpp") {
     "desks_helper.h",
     "esim_manager.cc",
     "esim_manager.h",
+    "file_icon_util.cc",
+    "file_icon_util.h",
     "fps_counter.cc",
     "fps_counter.h",
     "frame_header.cc",
@@ -129,14 +139,22 @@ component("cpp") {
     "frame_utils.cc",
     "frame_utils.h",
     "gesture_action_type.h",
+    "holding_space/holding_space_client.h",
+    "holding_space/holding_space_constants.h",
     "holding_space/holding_space_controller.cc",
     "holding_space/holding_space_controller.h",
     "holding_space/holding_space_controller_observer.h",
+    "holding_space/holding_space_image.cc",
+    "holding_space/holding_space_image.h",
     "holding_space/holding_space_item.cc",
     "holding_space/holding_space_item.h",
+    "holding_space/holding_space_metrics.cc",
+    "holding_space/holding_space_metrics.h",
     "holding_space/holding_space_model.cc",
     "holding_space/holding_space_model.h",
     "holding_space/holding_space_model_observer.h",
+    "holding_space/holding_space_prefs.cc",
+    "holding_space/holding_space_prefs.h",
     "image_downloader.cc",
     "image_downloader.h",
     "ime_controller.cc",
@@ -186,6 +204,9 @@ component("cpp") {
     "media_client.h",
     "media_controller.cc",
     "media_controller.h",
+    "media_notification_provider.cc",
+    "media_notification_provider.h",
+    "media_notification_provider_observer.h",
     "message_center/arc_notification_constants.h",
     "message_center/arc_notification_manager_base.cc",
     "message_center/arc_notification_manager_base.h",
@@ -194,6 +215,8 @@ component("cpp") {
     "message_center/arc_notifications_host_initializer.h",
     "metrics_util.cc",
     "metrics_util.h",
+    "nearby_share_controller.h",
+    "nearby_share_delegate.h",
     "network_config_service.cc",
     "network_config_service.h",
     "network_icon_image_source.cc",
@@ -222,10 +245,14 @@ component("cpp") {
     "presentation_time_recorder.h",
     "privacy_screen_dlp_helper.cc",
     "privacy_screen_dlp_helper.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",
     "rounded_corner_decorator.cc",
     "rounded_corner_decorator.h",
+    "rounded_image_view.cc",
+    "rounded_image_view.h",
     "scale_utility.cc",
     "scale_utility.h",
     "scoped_guest_button_blocker.h",
@@ -305,12 +332,15 @@ component("cpp") {
   ]
 
   deps = [
-    "//ash/public/cpp/vector_icons",
+    "//base/util/values:values_util",
     "//chromeos/constants",
     "//chromeos/dbus/power:power_manager_proto",
     "//chromeos/services/assistant/public/cpp",
     "//chromeos/services/cellular_setup:in_process_esim_manager",
     "//chromeos/services/network_config:in_process_instance",
+    "//chromeos/ui",
+    "//chromeos/ui/vector_icons",
+    "//components/pref_registry",
     "//components/prefs",
     "//components/sync:rest_of_sync",
     "//mojo/public/cpp/bindings",
@@ -353,6 +383,8 @@ source_set("unit_tests") {
     "android_intent_helper_unittest.cc",
     "app_list/app_list_config_provider_unittest.cc",
     "default_scale_factor_retriever_unittest.cc",
+    "file_icon_util_unittest.cc",
+    "holding_space/holding_space_item_unittest.cc",
     "metrics_util_unittest.cc",
     "pagination/pagination_model_unittest.cc",
     "power_utils_unittest.cc",
@@ -386,6 +418,8 @@ source_set("test_support") {
     "test/test_image_downloader.h",
     "test/test_keyboard_controller_observer.cc",
     "test/test_keyboard_controller_observer.h",
+    "test/test_nearby_share_delegate.cc",
+    "test/test_nearby_share_delegate.h",
     "test/test_new_window_delegate.cc",
     "test/test_new_window_delegate.h",
     "test/test_system_tray_client.cc",
diff --git a/chromium/ash/public/cpp/app_list/vector_icons/BUILD.gn b/chromium/ash/public/cpp/app_list/vector_icons/BUILD.gn
index e5e676d61ad..c154c9b5e5e 100644
--- a/chromium/ash/public/cpp/app_list/vector_icons/BUILD.gn
+++ b/chromium/ash/public/cpp/app_list/vector_icons/BUILD.gn
@@ -4,10 +4,10 @@
 
 import("//components/vector_icons/vector_icons.gni")
 
-aggregate_vector_icons("app_list_vector_icons") {
+aggregate_vector_icons2("app_list_vector_icons") {
   icon_directory = "."
 
-  icons = [
+  sources = [
     "arrow_up.icon",
     "badge_instant.icon",
     "badge_play.icon",
@@ -15,32 +15,6 @@ aggregate_vector_icons("app_list_vector_icons") {
     "bookmark.icon",
     "domain.icon",
     "equal.icon",
-    "filetype_archive.icon",
-    "filetype_audio.icon",
-    "filetype_chart.icon",
-    "filetype_chip_background.icon",
-    "filetype_excel.icon",
-    "filetype_folder.icon",
-    "filetype_gdoc.icon",
-    "filetype_gdraw.icon",
-    "filetype_generic.icon",
-    "filetype_gform.icon",
-    "filetype_gmap.icon",
-    "filetype_gsheet.icon",
-    "filetype_gsite.icon",
-    "filetype_gslides.icon",
-    "filetype_gtable.icon",
-    "filetype_image.icon",
-    "filetype_linux.icon",
-    "filetype_pdf.icon",
-    "filetype_ppt.icon",
-    "filetype_script.icon",
-    "filetype_shared.icon",
-    "filetype_sites.icon",
-    "filetype_team_drive.icon",
-    "filetype_tini.icon",
-    "filetype_video.icon",
-    "filetype_word.icon",
     "google_black.icon",
     "google_color.icon",
     "history.icon",
diff --git a/chromium/ash/public/cpp/assistant/test_support/BUILD.gn b/chromium/ash/public/cpp/assistant/test_support/BUILD.gn
index 05d6de9b1c8..1f908b83c8c 100644
--- a/chromium/ash/public/cpp/assistant/test_support/BUILD.gn
+++ b/chromium/ash/public/cpp/assistant/test_support/BUILD.gn
@@ -4,6 +4,8 @@ static_library("test_support") {
   sources = [
     "mock_assistant_controller.cc",
     "mock_assistant_controller.h",
+    "mock_assistant_state.cc",
+    "mock_assistant_state.h",
   ]
 
   deps = [
diff --git a/chromium/ash/public/cpp/external_arc/BUILD.gn b/chromium/ash/public/cpp/external_arc/BUILD.gn
index b8a0da93724..7ab7bf85eaf 100644
--- a/chromium/ash/public/cpp/external_arc/BUILD.gn
+++ b/chromium/ash/public/cpp/external_arc/BUILD.gn
@@ -31,6 +31,7 @@ static_library("external_arc") {
   deps = [
     "//ash/public/cpp",
     "//base",
+    "//chromeos/constants",
     "//components/account_id",
     "//components/arc:arc_metrics_constants",
     "//components/arc:connection_holder",
diff --git a/chromium/ash/public/cpp/vector_icons/BUILD.gn b/chromium/ash/public/cpp/vector_icons/BUILD.gn
deleted file mode 100644
index d99f938b3d4..00000000000
--- a/chromium/ash/public/cpp/vector_icons/BUILD.gn
+++ /dev/null
@@ -1,42 +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("//components/vector_icons/vector_icons.gni")
-
-# The icons in this target, unlike those in //ash/resources/vector_icons, are ok to use from outside of ash/.
-aggregate_vector_icons("ash_public_vector_icons") {
-  icon_directory = "."
-
-  icons = [
-    "assistant.icon",
-    "calculate.icon",
-    "conversion_path.icon",
-    "notification_assistant.icon",
-    "notification_supervised_user.icon",
-    "notification_warning.icon",
-    "person_pin_circle.icon",
-    "screenshot.icon",
-    "sentiment_very_satisfied.icon",
-    "straighten.icon",
-    "timer.icon",
-    "translate.icon",
-    "window_control_back.icon",
-    "window_control_dezoom.icon",
-    "window_control_left_snapped.icon",
-    "window_control_menu.icon",
-    "window_control_right_snapped.icon",
-    "window_control_zoom.icon",
-  ]
-}
-
-source_set("vector_icons") {
-  sources = get_target_outputs(":ash_public_vector_icons")
-
-  deps = [
-    ":ash_public_vector_icons",
-    "//base",
-    "//skia",
-    "//ui/gfx",
-  ]
-}
diff --git a/chromium/ash/resources/vector_icons/BUILD.gn b/chromium/ash/resources/vector_icons/BUILD.gn
index 44edae37bc0..86ee3f5ef7a 100644
--- a/chromium/ash/resources/vector_icons/BUILD.gn
+++ b/chromium/ash/resources/vector_icons/BUILD.gn
@@ -5,10 +5,10 @@
 import("//build/config/chrome_build.gni")
 import("//components/vector_icons/vector_icons.gni")
 
-aggregate_vector_icons("ash_vector_icons") {
+aggregate_vector_icons2("ash_vector_icons") {
   icon_directory = "."
 
-  icons = [
+  sources = [
     "always_show_shelf.icon",
     "auto_hide.icon",
     "autoclick.icon",
@@ -16,19 +16,18 @@ aggregate_vector_icons("ash_vector_icons") {
     "autoclick_double_click.icon",
     "autoclick_drag.icon",
     "autoclick_left_click.icon",
-    "autoclick_right_click.icon",
     "autoclick_pause.icon",
     "autoclick_position_bottom_left.icon",
     "autoclick_position_bottom_right.icon",
     "autoclick_position_top_left.icon",
     "autoclick_position_top_right.icon",
+    "autoclick_right_click.icon",
     "autoclick_scroll.icon",
     "autoclick_scroll_down.icon",
     "autoclick_scroll_left.icon",
     "autoclick_scroll_right.icon",
     "autoclick_scroll_up.icon",
     "battery.icon",
-    "bitmap.icon",
     "captive_portal.icon",
     "capture_mode.icon",
     "capture_mode_circle_stop.icon",
@@ -38,8 +37,14 @@ aggregate_vector_icons("ash_vector_icons") {
     "capture_mode_video.icon",
     "capture_mode_window.icon",
     "check_circle.icon",
+    "chevron_right.icon",
+    "clipboard.icon",
+    "clipboard_launcher_inner.icon",
+    "clipboard_launcher_no_assistant.icon",
+    "clipboard_launcher_outer.icon",
+    "clipboard_search.icon",
     "close_button.icon",
-    "custom_data.icon",
+    "copy.icon",
     "dark_theme_color_mode.icon",
     "delete.icon",
     "desks_new_desk_button.icon",
@@ -49,14 +54,15 @@ aggregate_vector_icons("ash_vector_icons") {
     "dictation_on.icon",
     "dictation_on_newui.icon",
     "dogfood.icon",
+    "folder.icon",
+    "global_media_controls.icon",
+    "holding_space.icon",
     "hollow_check_circle.icon",
-    "html.icon",
     "ime_menu_emoticon.icon",
     "ime_menu_microphone.icon",
     "ime_menu_on_screen_keyboard.icon",
     "ime_menu_write.icon",
     "keyboard.icon",
-    "link.icon",
     "lock_screen_alert.icon",
     "lock_screen_arrow.icon",
     "lock_screen_arrow_back.icon",
@@ -64,17 +70,17 @@ aggregate_vector_icons("ash_vector_icons") {
     "lock_screen_caps_lock.icon",
     "lock_screen_dropdown.icon",
     "lock_screen_fingerprint.icon",
+    "lock_screen_fingerprint_success.icon",
     "lock_screen_password_invisible.icon",
     "lock_screen_password_visible.icon",
     "lock_screen_smart_card.icon",
     "lock_screen_smart_card_failure.icon",
-    "lock_screen_fingerprint_success.icon",
     "lock_screen_time_limit_lock.icon",
     "lock_screen_time_limit_moon.icon",
     "lock_screen_time_limit_timer.icon",
     "login_screen_button_dropdown.icon",
-    "login_screen_menu_dropdown.icon",
     "login_screen_enterprise.icon",
+    "login_screen_menu_dropdown.icon",
     "mic.icon",
     "muted_microphone.icon",
     "network_badge_captive_portal.icon",
@@ -100,8 +106,8 @@ aggregate_vector_icons("ash_vector_icons") {
     "notification_battery_critical.icon",
     "notification_battery_fluctuating.icon",
     "notification_battery_low.icon",
-    "notification_bluetooth_battery_warning.icon",
     "notification_bluetooth.icon",
+    "notification_bluetooth_battery_warning.icon",
     "notification_capslock.icon",
     "notification_center_all_done.icon",
     "notification_center_clear_all.icon",
@@ -121,10 +127,10 @@ aggregate_vector_icons("ash_vector_icons") {
     "notification_sms_sync.icon",
     "notification_stylus_battery_warning.icon",
     "notification_timer.icon",
-    "overview_window_close.icon",
-    "overview_drop_target_plus.icon",
     "overflow_shelf_left.icon",
     "overflow_shelf_right.icon",
+    "overview_drop_target_plus.icon",
+    "overview_window_close.icon",
     "palette_action_capture_region.icon",
     "palette_action_capture_screen.icon",
     "palette_action_create_note.icon",
@@ -137,9 +143,11 @@ aggregate_vector_icons("ash_vector_icons") {
     "palette_tray_icon_laser_pointer.icon",
     "palette_tray_icon_magnify.icon",
     "palette_tray_icon_metalayer.icon",
+    "phone_hub_mobile_no_connection.icon",
+    "phone_hub_mobile_no_sim.icon",
     "pin_request_lock.icon",
+    "pinned.icon",
     "privacy_screen.icon",
-    "rtf.icon",
     "send.icon",
     "settings.icon",
     "shelf_add_person_button.icon",
@@ -192,10 +200,10 @@ aggregate_vector_icons("ash_vector_icons") {
     "system_menu_accessibility_docked_magnifier.icon",
     "system_menu_accessibility_fullscreen_magnifier.icon",
     "system_menu_accessibility_select_to_speak.icon",
-    "system_menu_audio_input.icon",
-    "system_menu_audio_output.icon",
     "system_menu_add_connection.icon",
     "system_menu_arrow_back.icon",
+    "system_menu_audio_input.icon",
+    "system_menu_audio_output.icon",
     "system_menu_bluetooth.icon",
     "system_menu_bluetooth_connected.icon",
     "system_menu_bluetooth_disabled.icon",
@@ -220,6 +228,7 @@ aggregate_vector_icons("ash_vector_icons") {
     "system_menu_legacy_supervised_user.icon",
     "system_menu_lock.icon",
     "system_menu_mouse.icon",
+    "system_menu_new_user.icon",
     "system_menu_phone.icon",
     "system_menu_power.icon",
     "system_menu_rollback.icon",
@@ -230,9 +239,8 @@ aggregate_vector_icons("ash_vector_icons") {
     "system_menu_settings.icon",
     "system_menu_supervised_user.icon",
     "system_menu_tablet.icon",
-    "system_menu_tracing.icon",
     "system_menu_timer.icon",
-    "system_menu_new_user.icon",
+    "system_menu_tracing.icon",
     "system_menu_update.icon",
     "system_menu_usb.icon",
     "system_menu_videocam.icon",
@@ -245,26 +253,26 @@ aggregate_vector_icons("ash_vector_icons") {
     "system_power_button_menu_power_off.icon",
     "system_power_button_menu_sign_out.icon",
     "system_tray_accessibility.icon",
+    "system_tray_app_badging.icon",
     "system_tray_caps_lock.icon",
     "system_tray_cast.icon",
     "system_tray_do_not_disturb.icon",
-    "system_tray_supervised_user.icon",
     "system_tray_managed.icon",
     "system_tray_notification_counter_plus.icon",
     "system_tray_recording.icon",
     "system_tray_rotation_lock_auto.icon",
     "system_tray_rotation_lock_locked.icon",
+    "system_tray_screen_share.icon",
     "system_tray_select_to_speak.icon",
-    "system_tray_select_to_speak_newui.icon",
     "system_tray_select_to_speak_active.icon",
     "system_tray_select_to_speak_active_newui.icon",
-    "system_tray_screen_share.icon",
+    "system_tray_select_to_speak_newui.icon",
     "system_tray_stop.icon",
     "system_tray_stop_newui.icon",
+    "system_tray_supervised_user.icon",
     "system_tray_tracing.icon",
     "system_tray_update.icon",
     "system_tray_volume_mute.icon",
-    "text.icon",
     "touch_calibration_complete_check.icon",
     "touch_calibration_hand.icon",
     "tray_action_new_lock_screen_note.icon",
@@ -278,20 +286,22 @@ aggregate_vector_icons("ash_vector_icons") {
     "unified_menu_battery_unreliable_outline.icon",
     "unified_menu_battery_x.icon",
     "unified_menu_battery_x_outline.icon",
-    "unified_menu_bluetooth_connected.icon",
     "unified_menu_bluetooth.icon",
+    "unified_menu_bluetooth_connected.icon",
     "unified_menu_brightness.icon",
     "unified_menu_cast.icon",
     "unified_menu_dark_mode.icon",
     "unified_menu_do_not_disturb.icon",
     "unified_menu_expand.icon",
     "unified_menu_info.icon",
-    "unified_menu_keyboard_brightness.icon",
     "unified_menu_keyboard.icon",
+    "unified_menu_keyboard_brightness.icon",
     "unified_menu_locale.icon",
     "unified_menu_lock.icon",
     "unified_menu_managed.icon",
     "unified_menu_more.icon",
+    "unified_menu_nearby_share_not_visible.icon",
+    "unified_menu_nearby_share_visible.icon",
     "unified_menu_night_light.icon",
     "unified_menu_power.icon",
     "unified_menu_rotation_lock_auto.icon",
@@ -308,13 +318,13 @@ aggregate_vector_icons("ash_vector_icons") {
     "unified_network_badge_captive_portal.icon",
     "unified_network_badge_secure.icon",
     "unified_network_badge_vpn.icon",
+    "unpinned.icon",
+    "unrendered_html_placeholder.icon",
     "wallpaper.icon",
-    "web_bookmark.icon",
-    "web_smart_paste.icon",
   ]
 
   if (is_chrome_branded) {
-    icons += [
+    sources += [
       "system_menu_cast_device.icon",
       "system_menu_cast_education.icon",
       "system_menu_cast_hangout.icon",
diff --git a/chromium/ash/search_box/BUILD.gn b/chromium/ash/search_box/BUILD.gn
new file mode 100644
index 00000000000..b3b88141291
--- /dev/null
+++ b/chromium/ash/search_box/BUILD.gn
@@ -0,0 +1,22 @@
+# 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.
+
+source_set("search_box") {
+  sources = [
+    "search_box_constants.h",
+    "search_box_view_base.cc",
+    "search_box_view_base.h",
+    "search_box_view_delegate.h",
+  ]
+
+  deps = [
+    "//base",
+    "//skia",
+    "//ui/base",
+    "//ui/base/ime",
+    "//ui/events",
+    "//ui/strings",
+    "//ui/views",
+  ]
+}
diff --git a/chromium/ash/shortcut_viewer/BUILD.gn b/chromium/ash/shortcut_viewer/BUILD.gn
index 83ff5e94713..d9b54855bdb 100644
--- a/chromium/ash/shortcut_viewer/BUILD.gn
+++ b/chromium/ash/shortcut_viewer/BUILD.gn
@@ -28,13 +28,13 @@ source_set("shortcut_viewer") {
     "//ash",
     "//ash/public/cpp",
     "//ash/public/cpp/resources:ash_public_unscaled_resources",
+    "//ash/search_box",
     "//ash/shortcut_viewer/strings",
     "//ash/shortcut_viewer/vector_icons",
     "//cc/paint",
     "//ui/accessibility",
     "//ui/aura",
     "//ui/chromeos/events",
-    "//ui/chromeos/search_box",
     "//ui/events:events_base",
     "//ui/events/devices",
     "//ui/events/ozone/layout",
diff --git a/chromium/ash/shortcut_viewer/vector_icons/BUILD.gn b/chromium/ash/shortcut_viewer/vector_icons/BUILD.gn
index 27b23f36f95..a1edd835c7c 100644
--- a/chromium/ash/shortcut_viewer/vector_icons/BUILD.gn
+++ b/chromium/ash/shortcut_viewer/vector_icons/BUILD.gn
@@ -4,15 +4,10 @@
 
 import("//components/vector_icons/vector_icons.gni")
 
-aggregate_vector_icons("ksv_vector_icons") {
+aggregate_vector_icons2("ksv_vector_icons") {
   icon_directory = "."
 
-  icons = [
-    "ksv_search_back.icon",
-    "ksv_search_bar.icon",
-    "ksv_search_close.icon",
-    "ksv_search_no_result.icon",
-    "ksv_separator_plus.icon",
+  sources = [
     "ksv_arrow_down.icon",
     "ksv_arrow_left.icon",
     "ksv_arrow_right.icon",
@@ -26,6 +21,11 @@ aggregate_vector_icons("ksv_vector_icons") {
     "ksv_overview.icon",
     "ksv_privacy_screen_toggle.icon",
     "ksv_reload.icon",
+    "ksv_search_back.icon",
+    "ksv_search_bar.icon",
+    "ksv_search_close.icon",
+    "ksv_search_no_result.icon",
+    "ksv_separator_plus.icon",
     "ksv_volume_down.icon",
     "ksv_volume_up.icon",
   ]