BASELINE: Update Chromium to 90.0.4430.221

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

1 files changed, 17 insertions, 15 deletions

diff --git a/chromium/chrome/browser/ui/webui/sync_file_system_internals/extension_statuses_handler.cc b/chromium/chrome/browser/ui/webui/sync_file_system_internals/extension_statuses_handler.cc
index 4bba1bc4040..a3d83c0c8ad 100644
--- a/chromium/chrome/browser/ui/webui/sync_file_system_internals/extension_statuses_handler.cc
+++ b/chromium/chrome/browser/ui/webui/sync_file_system_internals/extension_statuses_handler.cc
@@ -35,10 +35,10 @@ namespace {
 // ExtensionStatusesHandler and FileMetadataHandler.
 void ConvertExtensionStatusToDictionary(
     const base::WeakPtr<extensions::ExtensionService>& extension_service,
-    const base::Callback<void(const base::ListValue&)>& callback,
+    base::OnceCallback<void(const base::ListValue&)> callback,
     const std::map<GURL, std::string>& status_map) {
   if (!extension_service) {
-    callback.Run(base::ListValue());
+    std::move(callback).Run(base::ListValue());
     return;
   }
 
@@ -63,7 +63,7 @@ void ConvertExtensionStatusToDictionary(
     list.Append(std::move(dict));
   }
 
-  callback.Run(list);
+  std::move(callback).Run(list);
 }
 
 }  // namespace
@@ -76,48 +76,50 @@ ExtensionStatusesHandler::~ExtensionStatusesHandler() {}
 void ExtensionStatusesHandler::RegisterMessages() {
   web_ui()->RegisterMessageCallback(
       "getExtensionStatuses",
-      base::BindRepeating(&ExtensionStatusesHandler::GetExtensionStatuses,
+      base::BindRepeating(&ExtensionStatusesHandler::HandleGetExtensionStatuses,
                           base::Unretained(this)));
 }
 
 // static
 void ExtensionStatusesHandler::GetExtensionStatusesAsDictionary(
     Profile* profile,
-    const base::Callback<void(const base::ListValue&)>& callback) {
+    base::OnceCallback<void(const base::ListValue&)> callback) {
   DCHECK(profile);
 
   sync_file_system::SyncFileSystemService* sync_service =
       SyncFileSystemServiceFactory::GetForProfile(profile);
   if (!sync_service) {
-    callback.Run(base::ListValue());
+    std::move(callback).Run(base::ListValue());
     return;
   }
 
   extensions::ExtensionService* extension_service =
       extensions::ExtensionSystem::Get(profile)->extension_service();
   if (!extension_service) {
-    callback.Run(base::ListValue());
+    std::move(callback).Run(base::ListValue());
     return;
   }
 
-  sync_service->GetExtensionStatusMap(base::Bind(
-      &ConvertExtensionStatusToDictionary,
-      extension_service->AsWeakPtr(), callback));
+  sync_service->GetExtensionStatusMap(
+      base::BindOnce(&ConvertExtensionStatusToDictionary,
+                     extension_service->AsWeakPtr(), std::move(callback)));
 }
 
-void ExtensionStatusesHandler::GetExtensionStatuses(
+void ExtensionStatusesHandler::HandleGetExtensionStatuses(
     const base::ListValue* args) {
+  AllowJavascript();
   DCHECK(args);
   GetExtensionStatusesAsDictionary(
       profile_,
-      base::Bind(&ExtensionStatusesHandler::DidGetExtensionStatuses,
-                 weak_ptr_factory_.GetWeakPtr()));
+      base::BindOnce(&ExtensionStatusesHandler::DidGetExtensionStatuses,
+                     weak_ptr_factory_.GetWeakPtr(),
+                     args->GetList()[0].GetString() /* callback_id */));
 }
 
 void ExtensionStatusesHandler::DidGetExtensionStatuses(
+    std::string callback_id,
     const base::ListValue& list) {
-  web_ui()->CallJavascriptFunctionUnsafe(
-      "ExtensionStatuses.onGetExtensionStatuses", list);
+  ResolveJavascriptCallback(base::Value(callback_id), list);
 }
 
 }  // namespace syncfs_internals