BASELINE: Update Chromium to 85.0.4183.14085-based

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

1 files changed, 26 insertions, 14 deletions

diff --git a/chromium/ash/public/cpp/BUILD.gn b/chromium/ash/public/cpp/BUILD.gn
index 911b526aa92..118697ba72e 100644
--- a/chromium/ash/public/cpp/BUILD.gn
+++ b/chromium/ash/public/cpp/BUILD.gn
@@ -21,10 +21,12 @@ component("cpp") {
     "ambient/ambient_backend_controller.h",
     "ambient/ambient_client.cc",
     "ambient/ambient_client.h",
-    "ambient/ambient_mode_state.cc",
-    "ambient/ambient_mode_state.h",
     "ambient/ambient_prefs.cc",
     "ambient/ambient_prefs.h",
+    "ambient/ambient_ui_model.cc",
+    "ambient/ambient_ui_model.h",
+    "ambient/common/ambient_settings.cc",
+    "ambient/common/ambient_settings.h",
     "android_intent_helper.cc",
     "android_intent_helper.h",
     "app_list/app_list_client.h",
@@ -49,10 +51,6 @@ component("cpp") {
     "app_types.h",
     "arc_app_id_provider.cc",
     "arc_app_id_provider.h",
-    "arc_notification_manager_base.cc",
-    "arc_notification_manager_base.h",
-    "arc_notifications_host_initializer.cc",
-    "arc_notifications_host_initializer.h",
     "ash_constants.h",
     "ash_features.cc",
     "ash_features.h",
@@ -78,11 +76,15 @@ component("cpp") {
     "assistant/assistant_web_view.h",
     "assistant/assistant_web_view_factory.cc",
     "assistant/assistant_web_view_factory.h",
+    "assistant/controller/assistant_alarm_timer_controller.cc",
+    "assistant/controller/assistant_alarm_timer_controller.h",
     "assistant/controller/assistant_controller.cc",
     "assistant/controller/assistant_controller.h",
     "assistant/controller/assistant_controller_observer.h",
     "assistant/controller/assistant_interaction_controller.cc",
     "assistant/controller/assistant_interaction_controller.h",
+    "assistant/controller/assistant_screen_context_controller.cc",
+    "assistant/controller/assistant_screen_context_controller.h",
     "assistant/controller/assistant_suggestions_controller.cc",
     "assistant/controller/assistant_suggestions_controller.h",
     "assistant/controller/assistant_ui_controller.cc",
@@ -91,12 +93,6 @@ component("cpp") {
     "assistant/conversation_starter.h",
     "assistant/conversation_starters_client.cc",
     "assistant/conversation_starters_client.h",
-    "assistant/proactive_suggestions.cc",
-    "assistant/proactive_suggestions.h",
-    "assistant/proactive_suggestions_client.cc",
-    "assistant/proactive_suggestions_client.h",
-    "assistant/util/histogram_util.cc",
-    "assistant/util/histogram_util.h",
     "back_gesture_contextual_nudge_controller.h",
     "back_gesture_contextual_nudge_delegate.h",
     "caption_buttons/caption_button_model.h",
@@ -140,6 +136,8 @@ component("cpp") {
     "immersive/immersive_fullscreen_controller_delegate.h",
     "immersive/immersive_revealed_lock.cc",
     "immersive/immersive_revealed_lock.h",
+    "keyboard/arc/arc_input_method_bounds_tracker.cc",
+    "keyboard/arc/arc_input_method_bounds_tracker.h",
     "keyboard/keyboard_config.h",
     "keyboard/keyboard_controller.cc",
     "keyboard/keyboard_controller.h",
@@ -166,6 +164,14 @@ component("cpp") {
     "media_client.h",
     "media_controller.cc",
     "media_controller.h",
+    "message_center/arc_notification_constants.h",
+    "message_center/arc_notification_manager_base.cc",
+    "message_center/arc_notification_manager_base.h",
+    "message_center/arc_notification_manager_delegate.h",
+    "message_center/arc_notifications_host_initializer.cc",
+    "message_center/arc_notifications_host_initializer.h",
+    "metrics_util.cc",
+    "metrics_util.h",
     "network_config_service.cc",
     "network_config_service.h",
     "network_icon_image_source.cc",
@@ -192,13 +198,18 @@ component("cpp") {
     "power_utils.h",
     "presentation_time_recorder.cc",
     "presentation_time_recorder.h",
-    "quick_answers_controller.cc",
-    "quick_answers_controller.h",
+    "quick_answers/controller/quick_answers_controller.cc",
+    "quick_answers/controller/quick_answers_controller.h",
     "rounded_corner_decorator.cc",
     "rounded_corner_decorator.h",
     "scale_utility.cc",
     "scale_utility.h",
     "scoped_guest_button_blocker.h",
+    "scoped_singleton_resetter_for_test.h",
+    "screen_backlight.cc",
+    "screen_backlight.h",
+    "screen_backlight_observer.h",
+    "screen_backlight_type.h",
     "select_to_speak_event_handler_delegate.h",
     "session/session_activation_observer.h",
     "session/session_controller.cc",
@@ -352,6 +363,7 @@ source_set("test_support") {
   deps = [
     ":cpp",
     "//base",
+    "//services/device/public/cpp:test_support",
     "//services/network/public/cpp:cpp",
     "//ui/aura",
     "//ui/aura:test_support",