BASELINE: Update Chromium to 85.0.4183.14085-based

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

4 files changed, 26 insertions, 6 deletions

diff --git a/chromium/ash/assistant/model/BUILD.gn b/chromium/ash/assistant/model/BUILD.gn
index ecf60409e13..1cbf09de39d 100644
--- a/chromium/ash/assistant/model/BUILD.gn
+++ b/chromium/ash/assistant/model/BUILD.gn
@@ -49,6 +49,7 @@ component("model") {
     "//chromeos/services/assistant/public/cpp",
     "//chromeos/services/assistant/public/mojom",
     "//services/content/public/cpp",
+    "//ui/accessibility/mojom",
     "//ui/gfx/geometry",
   ]
 }
diff --git a/chromium/ash/assistant/ui/BUILD.gn b/chromium/ash/assistant/ui/BUILD.gn
index 571027ec0e4..f61e5003c92 100644
--- a/chromium/ash/assistant/ui/BUILD.gn
+++ b/chromium/ash/assistant/ui/BUILD.gn
@@ -54,6 +54,8 @@ component("ui") {
     "main_stage/assistant_card_element_view.h",
     "main_stage/assistant_footer_view.cc",
     "main_stage/assistant_footer_view.h",
+    "main_stage/assistant_onboarding_view.cc",
+    "main_stage/assistant_onboarding_view.h",
     "main_stage/assistant_opt_in_view.cc",
     "main_stage/assistant_opt_in_view.h",
     "main_stage/assistant_progress_indicator.cc",
@@ -66,6 +68,8 @@ component("ui") {
     "main_stage/assistant_ui_element_view.h",
     "main_stage/assistant_ui_element_view_factory.cc",
     "main_stage/assistant_ui_element_view_factory.h",
+    "main_stage/assistant_zero_state_view.cc",
+    "main_stage/assistant_zero_state_view.h",
     "main_stage/element_animator.cc",
     "main_stage/element_animator.h",
     "main_stage/suggestion_chip_view.cc",
@@ -74,12 +78,6 @@ component("ui") {
     "main_stage/suggestion_container_view.h",
     "main_stage/ui_element_container_view.cc",
     "main_stage/ui_element_container_view.h",
-    "proactive_suggestions_rich_view.cc",
-    "proactive_suggestions_rich_view.h",
-    "proactive_suggestions_simple_view.cc",
-    "proactive_suggestions_simple_view.h",
-    "proactive_suggestions_view.cc",
-    "proactive_suggestions_view.h",
   ]
 
   deps = [
diff --git a/chromium/ash/assistant/ui/test_support/BUILD.gn b/chromium/ash/assistant/ui/test_support/BUILD.gn
new file mode 100644
index 00000000000..9402c816c1d
--- /dev/null
+++ b/chromium/ash/assistant/ui/test_support/BUILD.gn
@@ -0,0 +1,20 @@
+# Copyright 2020 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+static_library("test_support") {
+  testonly = true
+
+  sources = [
+    "mock_assistant_view_delegate.cc",
+    "mock_assistant_view_delegate.h",
+  ]
+
+  deps = [
+    "//ash/assistant/ui",
+    "//base",
+    "//testing/gmock",
+    "//testing/gtest",
+    "//ui/gfx",
+  ]
+}
diff --git a/chromium/ash/assistant/util/BUILD.gn b/chromium/ash/assistant/util/BUILD.gn
index 92902ef5f9a..6e6a2125c5c 100644
--- a/chromium/ash/assistant/util/BUILD.gn
+++ b/chromium/ash/assistant/util/BUILD.gn
@@ -27,6 +27,7 @@ component("util") {
     "//base",
     "//base:i18n",
     "//chromeos/constants",
+    "//chromeos/services/assistant/public/cpp",
     "//chromeos/services/assistant/public/mojom",
     "//net",
     "//ui/base",