BASELINE: Update Chromium to 110.0.5481.111

Change-Id: I2b5f5ed66fee2a6f8da61c9b17fd1b25bb5b3a4e
Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/464348
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 24 insertions, 25 deletions

diff --git a/chromium/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc b/chromium/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc
index beb54095e1b..c844eff67ca 100644
--- a/chromium/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc
+++ b/chromium/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc
@@ -32,11 +32,8 @@
 #include "chrome/browser/ui/tab_helpers.h"
 #include "chrome/browser/ui/web_applications/web_app_dialog_utils.h"
 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h"
-#include "chrome/browser/web_applications/commands/fetch_installability_for_chrome_management.h"
-#include "chrome/browser/web_applications/commands/install_from_info_command.h"
 #include "chrome/browser/web_applications/user_display_mode.h"
-#include "chrome/browser/web_applications/web_app_command_manager.h"
-#include "chrome/browser/web_applications/web_app_data_retriever.h"
+#include "chrome/browser/web_applications/web_app_command_scheduler.h"
 #include "chrome/browser/web_applications/web_app_helpers.h"
 #include "chrome/browser/web_applications/web_app_install_info.h"
 #include "chrome/browser/web_applications/web_app_install_manager.h"
@@ -44,7 +41,6 @@
 #include "chrome/browser/web_applications/web_app_install_utils.h"
 #include "chrome/browser/web_applications/web_app_provider.h"
 #include "chrome/browser/web_applications/web_app_registrar.h"
-#include "chrome/browser/web_applications/web_app_url_loader.h"
 #include "chrome/browser/web_applications/web_app_utils.h"
 #include "chrome/common/chrome_features.h"
 #include "chrome/common/extensions/extension_metrics.h"
@@ -64,6 +60,7 @@
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/api/management.h"
 #include "extensions/common/extension.h"
+#include "extensions/common/extension_urls.h"
 #include "services/data_decoder/public/cpp/data_decoder.h"
 #include "third_party/blink/public/mojom/manifest/display_mode.mojom.h"
 #include "third_party/blink/public/mojom/window_features/window_features.mojom.h"
@@ -73,9 +70,9 @@
 #include "ash/components/arc/mojom/intent_helper.mojom.h"
 #include "ash/components/arc/session/arc_bridge_service.h"
 #include "ash/components/arc/session/arc_service_manager.h"
+#include "chrome/browser/ash/app_list/arc/arc_app_utils.h"
 #include "chrome/browser/ash/arc/arc_util.h"
 #include "chrome/browser/ash/login/demo_mode/demo_session.h"
-#include "chrome/browser/ui/app_list/arc/arc_app_utils.h"
 #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
 
 #if BUILDFLAG(ENABLE_SUPERVISED_USERS)
@@ -162,6 +159,10 @@ class ManagementSetEnabledFunctionInstallPromptDelegate
  private:
   void OnInstallPromptDone(
       ExtensionInstallPrompt::DoneCallbackPayload payload) {
+    // This dialog doesn't support the "withhold permissions" checkbox.
+    DCHECK_NE(
+        payload.result,
+        ExtensionInstallPrompt::Result::ACCEPTED_WITH_WITHHELD_PERMISSIONS);
     std::move(callback_).Run(payload.result ==
                              ExtensionInstallPrompt::Result::ACCEPTED);
   }
@@ -189,8 +190,10 @@ class ManagementUninstallFunctionUninstallDialogDelegate
         Profile::FromBrowserContext(function->browser_context()),
         details.GetNativeWindowForUI(), this);
     bool uninstall_from_webstore =
