BASELINE: Update Chromium to 84.0.4147.141

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

6 files changed, 45 insertions, 78 deletions

diff --git a/chromium/ash/public/cpp/BUILD.gn b/chromium/ash/public/cpp/BUILD.gn
index e5caf8cb981..911b526aa92 100644
--- a/chromium/ash/public/cpp/BUILD.gn
+++ b/chromium/ash/public/cpp/BUILD.gn
@@ -17,12 +17,14 @@ component("cpp") {
     "accessibility_focus_ring_controller.h",
     "accessibility_focus_ring_info.cc",
     "accessibility_focus_ring_info.h",
+    "ambient/ambient_backend_controller.cc",
+    "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/photo_controller.cc",
-    "ambient/photo_controller.h",
     "android_intent_helper.cc",
     "android_intent_helper.h",
     "app_list/app_list_client.h",
@@ -37,6 +39,7 @@ component("cpp") {
     "app_list/app_list_features.h",
     "app_list/app_list_metrics.cc",
     "app_list/app_list_metrics.h",
+    "app_list/app_list_notifier.h",
     "app_list/app_list_switches.cc",
     "app_list/app_list_switches.h",
     "app_list/app_list_types.cc",
@@ -46,6 +49,8 @@ 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",
@@ -61,8 +66,6 @@ component("cpp") {
     "ash_view_ids.h",
     "assistant/assistant_client.cc",
     "assistant/assistant_client.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",
@@ -75,6 +78,15 @@ component("cpp") {
     "assistant/assistant_web_view.h",
     "assistant/assistant_web_view_factory.cc",
     "assistant/assistant_web_view_factory.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_suggestions_controller.cc",
+    "assistant/controller/assistant_suggestions_controller.h",
+    "assistant/controller/assistant_ui_controller.cc",
+    "assistant/controller/assistant_ui_controller.h",
     "assistant/conversation_starter.cc",
     "assistant/conversation_starter.h",
     "assistant/conversation_starters_client.cc",
@@ -112,6 +124,8 @@ component("cpp") {
     "frame_utils.cc",
     "frame_utils.h",
     "gesture_action_type.h",
+    "image_downloader.cc",
+    "image_downloader.h",
     "ime_controller.cc",
     "ime_controller.h",
     "ime_controller_client.h",
@@ -253,11 +267,13 @@ component("cpp") {
     "//ash/public/cpp/vector_icons",
     "//chromeos/constants",
     "//chromeos/dbus/power:power_manager_proto",
-    "//chromeos/services/assistant/public/cpp:prefs",
+    "//chromeos/services/assistant/public/cpp",
     "//chromeos/services/network_config:in_process_instance",
     "//components/prefs",
     "//components/sync:rest_of_sync",
     "//mojo/public/cpp/bindings",
+    "//net/traffic_annotation",
+    "//services/network/public/cpp:cpp",
     "//skia/public/mojom",
     "//ui/aura",
     "//ui/chromeos/strings",
@@ -319,12 +335,14 @@ source_set("test_support") {
   sources = [
     "immersive/immersive_fullscreen_controller_test_api.cc",
     "immersive/immersive_fullscreen_controller_test_api.h",
+    "test/test_ambient_client.cc",
+    "test/test_ambient_client.h",
+    "test/test_image_downloader.cc",
+    "test/test_image_downloader.h",
     "test/test_keyboard_controller_observer.cc",
     "test/test_keyboard_controller_observer.h",
     "test/test_new_window_delegate.cc",
     "test/test_new_window_delegate.h",
-    "test/test_photo_controller.cc",
-    "test/test_photo_controller.h",
     "test/test_system_tray_client.cc",
     "test/test_system_tray_client.h",
     "test/test_tablet_mode.cc",
@@ -334,6 +352,7 @@ source_set("test_support") {
   deps = [
     ":cpp",
     "//base",
+    "//services/network/public/cpp:cpp",
     "//ui/aura",
     "//ui/aura:test_support",
     "//ui/gfx",
diff --git a/chromium/ash/public/cpp/assistant/test_support/BUILD.gn b/chromium/ash/public/cpp/assistant/test_support/BUILD.gn
new file mode 100644
index 00000000000..05d6de9b1c8
--- /dev/null
+++ b/chromium/ash/public/cpp/assistant/test_support/BUILD.gn
@@ -0,0 +1,14 @@
+static_library("test_support") {
+  testonly = true
+
+  sources = [
+    "mock_assistant_controller.cc",
+    "mock_assistant_controller.h",
+  ]
+
+  deps = [
+    "//ash/public/cpp",
+    "//testing/gmock",
+    "//url",
+  ]
+}
diff --git a/chromium/ash/public/cpp/vector_icons/BUILD.gn b/chromium/ash/public/cpp/vector_icons/BUILD.gn
index 38281b020b3..d2ce26e372a 100644
--- a/chromium/ash/public/cpp/vector_icons/BUILD.gn
+++ b/chromium/ash/public/cpp/vector_icons/BUILD.gn
@@ -9,6 +9,7 @@ aggregate_vector_icons("ash_public_vector_icons") {
   icon_directory = "."
 
   icons = [
+    "assistant.icon",
     "notification_assistant.icon",
     "notification_supervised_user.icon",
     "notification_warning.icon",
diff --git a/chromium/ash/public/mojom/BUILD.gn b/chromium/ash/public/mojom/BUILD.gn
index 1a17989fe68..e4a3d2e017e 100644
--- a/chromium/ash/public/mojom/BUILD.gn
+++ b/chromium/ash/public/mojom/BUILD.gn
@@ -9,7 +9,6 @@ mojom("mojom") {
 
   sources = [
     "assistant_controller.mojom",
-    "assistant_state_controller.mojom",
     "assistant_volume_control.mojom",
     "cros_display_config.mojom",
     "tray_action.mojom",
diff --git a/chromium/ash/public/mojom/assistant_state_controller.mojom b/chromium/ash/public/mojom/assistant_state_controller.mojom
deleted file mode 100644
index 34538e4ca32..00000000000
--- a/chromium/ash/public/mojom/assistant_state_controller.mojom
+++ /dev/null
@@ -1,70 +0,0 @@
-// 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;
-
-// The initial state is NOT_READY, after Assistant service started it becomes
-// READY. When Assistant UI shows up the state becomes VISIBLE.
-enum AssistantState {
-  // The Assistant service is not ready yet.
-  NOT_READY = 0,
-  // The Assistant service is ready.
-  READY,
-  // The Assistant service is ready.
-  // TODO(b/142428671): This is set when the Assistant backend signals it is
-  // ready to handle queries, where |READY| is signaled when it is started.
-  // If this signal turns out to be reliable it should replace |READY| and be
-  // renamed to |READY|.
-  NEW_READY,
-};
-
-enum AssistantAllowedState {
-  // Assistant feature is allowed.
-  ALLOWED = 0,
-  // Disallowed because search and assistant is disabled by policy.
-  DISALLOWED_BY_POLICY,
-  // Disallowed because user's locale is not compatible.
-  DISALLOWED_BY_LOCALE,
-  // Disallowed because current user is not primary user.
-  DISALLOWED_BY_NONPRIMARY_USER,
-  // Disallowed because current user is supervised user.
-  DISALLOWED_BY_SUPERVISED_USER,
-  // Disallowed because incognito mode.
-  DISALLOWED_BY_INCOGNITO,
-  // Disallowed because the device is in demo mode.
-  DISALLOWED_BY_DEMO_MODE,
-  // Disallowed because the device is in public session.
-  DISALLOWED_BY_PUBLIC_SESSION,
-  // Disallowed because the user's account type is currently not supported.
-  DISALLOWED_BY_ACCOUNT_TYPE,
-  // Disallowed because the device is in Kiosk mode.
-  DISALLOWED_BY_KIOSK_MODE
-};
-
-// Allows observing changes to Assistant status and settings.
-interface AssistantStateObserver {
-  // Called when Assistant state changes.
-  OnAssistantStatusChanged(AssistantState 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(pending_remote<AssistantStateObserver> observer);
-};
diff --git a/chromium/ash/public/mojom/cros_display_config.mojom b/chromium/ash/public/mojom/cros_display_config.mojom
index 41c57a0a90a..b3096ad665d 100644
--- a/chromium/ash/public/mojom/cros_display_config.mojom
+++ b/chromium/ash/public/mojom/cros_display_config.mojom
@@ -298,6 +298,10 @@ interface CrosDisplayConfigController {
                    DisplayConfigOperation op,
                    TouchCalibration? calibration) =>
     (DisplayConfigResult result);
+
+  // Sets |id| of display to render identification highlight on. Invalid |id|
+  // turns identification highlight off.
+  HighlightDisplay(int64 id);
 };
 
 // Interface for clients needing to be informed when the display configuration