BASELINE: Update Chromium to 122.0.6261.72

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

1 files changed, 10 insertions, 13 deletions

diff --git a/chromium/chrome/browser/extensions/api/omnibox/omnibox_api.cc b/chromium/chrome/browser/extensions/api/omnibox/omnibox_api.cc
index 0c032c10e4a..6b7146523c3 100644
--- a/chromium/chrome/browser/extensions/api/omnibox/omnibox_api.cc
+++ b/chromium/chrome/browser/extensions/api/omnibox/omnibox_api.cc
@@ -7,6 +7,7 @@
 #include <stddef.h>
 
 #include <memory>
+#include <optional>
 #include <string>
 #include <utility>
 #include <vector>
@@ -46,24 +47,20 @@ const char kBackgroundTabDisposition[] = "newBackgroundTab";
 // Pref key for omnibox.setDefaultSuggestion.
 const char kOmniboxDefaultSuggestion[] = "omnibox_default_suggestion";
 
-std::unique_ptr<omnibox::SuggestResult> GetOmniboxDefaultSuggestion(
+std::optional<omnibox::SuggestResult> GetOmniboxDefaultSuggestion(
     Profile* profile,
     const std::string& extension_id) {
   ExtensionPrefs* prefs = ExtensionPrefs::Get(profile);
   if (!prefs) {
-    return nullptr;
+    return std::nullopt;
   }
 
   const base::Value::Dict* dict =
       prefs->ReadPrefAsDict(extension_id, kOmniboxDefaultSuggestion);
   if (!dict) {
-    return nullptr;
+    return std::nullopt;
   }
-
-  auto suggestion = std::make_unique<omnibox::SuggestResult>();
-  omnibox::SuggestResult::Populate(*dict, *suggestion);
-
-  return suggestion;
+  return omnibox::SuggestResult::FromValue(*dict);
 }
 
 // Tries to set the omnibox default suggestion; returns true on success or
@@ -343,7 +340,7 @@ void OmniboxSendSuggestionsFunction::NotifySuggestionsReady() {
 }
 
 ExtensionFunction::ResponseAction OmniboxSetDefaultSuggestionFunction::Run() {
-  absl::optional<SetDefaultSuggestion::Params> params =
+  std::optional<SetDefaultSuggestion::Params> params =
       SetDefaultSuggestion::Params::Create(args());
   EXTENSION_FUNCTION_VALIDATE(params);
 
@@ -407,13 +404,13 @@ ACMatchClassifications StyleTypesToACMatchClassifications(
 
       int type_class;
       switch (style.type) {
-        case omnibox::DESCRIPTION_STYLE_TYPE_URL:
+        case omnibox::DescriptionStyleType::kUrl:
           type_class = AutocompleteMatch::ACMatchClassification::URL;
           break;
-        case omnibox::DESCRIPTION_STYLE_TYPE_MATCH:
+        case omnibox::DescriptionStyleType::kMatch:
           type_class = AutocompleteMatch::ACMatchClassification::MATCH;
           break;
-        case omnibox::DESCRIPTION_STYLE_TYPE_DIM:
+        case omnibox::DescriptionStyleType::kDim:
           type_class = AutocompleteMatch::ACMatchClassification::DIM;
           break;
         default:
@@ -445,7 +442,7 @@ void ApplyDefaultSuggestionForExtensionKeyword(
     AutocompleteMatch* match) {
   DCHECK(keyword->type() == TemplateURL::OMNIBOX_API_EXTENSION);
 
-  std::unique_ptr<omnibox::SuggestResult> suggestion(
+  std::optional<omnibox::SuggestResult> suggestion(
       GetOmniboxDefaultSuggestion(profile, keyword->GetExtensionId()));
   if (!suggestion || suggestion->description.empty())
     return;  // fall back to the universal default