-        function->extension() &&
-        function->extension()->id() == extensions::kWebStoreAppId;
+        (function->extension() &&
+         function->extension()->id() == extensions::kWebStoreAppId) ||
+        function->source_url().DomainIs(
+            extension_urls::GetNewWebstoreLaunchURL().host());
     extensions::UninstallSource source;
     extensions::UninstallReason reason;
     if (uninstall_from_webstore) {
@@ -282,13 +285,12 @@ class ChromeAppForLinkDelegate : public extensions::AppForLinkDelegate {
     auto* provider = web_app::WebAppProvider::GetForWebApps(
         Profile::FromBrowserContext(context));
 
-    provider->command_manager().ScheduleCommand(
-        std::make_unique<web_app::InstallFromInfoCommand>(
-            std::move(web_app_info), &provider->install_finalizer(),
-            /*overwrite_existing_manifest_fields=*/false,
-            webapps::WebappInstallSource::MANAGEMENT_API,
-            base::BindOnce(OnGenerateAppForLinkCompleted,
-                           base::RetainedRef(function))));
+    provider->scheduler().InstallFromInfo(
+        std::move(web_app_info),
+        /*overwrite_existing_manifest_fields=*/false,
+        webapps::WebappInstallSource::MANAGEMENT_API,
+        base::BindOnce(OnGenerateAppForLinkCompleted,
+                       base::RetainedRef(function)));
   }
 
   extensions::api::management::ExtensionInfo CreateExtensionInfoFromWebApp(
@@ -297,7 +299,7 @@ class ChromeAppForLinkDelegate : public extensions::AppForLinkDelegate {
     auto* provider = web_app::WebAppProvider::GetForWebApps(
         Profile::FromBrowserContext(context));
     DCHECK(provider);
-    const web_app::WebAppRegistrar& registrar = provider->registrar();
+    const web_app::WebAppRegistrar& registrar = provider->registrar_unsafe();
 
     extensions::api::management::ExtensionInfo info;
     info.id = app_id;
@@ -359,7 +361,7 @@ void LaunchWebApp(const web_app::AppId& app_id, Profile* profile) {
   auto* provider = web_app::WebAppProvider::GetForWebApps(profile);
   DCHECK(provider);
   absl::optional<web_app::UserDisplayMode> display_mode =
-      provider->registrar().GetAppUserDisplayMode(app_id);
+      provider->registrar_unsafe().GetAppUserDisplayMode(app_id);
   auto launch_container = apps::LaunchContainer::kLaunchContainerWindow;
   if (display_mode == web_app::UserDisplayMode::kBrowser)
     launch_container = apps::LaunchContainer::kLaunchContainerTab;
@@ -569,7 +571,7 @@ void ChromeManagementAPIDelegate::InstallOrLaunchReplacementWebApp(
 
   // Launch the app if web_app_url happens to match start_url. If not, the app
   // could still be installed with different start_url.
-  if (provider->registrar().IsLocallyInstalled(web_app_url)) {
+  if (provider->registrar_unsafe().IsLocallyInstalled(web_app_url)) {
     LaunchWebApp(
         web_app::GenerateAppId(/*manifest_id=*/absl::nullopt, web_app_url),
         profile);
@@ -583,13 +585,10 @@ void ChromeManagementAPIDelegate::InstallOrLaunchReplacementWebApp(
 
   base::WeakPtr<content::WebContents> web_contents_ptr =
       web_contents->GetWeakPtr();
-  provider->command_manager().ScheduleCommand(
-      std::make_unique<web_app::FetchInstallabilityForChromeManagement>(
-          web_app_url, web_contents_ptr, provider->registrar(),
-          std::make_unique<web_app::WebAppUrlLoader>(),
-          std::make_unique<web_app::WebAppDataRetriever>(),
-          base::BindOnce(&OnWebAppInstallabilityChecked, profile,
-                         std::move(callback), std::move(web_contents))));
+  provider->scheduler().FetchInstallabilityForChromeManagement(
+      web_app_url, web_contents_ptr,
+      base::BindOnce(&OnWebAppInstallabilityChecked, profile,
+                     std::move(callback), std::move(web_contents)));
 }
 
 bool ChromeManagementAPIDelegate::CanContextInstallAndroidApps(