BASELINE: Update Chromium to 78.0.3904.130

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

12 files changed, 76 insertions, 97 deletions

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.