BASELINE: Update Chromium to 78.0.3904.130

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

18 files changed, 154 insertions, 127 deletions

diff --git a/chromium/ash/BUILD.gn b/chromium/ash/BUILD.gn
index f267d2d5439..da791573c1a 100644
--- a/chromium/ash/BUILD.gn
+++ b/chromium/ash/BUILD.gn
@@ -56,6 +56,8 @@ component("ash") {
     "public/cpp/multi_user_window_manager.h",
     "public/cpp/multi_user_window_manager_delegate.h",
     "public/cpp/multi_user_window_manager_observer.h",
+    "public/cpp/overview_test_api.h",
+    "public/cpp/split_view_test_api.h",
     "public/cpp/window_finder.h",
     "public/cpp/window_tree_host_lookup.h",
     "root_window_controller.h",
@@ -160,6 +162,7 @@ component("ash") {
     "accessibility/touch_exploration_controller.h",
     "accessibility/touch_exploration_manager.cc",
     "accessibility/touch_exploration_manager.h",
+    "ambient/ambient_constants.h",
     "ambient/ambient_controller.cc",
     "ambient/ambient_controller.h",
     "ambient/model/photo_model.cc",
@@ -181,8 +184,6 @@ component("ash") {
     "ash_service.cc",
     "assistant/assistant_alarm_timer_controller.cc",
     "assistant/assistant_alarm_timer_controller.h",
-    "assistant/assistant_cache_controller.cc",
-    "assistant/assistant_cache_controller.h",
     "assistant/assistant_controller.cc",
     "assistant/assistant_controller.h",
     "assistant/assistant_controller_observer.h",
@@ -192,13 +193,15 @@ component("ash") {
     "assistant/assistant_notification_controller.h",
     "assistant/assistant_notification_expiry_monitor.cc",
     "assistant/assistant_notification_expiry_monitor.h",
-    "assistant/assistant_prefs_controller.cc",
-    "assistant/assistant_prefs_controller.h",
     "assistant/assistant_screen_context_controller.cc",
     "assistant/assistant_screen_context_controller.h",
     "assistant/assistant_settings.cc",
     "assistant/assistant_setup_controller.cc",
     "assistant/assistant_setup_controller.h",
+    "assistant/assistant_state_controller.cc",
+    "assistant/assistant_state_controller.h",
+    "assistant/assistant_suggestions_controller.cc",
+    "assistant/assistant_suggestions_controller.h",
     "assistant/assistant_ui_controller.cc",
     "assistant/assistant_ui_controller.h",
     "assistant/assistant_view_delegate_impl.cc",
@@ -217,8 +220,6 @@ component("ash") {
     "cancel_mode.h",
     "custom_tab/arc_custom_tab_view.cc",
     "custom_tab/arc_custom_tab_view.h",
-    "dbus/ash_dbus_helper.cc",
-    "dbus/ash_dbus_helper.h",
     "dbus/ash_dbus_services.cc",
     "dbus/ash_dbus_services.h",
     "dbus/display_service_provider.cc",
@@ -516,6 +517,10 @@ component("ash") {
     "power/gatt_battery_percentage_fetcher.h",
     "power/gatt_battery_poller.cc",
     "power/gatt_battery_poller.h",
+    "power/hid_battery_listener.cc",
+    "power/hid_battery_listener.h",
+    "power/hid_battery_util.cc",
+    "power/hid_battery_util.h",
     "power/peripheral_battery_tracker.cc",
     "power/peripheral_battery_tracker.h",
     "root_window_controller.cc",
@@ -553,6 +558,8 @@ component("ash") {
     "shelf/home_button.h",
     "shelf/home_button_controller.cc",
     "shelf/home_button_controller.h",
+    "shelf/hotseat_widget.cc",
+    "shelf/hotseat_widget.h",
     "shelf/login_shelf_view.cc",
     "shelf/login_shelf_view.h",
     "shelf/overflow_bubble.cc",
@@ -561,6 +568,10 @@ component("ash") {
     "shelf/overflow_bubble_view.h",
     "shelf/overflow_button.cc",
     "shelf/overflow_button.h",
+    "shelf/scroll_arrow_view.cc",
+    "shelf/scroll_arrow_view.h",
+    "shelf/scrollable_shelf_view.cc",
+    "shelf/scrollable_shelf_view.h",
     "shelf/shelf.cc",
     "shelf/shelf_app_button.cc",
     "shelf/shelf_app_button.h",
@@ -577,6 +588,8 @@ component("ash") {
     "shelf/shelf_button_pressed_metric_tracker.cc",
     "shelf/shelf_button_pressed_metric_tracker.h",
     "shelf/shelf_constants.h",
+    "shelf/shelf_container_view.cc",
+    "shelf/shelf_container_view.h",
     "shelf/shelf_context_menu_model.cc",
     "shelf/shelf_context_menu_model.h",
     "shelf/shelf_control_button.cc",
@@ -592,6 +605,8 @@ component("ash") {
     "shelf/shelf_locking_manager.h",
     "shelf/shelf_menu_model_adapter.cc",
     "shelf/shelf_menu_model_adapter.h",
+    "shelf/shelf_navigation_widget.cc",
+    "shelf/shelf_navigation_widget.h",
     "shelf/shelf_observer.h",
     "shelf/shelf_tooltip_bubble.cc",
     "shelf/shelf_tooltip_bubble.h",
@@ -624,6 +639,7 @@ component("ash") {
     "sticky_keys/sticky_keys_state.h",
     "style/ash_color_provider.cc",
     "style/ash_color_provider.h",
+    "style/default_color_constants.h",
     "system/accessibility/accessibility_feature_disable_dialog.cc",
     "system/accessibility/accessibility_feature_disable_dialog.h",
     "system/accessibility/accessibility_feature_pod_controller.cc",
@@ -736,6 +752,8 @@ component("ash") {
     "system/message_center/notifier_settings_view.h",
     "system/message_center/session_state_notification_blocker.cc",
     "system/message_center/session_state_notification_blocker.h",
+    "system/message_center/unified_message_center_bubble.cc",
+    "system/message_center/unified_message_center_bubble.h",
     "system/message_center/unified_message_center_view.cc",
     "system/message_center/unified_message_center_view.h",
     "system/message_center/unified_message_list_view.cc",
@@ -787,6 +805,7 @@ component("ash") {
     "system/network/sms_observer.h",
     "system/network/tray_network_state_model.cc",
     "system/network/tray_network_state_model.h",
+    "system/network/tray_network_state_observer.h",
     "system/network/unified_network_detailed_view_controller.cc",
     "system/network/unified_network_detailed_view_controller.h",
     "system/network/unified_vpn_detailed_view_controller.cc",
@@ -915,8 +934,6 @@ component("ash") {
     "system/tray/hover_highlight_view.h",
     "system/tray/interacted_by_tap_recorder.cc",
     "system/tray/interacted_by_tap_recorder.h",
-    "system/tray/label_tray_view.cc",
-    "system/tray/label_tray_view.h",
     "system/tray/size_range_layout.cc",
     "system/tray/size_range_layout.h",
     "system/tray/system_menu_button.cc",
@@ -1088,6 +1105,8 @@ component("ash") {
     "wm/desks/desk_preview_view.h",
     "wm/desks/desks_animations.cc",
     "wm/desks/desks_animations.h",
+    "wm/desks/desks_bar_item_border.cc",
+    "wm/desks/desks_bar_item_border.h",
     "wm/desks/desks_bar_view.cc",
     "wm/desks/desks_bar_view.h",
     "wm/desks/desks_controller.cc",
@@ -1108,8 +1127,8 @@ component("ash") {
     "wm/event_client_impl.h",
     "wm/fullscreen_window_finder.cc",
     "wm/fullscreen_window_finder.h",
-    "wm/gestures/overview_gesture_handler.cc",
-    "wm/gestures/overview_gesture_handler.h",
+    "wm/gestures/wm_gesture_handler.cc",
+    "wm/gestures/wm_gesture_handler.h",
     "wm/immersive_context_ash.cc",
     "wm/immersive_context_ash.h",
     "wm/lock_action_handler_layout_manager.cc",
@@ -1137,12 +1156,16 @@ component("ash") {
     "wm/overview/delayed_animation_observer_impl.h",
     "wm/overview/drop_target_view.cc",
     "wm/overview/drop_target_view.h",
+    "wm/overview/overview_animation_state_waiter.cc",
+    "wm/overview/overview_animation_state_waiter.h",
     "wm/overview/overview_animation_type.h",
     "wm/overview/overview_constants.h",
     "wm/overview/overview_controller.cc",
     "wm/overview/overview_delegate.h",
     "wm/overview/overview_grid.cc",
     "wm/overview/overview_grid.h",
+    "wm/overview/overview_grid_event_handler.cc",
+    "wm/overview/overview_grid_event_handler.h",
     "wm/overview/overview_highlight_controller.cc",
     "wm/overview/overview_highlight_controller.h",
     "wm/overview/overview_item.cc",
@@ -1150,6 +1173,7 @@ component("ash") {
     "wm/overview/overview_observer.h",
     "wm/overview/overview_session.cc",
     "wm/overview/overview_session.h",
+    "wm/overview/overview_test_api.cc",
     "wm/overview/overview_utils.cc",
     "wm/overview/overview_utils.h",
     "wm/overview/overview_window_drag_controller.cc",
@@ -1192,6 +1216,7 @@ component("ash") {
     "wm/splitview/split_view_drag_indicators.h",
     "wm/splitview/split_view_highlight_view.cc",
     "wm/splitview/split_view_highlight_view.h",
+    "wm/splitview/split_view_test_api.cc",
     "wm/splitview/split_view_utils.cc",
     "wm/splitview/split_view_utils.h",
     "wm/stacking_controller.cc",
@@ -1240,6 +1265,8 @@ component("ash") {
     "wm/window_finder.cc",
     "wm/window_mirror_view.cc",
     "wm/window_mirror_view.h",
+    "wm/window_mirror_view_pip.cc",
+    "wm/window_mirror_view_pip.h",
     "wm/window_positioner.cc",
     "wm/window_positioning_utils.cc",
     "wm/window_preview_view.cc",
@@ -1303,7 +1330,7 @@ component("ash") {
     "//ui/events",
     "//ui/gfx",
     "//ui/gfx/geometry",
-    "//ui/gfx/geometry/mojo",
+    "//ui/gfx/geometry/mojom",
     "//ui/resources",
     "//ui/strings",
     "//ui/views",
@@ -1326,6 +1353,7 @@ component("ash") {
     "//base",
     "//base:i18n",
     "//base/third_party/dynamic_annotations",
+    "//build:branding_buildflags",
     "//cc",
     "//cc/debug",
     "//cc/paint:paint",
@@ -1418,7 +1446,7 @@ component("ash") {
     "//ui/message_center",
     "//ui/native_theme",
     "//ui/ozone",
-    "//ui/ozone/public/interfaces:gesture_properties_service",
+    "//ui/ozone/public/mojom:gesture_properties_service",
     "//ui/platform_window",
     "//ui/platform_window/stub",
     "//ui/snapshot",
@@ -1538,8 +1566,10 @@ static_library("ash_shell_lib_with_content") {
     "//chromeos/constants",
     "//chromeos/dbus/biod",
     "//chromeos/dbus/power",
-    "//chromeos/services/network_config/public/cpp:manifest",
-    "//chromeos/services/network_config/public/cpp:test_support",
+    "//chromeos/dbus/shill",
+    "//chromeos/network",
+    "//chromeos/services/network_config",
+    "//chromeos/services/network_config/public/mojom",
     "//chromeos/system",
     "//components/discardable_memory/public/mojom",
     "//components/services/font:lib",
@@ -1567,6 +1597,11 @@ static_library("ash_shell_lib_with_content") {
   public_deps = [
     ":ash_shell_lib",
   ]
+  data_deps = [
+    "//ash/strings:ash_test_strings",
+    "//ash/resources:ash_test_resources_with_content_100_percent",
+    "//ash/resources:ash_test_resources_200_percent",
+  ]
 }
 
 copy("dbus_service_files") {
@@ -1599,6 +1634,7 @@ test("ash_unittests") {
     "accessibility/touch_accessibility_enabler_unittest.cc",
     "accessibility/touch_exploration_controller_unittest.cc",
     "accessibility/touch_exploration_manager_unittest.cc",
+    "ambient/model/photo_model_unittest.cc",
     "ambient/ui/ambient_container_view_unittest.cc",
     "app_list/app_list_controller_impl_unittest.cc",
     "app_list/app_list_metrics_unittest.cc",
@@ -1607,13 +1643,13 @@ test("ash_unittests") {
     "app_list/model/app_list_item_list_unittest.cc",
     "app_list/model/app_list_model_unittest.cc",
     "app_list/presenter/app_list_presenter_impl_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",
-    "assistant/assistant_controller_unittest.cc",
     "assistant/assistant_notification_controller_unittest.cc",
-    "assistant/assistant_prefs_controller_unittest.cc",
     "assistant/assistant_screen_context_controller_unittest.cc",
+    "assistant/assistant_state_controller_unittest.cc",
     "assistant/model/assistant_query_history_unittest.cc",
     "assistant/ui/assistant_container_view_unittest.cc",
     "assistant/util/deep_link_util_unittest.cc",
@@ -1723,6 +1759,8 @@ test("ash_unittests") {
     "power/gatt_battery_controller_unittest.cc",
     "power/gatt_battery_percentage_fetcher_unittest.cc",
     "power/gatt_battery_poller_unittest.cc",
+    "power/hid_battery_listener_unittest.cc",
+    "power/hid_battery_util_unittest.cc",
     "root_window_controller_unittest.cc",
     "rotator/screen_rotation_animation_unittest.cc",
     "rotator/screen_rotation_animator_unittest.cc",
@@ -1767,6 +1805,7 @@ test("ash_unittests") {
     "system/message_center/message_center_ui_controller_unittest.cc",
     "system/message_center/notifier_settings_view_unittest.cc",
     "system/message_center/session_state_notification_blocker_unittest.cc",
+    "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/network/active_network_icon_unittest.cc",
@@ -1846,7 +1885,7 @@ test("ash_unittests") {
     "wm/desks/desks_unittests.cc",
     "wm/drag_window_resizer_unittest.cc",
     "wm/fullscreen_window_finder_unittest.cc",
-    "wm/gestures/overview_gesture_handler_unittest.cc",
+    "wm/gestures/wm_gesture_handler_unittest.cc",
     "wm/immersive_fullscreen_controller_unittest.cc",
     "wm/lock_action_handler_layout_manager_unittest.cc",
     "wm/lock_layout_manager_unittest.cc",
@@ -1918,6 +1957,7 @@ test("ash_unittests") {
     "//ash/app_menu",
     "//ash/assistant/model",
     "//ash/assistant/ui",
+    "//ash/assistant/ui:constants",
     "//ash/assistant/util",
     "//ash/components/fast_ink",
     "//ash/components/fast_ink:unit_tests",
@@ -1937,6 +1977,7 @@ test("ash_unittests") {
     "//ash/system/message_center/arc:test_support",
     "//base",
     "//base/test:test_support",
+    "//build:branding_buildflags",
     "//chromeos:test_support",
     "//chromeos/strings:strings_grit",
 
@@ -1952,9 +1993,10 @@ test("ash_unittests") {
     # TODO(https://crbug.com/644355): Remove Shill dependencies.
     "//chromeos/network:test_support",
     "//chromeos/services/assistant:test_support",
+    "//chromeos/services/assistant/public/cpp:prefs",
+    "//chromeos/services/assistant/public/mojom",
     "//chromeos/services/multidevice_setup/public/cpp:test_support",
     "//chromeos/services/multidevice_setup/public/mojom",
-    "//chromeos/services/network_config/public/cpp:test_support",
     "//chromeos/services/network_config/public/mojom",
     "//chromeos/system",
     "//components/account_id",
@@ -1968,7 +2010,6 @@ test("ash_unittests") {
     "//components/sync_preferences:test_support",
     "//components/user_manager",
     "//components/user_manager:test_support",
-    "//device/base",
     "//device/bluetooth",
     "//device/bluetooth:mocks",
     "//extensions/common:common_constants",
@@ -2108,10 +2149,6 @@ executable("ash_shell_with_content") {
     "//content/public/app:both",
     "//device/bluetooth",
   ]
-
-  data_deps = [
-    "//ash/resources:ash_test_resources_with_content_100_percent",
-  ]
 }
 
 static_library("test_support") {
@@ -2135,6 +2172,8 @@ static_library("test_support") {
     "app_list/test/test_app_list_client.h",
     "app_menu/notification_menu_view_test_api.cc",
     "app_menu/notification_menu_view_test_api.h",
+    "assistant/test/assistant_ash_test_base.cc",
+    "assistant/test/assistant_ash_test_base.h",
     "assistant/test/test_assistant_service.cc",
     "assistant/test/test_assistant_service.h",
     "display/display_configuration_controller_test_api.cc",
@@ -2175,6 +2214,8 @@ static_library("test_support") {
     "shelf/overflow_bubble_view_test_api.h",
     "shelf/shelf_button_pressed_metric_tracker_test_api.cc",
     "shelf/shelf_button_pressed_metric_tracker_test_api.h",
+    "shelf/shelf_focus_cycler.cc",
+    "shelf/shelf_focus_cycler.h",
     "shelf/shelf_test_api_impl.cc",
     "shelf/shelf_test_api_impl.h",
     "shelf/shelf_view_test_api.cc",
@@ -2245,6 +2286,8 @@ static_library("test_support") {
 
   public_deps = [
     "//ash",
+    "//chromeos/services/assistant/public/mojom",
+    "//chromeos/services/network_config/public/cpp:test_support",
     "//dbus",
     "//services/service_manager/public/cpp/test:test_support",
     "//testing/gtest",
@@ -2256,14 +2299,16 @@ static_library("test_support") {
     "//ash/app_list:test_support",
     "//ash/app_list/presenter",
     "//ash/app_menu",
+    "//ash/assistant/model:model",
     "//ash/components/fast_ink",
     "//ash/public/cpp",
     "//ash/public/cpp:test_support",
-    "//ash/public/interfaces:test_interfaces",
+    "//ash/public/mojom:test_interfaces",
     "//base",
     "//base:i18n",
     "//base/test:test_support",
     "//cc:test_support",
+    "//ui/platform_window/common",
 
     # TODO(https://crbug.com/644336): Make CrasAudioHandler Chrome or Ash only.
     "//chromeos/audio",
diff --git a/chromium/ash/app_list/BUILD.gn b/chromium/ash/app_list/BUILD.gn
index ccc17dc0a95..9fc51e66993 100644
--- a/chromium/ash/app_list/BUILD.gn
+++ b/chromium/ash/app_list/BUILD.gn
@@ -128,6 +128,7 @@ component("app_list") {
     "//ui/base/ime/chromeos",
     "//ui/chromeos/search_box",
     "//ui/compositor",
+    "//ui/compositor_extra",
     "//ui/display",
     "//ui/events",
     "//ui/gfx",
diff --git a/chromium/ash/assistant/model/BUILD.gn b/chromium/ash/assistant/model/BUILD.gn
index 767e5ef82cf..dd18c207615 100644
--- a/chromium/ash/assistant/model/BUILD.gn
+++ b/chromium/ash/assistant/model/BUILD.gn
@@ -13,9 +13,6 @@ component("model") {
     "assistant_alarm_timer_model.cc",
     "assistant_alarm_timer_model.h",
     "assistant_alarm_timer_model_observer.h",
-    "assistant_cache_model.cc",
-    "assistant_cache_model.h",
-    "assistant_cache_model_observer.h",
     "assistant_interaction_model.cc",
     "assistant_interaction_model.h",
     "assistant_interaction_model_observer.h",
@@ -31,6 +28,9 @@ component("model") {
     "assistant_screen_context_model.cc",
     "assistant_screen_context_model.h",
     "assistant_screen_context_model_observer.h",
+    "assistant_suggestions_model.cc",
+    "assistant_suggestions_model.h",
+    "assistant_suggestions_model_observer.h",
     "assistant_ui_element.cc",
     "assistant_ui_element.h",
     "assistant_ui_model.cc",
diff --git a/chromium/ash/assistant/ui/BUILD.gn b/chromium/ash/assistant/ui/BUILD.gn
index 247afa9dd25..0ac76631a0f 100644
--- a/chromium/ash/assistant/ui/BUILD.gn
+++ b/chromium/ash/assistant/ui/BUILD.gn
@@ -88,6 +88,8 @@ component("ui") {
     "main_stage/suggestion_container_view.h",
     "main_stage/ui_element_container_view.cc",
     "main_stage/ui_element_container_view.h",
+    "proactive_suggestions_view.cc",
+    "proactive_suggestions_view.h",
   ]
 
   deps = [
diff --git a/chromium/ash/public/cpp/BUILD.gn b/chromium/ash/public/cpp/BUILD.gn
index caff4388443..c4138ad670c 100644
--- a/chromium/ash/public/cpp/BUILD.gn
+++ b/chromium/ash/public/cpp/BUILD.gn
@@ -24,6 +24,8 @@ component("cpp") {
     "app_list/app_list_client.h",
     "app_list/app_list_config.cc",
     "app_list/app_list_config.h",
+    "app_list/app_list_config_provider.cc",
+    "app_list/app_list_config_provider.h",
     "app_list/app_list_controller.cc",
     "app_list/app_list_controller.h",
     "app_list/app_list_features.cc",
@@ -62,13 +64,20 @@ component("cpp") {
     "ash_view_ids.h",
     "assistant/assistant_image_downloader.cc",
     "assistant/assistant_image_downloader.h",
+    "assistant/assistant_interface_binder.cc",
+    "assistant/assistant_interface_binder.h",
     "assistant/assistant_setup.cc",
     "assistant/assistant_setup.h",
+    "assistant/assistant_state.cc",
+    "assistant/assistant_state.h",
     "assistant/assistant_state_base.cc",
     "assistant/assistant_state_base.h",
-    "assistant/assistant_state_proxy.cc",
-    "assistant/assistant_state_proxy.h",
-    "assistant/default_voice_interaction_observer.h",
+    "assistant/proactive_suggestions.cc",
+    "assistant/proactive_suggestions.h",
+    "assistant/proactive_suggestions_client.cc",
+    "assistant/proactive_suggestions_client.h",
+    "assistant/util/histogram_util.cc",
+    "assistant/util/histogram_util.h",
     "caption_buttons/caption_button_model.h",
     "caption_buttons/frame_back_button.cc",
     "caption_buttons/frame_back_button.h",
@@ -127,6 +136,8 @@ component("cpp") {
     "media_client.h",
     "media_controller.cc",
     "media_controller.h",
+    "network_config_service.cc",
+    "network_config_service.h",
     "network_icon_image_source.cc",
     "network_icon_image_source.h",
     "new_window_delegate.cc",
@@ -202,8 +213,6 @@ component("cpp") {
     "update_types.h",
     "view_shadow.cc",
     "view_shadow.h",
-    "voice_interaction_controller.cc",
-    "voice_interaction_controller.h",
     "wallpaper_controller.cc",
     "wallpaper_controller.h",
     "wallpaper_controller_client.h",
@@ -226,11 +235,13 @@ component("cpp") {
     "//ash/public/cpp/vector_icons",
     "//chromeos/constants",
     "//chromeos/dbus/power:power_manager_proto",
+    "//chromeos/services/assistant/public/cpp:prefs",
+    "//chromeos/services/network_config:in_process_instance",
     "//components/prefs",
     "//components/sync:rest_of_sync",
     "//mojo/public/cpp/bindings",
     "//services/service_manager/public/cpp",
-    "//skia/public/interfaces",
+    "//skia/public/mojom",
     "//ui/aura",
     "//ui/chromeos/strings",
     "//ui/compositor_extra",
@@ -244,9 +255,11 @@ component("cpp") {
   ]
 
   public_deps = [
-    "//ash/public/interfaces",
+    "//ash/public/mojom",
     "//base",
-    "//components/arc/common:notifications",
+    "//chromeos/services/assistant/public/mojom",
+    "//chromeos/services/network_config/public/mojom",
+    "//components/arc/mojom:notifications",
     "//components/session_manager:base",
     "//components/user_manager",
     "//ui/gfx",
@@ -262,7 +275,7 @@ source_set("manifest") {
   ]
 
   deps = [
-    "//ash/public/interfaces",
+    "//ash/public/mojom",
     "//base",
     "//chromeos/services/multidevice_setup/public/mojom",
     "//chromeos/services/network_config/public/mojom",
@@ -272,7 +285,7 @@ source_set("manifest") {
     "//services/preferences/public/mojom",
     "//services/service_manager/public/cpp",
     "//services/service_manager/public/mojom",
-    "//services/viz/public/interfaces",
+    "//services/viz/public/mojom",
   ]
 }
 
@@ -286,7 +299,7 @@ source_set("manifest_for_tests") {
 
   deps = [
     ":manifest",
-    "//ash/public/interfaces:test_interfaces",
+    "//ash/public/mojom:test_interfaces",
     "//base",
     "//services/service_manager/public/cpp",
     "//services/service_manager/public/mojom",
@@ -296,13 +309,13 @@ source_set("manifest_for_tests") {
 source_set("unit_tests") {
   testonly = true
   sources = [
+    "app_list/app_list_config_provider_unittest.cc",
     "default_scale_factor_retriever_unittest.cc",
     "pagination/pagination_model_unittest.cc",
     "power_utils_unittest.cc",
     "rounded_corner_decorator_unittest.cc",
     "shelf_model_unittest.cc",
     "view_shadow_unittest.cc",
-    "voice_interaction_controller_unittest.cc",
   ]
 
   deps = [
diff --git a/chromium/ash/public/interfaces/vpn_list.mojom b/chromium/ash/public/interfaces/vpn_list.mojom
deleted file mode 100644
index f190c7f43ae..00000000000
--- a/chromium/ash/public/interfaces/vpn_list.mojom
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2016 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-module ash.mojom;
-
-import "mojo/public/mojom/base/time.mojom";
-
-// Describes a third-party VPN provided by an extension (e.g. Cisco AnyConnect).
-struct ThirdPartyVpnProvider {
-  string name;
-  string extension_id;
-};
-
-// Describes an Arc VPN provider. last_launch_time is used to sort the list of
-// Arc VPN providers.
-struct ArcVpnProvider {
-  // Unique android package name of the Arc VPN provider. e.g. vpn.app.package
-  string package_name;
-  // App name of Arc VPN provider. e.g. VPNapp
-  string app_name;
-  // Unique app id for launching the app. e.g. pbmkokpdlpfmapoiccpblbmjjhhabjaa
-  string app_id;
-  // Last launch time of the Arc VPN provider.
-  mojo_base.mojom.Time last_launch_time;
-};
-
-// Manages the VPN provider list in ash. Allows extension-backed VPN providers
-// to be added. Ash handles the built-in OpenVPN / L2TP provider internally.
-// Allows Arc VPN providers to be added and removed, updates providers' launch
-// time so that they are shown in LRU order, updates providers' name change.
-interface VpnList {
-  // Sets the list of third-party VPN providers. The |providers| array may be
-  // empty to clear the list (e.g. after the last third-party VPN extension is
-  // uninstalled).
-  SetThirdPartyVpnProviders(array<ThirdPartyVpnProvider> providers);
-
-  // Sets the list of Arc VPN providers.
-  SetArcVpnProviders(array<ArcVpnProvider> arc_providers);
-
-  // Adds or updates an Arc VPN provider.
-  AddOrUpdateArcVPNProvider(ArcVpnProvider arc_provider);
-
-  // Removes an Arc VPN provider.
-  RemoveArcVPNProvider(string package_name);
-};
diff --git a/chromium/ash/public/interfaces/BUILD.gn b/chromium/ash/public/mojom/BUILD.gn
index 6f1d7f07b7c..118409980fd 100644
--- a/chromium/ash/public/interfaces/BUILD.gn
+++ b/chromium/ash/public/mojom/BUILD.gn
@@ -4,11 +4,12 @@
 
 import("//mojo/public/tools/bindings/mojom.gni")
 
-mojom("interfaces") {
+mojom("mojom") {
   disable_variants = true
 
   sources = [
     "assistant_controller.mojom",
+    "assistant_state_controller.mojom",
     "assistant_volume_control.mojom",
     "constants.mojom",
     "cros_display_config.mojom",
@@ -16,24 +17,22 @@ mojom("interfaces") {
     "ime_info.mojom",
     "tray_action.mojom",
     "voice_interaction_controller.mojom",
-    "vpn_list.mojom",
   ]
 
   public_deps = [
     "//chromeos/components/proximity_auth/public/mojom",
-    "//chromeos/services/assistant/public/mojom",
+    "//chromeos/services/assistant/public/mojom:notification",
     "//components/account_id/mojom",
     "//components/sync/mojom",
     "//mojo/public/mojom/base",
     "//services/content/public/mojom",
     "//services/preferences/public/mojom",
-    "//skia/public/interfaces",
-    "//ui/base/ime/chromeos/public/interfaces",
-    "//ui/base/mojom",
+    "//skia/public/mojom",
+    "//ui/base/ime/chromeos/public/mojom",
     "//ui/display/mojom:mojom",
-    "//ui/gfx/geometry/mojo",
-    "//ui/gfx/image/mojo:interfaces",
-    "//ui/gfx/range/mojo",
+    "//ui/gfx/geometry/mojom",
+    "//ui/gfx/image/mojom",
+    "//ui/gfx/range/mojom",
     "//url/mojom:url_mojom_gurl",
   ]
 
@@ -50,9 +49,9 @@ mojom("test_interfaces") {
     "status_area_widget_test_api.test-mojom",
   ]
   deps = [
-    ":interfaces",
+    ":mojom",
     "//components/account_id/mojom",
     "//mojo/public/mojom/base",
-    "//ui/gfx/geometry/mojo",
+    "//ui/gfx/geometry/mojom",
   ]
 }
diff --git a/chromium/ash/public/interfaces/assistant_controller.mojom b/chromium/ash/public/mojom/assistant_controller.mojom
index 707aee49e66..bb7e017860d 100644
--- a/chromium/ash/public/interfaces/assistant_controller.mojom
+++ b/chromium/ash/public/mojom/assistant_controller.mojom
@@ -4,28 +4,9 @@
 
 module ash.mojom;
 
-import "chromeos/services/assistant/public/mojom/assistant.mojom";
-import "ui/gfx/geometry/mojo/geometry.mojom";
+import "chromeos/services/assistant/public/mojom/assistant_notification.mojom";
 import "mojo/public/mojom/base/time.mojom";
-
-// Interface to AssistantController which is owned by Shell in Ash. This is
-// typically used by the Assistant service to provide the controller with an
-// interface to itself.
-interface AssistantController {
-  // Provides a reference to the underlying |assistant| service.
-  SetAssistant(chromeos.assistant.mojom.Assistant assistant);
-
-  // Show speaker id enrollment flow.
-  StartSpeakerIdEnrollmentFlow();
-
-  // Send Assistant feedback to Assistant server. If |pii_allowed| is
-  // true then the user gives permission to attach Assistant debug info.
-  // |feedback_description| is user's feedback input.
-  SendAssistantFeedback(
-    bool pii_allowed,
-    string feedback_description,
-    string screenshot_png);
-};
+import "ui/gfx/geometry/mojom/geometry.mojom";
 
 enum AssistantTimerState {
   kUnknown,
diff --git a/chromium/ash/public/mojom/assistant_state_controller.mojom b/chromium/ash/public/mojom/assistant_state_controller.mojom
new file mode 100644
index 00000000000..42b924f074b
--- /dev/null
+++ b/chromium/ash/public/mojom/assistant_state_controller.mojom
@@ -0,0 +1,34 @@
+// Copyright 2019 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.mojom;
+
+import "ash/public/mojom/voice_interaction_controller.mojom";
+
+// Allows observing changes to Assistant status and settings.
+interface AssistantStateObserver {
+  // Called when Assistant state changes.
+  OnAssistantStatusChanged(VoiceInteractionState state);
+
+  // Called when assistant feature allowed state has changed.
+  OnAssistantFeatureAllowedChanged(AssistantAllowedState state);
+
+  // Called when Google Play Store is enabled/disabled.
+  OnArcPlayStoreEnabledChanged(bool enabled);
+
+  // Called when locale is changed in pref. The locale is in the format can be
+  // "en-US" or simply "en". When locale is not set in pref, it returns empty
+  // string.
+  OnLocaleChanged(string locale);
+
+  // Called when locked full screen state has changed.
+  OnLockedFullScreenStateChanged(bool enabled);
+};
+
+// Interface for ash client (Assistant service) to connect to state controller,
+// which notifies changes of Assistant status and settings.
+interface AssistantStateController {
+  // Add an observer.
+  AddMojomObserver(AssistantStateObserver observer);
+};
diff --git a/chromium/ash/public/interfaces/assistant_volume_control.mojom b/chromium/ash/public/mojom/assistant_volume_control.mojom
index e8bf405d627..e8bf405d627 100644
--- a/chromium/ash/public/interfaces/assistant_volume_control.mojom
+++ b/chromium/ash/public/mojom/assistant_volume_control.mojom
diff --git a/chromium/ash/public/interfaces/constants.mojom b/chromium/ash/public/mojom/constants.mojom
index 60c2a21ea15..60c2a21ea15 100644
--- a/chromium/ash/public/interfaces/constants.mojom
+++ b/chromium/ash/public/mojom/constants.mojom
diff --git a/chromium/ash/public/interfaces/cros_display_config.mojom b/chromium/ash/public/mojom/cros_display_config.mojom
index 5be4f56fe11..774f0533c0d 100644
--- a/chromium/ash/public/interfaces/cros_display_config.mojom
+++ b/chromium/ash/public/mojom/cros_display_config.mojom
@@ -4,7 +4,7 @@
 
 module ash.mojom;
 
-import "ui/gfx/geometry/mojo/geometry.mojom";
+import "ui/gfx/geometry/mojom/geometry.mojom";
 import "ui/display/mojom/display.mojom";
 
 // All points, bounds, and insets are in display pixels unless otherwise
diff --git a/chromium/ash/public/interfaces/ime_controller.mojom b/chromium/ash/public/mojom/ime_controller.mojom
index 33f72994e3f..9edb3a69b12 100644
--- a/chromium/ash/public/interfaces/ime_controller.mojom
+++ b/chromium/ash/public/mojom/ime_controller.mojom
@@ -4,10 +4,10 @@
 
 module ash.mojom;
 
-import "ash/public/interfaces/ime_info.mojom";
+import "ash/public/mojom/ime_info.mojom";
 import "mojo/public/mojom/base/string16.mojom";
-import "ui/base/ime/chromeos/public/interfaces/ime_keyset.mojom";
-import "ui/gfx/geometry/mojo/geometry.mojom";
+import "ui/base/ime/chromeos/public/mojom/ime_keyset.mojom";
+import "ui/gfx/geometry/mojom/geometry.mojom";
 
 // Interface for ash client (e.g. Chrome) to send input method info to ash.
 interface ImeController {
diff --git a/chromium/ash/public/interfaces/ime_info.mojom b/chromium/ash/public/mojom/ime_info.mojom
index bd24bf85560..bd24bf85560 100644
--- a/chromium/ash/public/interfaces/ime_info.mojom
+++ b/chromium/ash/public/mojom/ime_info.mojom
diff --git a/chromium/ash/public/interfaces/tray_action.mojom b/chromium/ash/public/mojom/tray_action.mojom
index e366f9a1ec2..e366f9a1ec2 100644
--- a/chromium/ash/public/interfaces/tray_action.mojom
+++ b/chromium/ash/public/mojom/tray_action.mojom
diff --git a/chromium/ash/public/interfaces/voice_interaction_controller.mojom b/chromium/ash/public/mojom/voice_interaction_controller.mojom
index dd8daa3d10a..8f19c8ebf85 100644
--- a/chromium/ash/public/interfaces/voice_interaction_controller.mojom
+++ b/chromium/ash/public/mojom/voice_interaction_controller.mojom
@@ -5,7 +5,7 @@
 module ash.mojom;
 
 // There is another copy of the VoiceInteractionState definition in
-// //components/arc/common/voice_interaction_framework.mojom
+// //components/arc/mojom/voice_interaction_framework.mojom
 // Please also update the other one if you change it.
 // The duplicate definition is because we do not use extensible widely
 // (crbug.com/731893).
@@ -29,8 +29,6 @@ enum AssistantAllowedState {
   DISALLOWED_BY_POLICY,
   // Disallowed because user's locale is not compatible.
   DISALLOWED_BY_LOCALE,
-  // Disallowed because the feature flag is off.
-  DISALLOWED_BY_FLAG,
   // Disallowed because current user is not primary user.
   DISALLOWED_BY_NONPRIMARY_USER,
   // Disallowed because current user is supervised user.
diff --git a/chromium/ash/resources/vector_icons/BUILD.gn b/chromium/ash/resources/vector_icons/BUILD.gn
index cb5621cdea3..0557e772dab 100644
--- a/chromium/ash/resources/vector_icons/BUILD.gn
+++ b/chromium/ash/resources/vector_icons/BUILD.gn
@@ -50,6 +50,8 @@ aggregate_vector_icons("ash_vector_icons") {
     "lock_screen_caps_lock.icon",
     "lock_screen_dropdown.icon",
     "lock_screen_fingerprint.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",
@@ -58,7 +60,6 @@ aggregate_vector_icons("ash_vector_icons") {
     "login_screen_menu_dropdown.icon",
     "login_screen_enterprise.icon",
     "mic.icon",
-    "network_badge_add_other.icon",
     "network_badge_captive_portal.icon",
     "network_badge_off.icon",
     "network_badge_roaming.icon",
@@ -157,7 +158,6 @@ aggregate_vector_icons("ash_vector_icons") {
     "system_menu_audio_output.icon",
     "system_menu_add_connection.icon",
     "system_menu_arrow_back.icon",
-    "system_menu_arrow_right.icon",
     "system_menu_bluetooth.icon",
     "system_menu_bluetooth_connected.icon",
     "system_menu_bluetooth_disabled.icon",
diff --git a/chromium/ash/system/message_center/arc/BUILD.gn b/chromium/ash/system/message_center/arc/BUILD.gn
index 59ebaaf3880..8ecf076bb97 100644
--- a/chromium/ash/system/message_center/arc/BUILD.gn
+++ b/chromium/ash/system/message_center/arc/BUILD.gn
@@ -35,7 +35,7 @@ static_library("arc") {
     "//components/account_id",
     "//components/arc:arc_metrics_constants",
     "//components/arc:connection_holder",
-    "//components/arc/common:notifications",
+    "//components/arc/mojom:notifications",
     "//components/exo",
     "//mojo/public/cpp/system",
     "//skia",