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, 17 insertions, 12 deletions

diff --git a/chromium/chrome/browser/extensions/api/omnibox/omnibox_api.cc b/chromium/chrome/browser/extensions/api/omnibox/omnibox_api.cc
index 6c0366df334..eb7affd301d 100644
--- a/chromium/chrome/browser/extensions/api/omnibox/omnibox_api.cc
+++ b/chromium/chrome/browser/extensions/api/omnibox/omnibox_api.cc
@@ -50,15 +50,20 @@ std::unique_ptr<omnibox::SuggestResult> GetOmniboxDefaultSuggestion(
     Profile* profile,
     const std::string& extension_id) {
   ExtensionPrefs* prefs = ExtensionPrefs::Get(profile);
+  if (!prefs) {
+    return nullptr;
+  }
 
-  std::unique_ptr<omnibox::SuggestResult> suggestion;
-  const base::DictionaryValue* dict = nullptr;
-  if (prefs && prefs->ReadPrefAsDictionary(extension_id,
-                                           kOmniboxDefaultSuggestion,
-                                           &dict)) {
-    suggestion = std::make_unique<omnibox::SuggestResult>();
-    omnibox::SuggestResult::Populate(*dict, suggestion.get());
+  const base::Value::Dict* dict =
+      prefs->ReadPrefAsDict(extension_id, kOmniboxDefaultSuggestion);
+  if (!dict) {
+    return nullptr;
   }
+
+  auto suggestion = std::make_unique<omnibox::SuggestResult>();
+  omnibox::SuggestResult::Populate(base::Value(dict->Clone()),
+                                   suggestion.get());
+
   return suggestion;
 }
 
@@ -227,7 +232,7 @@ void OmniboxAPI::OnExtensionLoaded(content::BrowserContext* browser_context,
         url_service_->RegisterOmniboxKeyword(
             extension->id(), extension->short_name(), keyword,
             GetTemplateURLStringForExtension(extension->id()),
-            ExtensionPrefs::Get(profile_)->GetInstallTime(extension->id()));
+            ExtensionPrefs::Get(profile_)->GetLastUpdateTime(extension->id()));
       } else {
         pending_extensions_.insert(extension);
       }
@@ -259,7 +264,7 @@ void OmniboxAPI::OnTemplateURLsLoaded() {
     url_service_->RegisterOmniboxKeyword(
         i->id(), i->short_name(), OmniboxInfo::GetKeyword(i),
         GetTemplateURLStringForExtension(i->id()),
-        ExtensionPrefs::Get(profile_)->GetInstallTime(i->id()));
+        ExtensionPrefs::Get(profile_)->GetLastUpdateTime(i->id()));
   }
   pending_extensions_.clear();
 }
@@ -462,9 +467,9 @@ void ApplyDefaultSuggestionForExtensionKeyword(
         remaining_input.empty() ? kReplacementText : remaining_input;
     description.replace(placeholder, kPlaceholderText.length(), replacement);
 
-    for (size_t i = 0; i < description_styles.size(); ++i) {
-      if (description_styles[i].offset > placeholder)
-        description_styles[i].offset += replacement.length() - 2;
+    for (auto& description_style : description_styles) {
+      if (description_style.offset > placeholder)
+        description_style.offset += replacement.length() - 2;
     }
   }