BASELINE: Update Chromium to 98.0.4758.90

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

6 files changed, 45 insertions, 31 deletions

diff --git a/chromium/components/dbus/menu/BUILD.gn b/chromium/components/dbus/menu/BUILD.gn
index 93611848461..672687efb25 100644
--- a/chromium/components/dbus/menu/BUILD.gn
+++ b/chromium/components/dbus/menu/BUILD.gn
@@ -38,6 +38,10 @@ source_set("unit_tests") {
     "//testing/gtest",
   ]
   if (use_ozone) {
-    deps += [ "//ui/ozone" ]
+    deps += [
+      "//ui/events:test_support",
+      "//ui/events/ozone/layout:layout",
+      "//ui/ozone",
+    ]
   }
 }
diff --git a/chromium/components/dbus/menu/DEPS b/chromium/components/dbus/menu/DEPS
index 1afde18ebad..435d1b3d675 100644
--- a/chromium/components/dbus/menu/DEPS
+++ b/chromium/components/dbus/menu/DEPS
@@ -1,7 +1,7 @@
 include_rules = [
   "+dbus",
   "+ui/base",
-  "+ui/events/keycodes",
+  "+ui/events",
   "+ui/gfx/image",
   "+ui/gfx/x",
   "+ui/ozone/public",
diff --git a/chromium/components/dbus/menu/menu.h b/chromium/components/dbus/menu/menu.h
index ae22051aa6b..402a822e89c 100644
--- a/chromium/components/dbus/menu/menu.h
+++ b/chromium/components/dbus/menu/menu.h
@@ -13,7 +13,6 @@
 
 #include "base/callback_forward.h"
 #include "base/component_export.h"
-#include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "components/dbus/menu/menu_property_list.h"
 #include "components/dbus/properties/types.h"
diff --git a/chromium/components/dbus/menu/menu_property_list_unittest.cc b/chromium/components/dbus/menu/menu_property_list_unittest.cc
index f9d8f2ac17b..d406b34e420 100644
--- a/chromium/components/dbus/menu/menu_property_list_unittest.cc
+++ b/chromium/components/dbus/menu/menu_property_list_unittest.cc
@@ -16,6 +16,8 @@
 #include "ui/base/models/menu_model.h"
 #include "ui/base/models/menu_separator_types.h"
 #include "ui/base/models/simple_menu_model.h"
+#include "ui/events/ozone/layout/keyboard_layout_engine_manager.h"
+#include "ui/events/test/keyboard_layout.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/image/image_skia_rep_default.h"
@@ -325,33 +327,43 @@ TEST(MenuPropertyListTest, ComputePropertiesIcon) {
 
 #if defined(OS_LINUX)
 TEST(MenuPropertyListTest, ComputePropertiesAccelerator) {
-  // TODO(1136791): fix for Ozone/Wayland.
-  if (ui::OzonePlatform::GetPlatformNameForTest() != "x11")
-    GTEST_SKIP();
-
-  auto builder = TestMenuModelBuilder();
-
-  // No accelerator.
-  auto menu = builder.SetAccelerator(ui::Accelerator()).Build();
-  MenuItemProperties props;
-  EXPECT_EQ(menu->ComputeProperties(), props);
-
-  // Set a key.
-  menu = builder.SetAccelerator(ui::Accelerator(ui::VKEY_A, 0)).Build();
-  props["shortcut"] =
-      MakeDbusVariant(MakeDbusArray(MakeDbusArray(DbusString("a"))));
-  EXPECT_EQ(menu->ComputeProperties(), props);
+  // The Wayland implementation requires the keyboard layout to be set.
+  // The ScopedKeyboardLayout does not unset the already existing layout engine,
+  // so we do so here and restore in the end of the test.
+  auto* const old_layout =
+      ui::KeyboardLayoutEngineManager::GetKeyboardLayoutEngine();
+  ui::KeyboardLayoutEngineManager::ResetKeyboardLayoutEngine();
+
+  {
+    ui::ScopedKeyboardLayout keyboard_layout(ui::KEYBOARD_LAYOUT_ENGLISH_US);
+
+    auto builder = TestMenuModelBuilder();
+
+    // No accelerator.
+    auto menu = builder.SetAccelerator(ui::Accelerator()).Build();
+    MenuItemProperties props;
+    EXPECT_EQ(menu->ComputeProperties(), props);
+
+    // Set a key.
+    menu = builder.SetAccelerator(ui::Accelerator(ui::VKEY_A, 0)).Build();
+    props["shortcut"] =
+        MakeDbusVariant(MakeDbusArray(MakeDbusArray(DbusString("a"))));
+    EXPECT_EQ(menu->ComputeProperties(), props);
+
+    // Add modifiers.
+    menu = builder
+               .SetAccelerator(ui::Accelerator(
+                   ui::VKEY_A,
+                   ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN))
+               .Build();
+    props["shortcut"] = MakeDbusVariant(
+        MakeDbusArray(MakeDbusArray(DbusString("Control"), DbusString("Alt"),
+                                    DbusString("Shift"), DbusString("a"))));
+    EXPECT_EQ(menu->ComputeProperties(), props);
+  }
 
-  // Add modifiers.
-  menu = builder
-             .SetAccelerator(ui::Accelerator(
-                 ui::VKEY_A,
-                 ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN))
-             .Build();
-  props["shortcut"] = MakeDbusVariant(
-      MakeDbusArray(MakeDbusArray(DbusString("Control"), DbusString("Alt"),
-                                  DbusString("Shift"), DbusString("a"))));
-  EXPECT_EQ(menu->ComputeProperties(), props);
+  if (old_layout)
+    ui::KeyboardLayoutEngineManager::SetKeyboardLayoutEngine(old_layout);
 }
 #endif
 
diff --git a/chromium/components/dbus/properties/dbus_properties.h b/chromium/components/dbus/properties/dbus_properties.h
index 6624c8857fd..509d3956cba 100644
--- a/chromium/components/dbus/properties/dbus_properties.h
+++ b/chromium/components/dbus/properties/dbus_properties.h
@@ -7,7 +7,6 @@
 
 #include "base/callback_forward.h"
 #include "base/component_export.h"
-#include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "components/dbus/properties/types.h"
 #include "dbus/bus.h"
diff --git a/chromium/components/dbus/thread_linux/dbus_thread_linux.h b/chromium/components/dbus/thread_linux/dbus_thread_linux.h
index baa4da06079..0b29be73a3c 100644
--- a/chromium/components/dbus/thread_linux/dbus_thread_linux.h
+++ b/chromium/components/dbus/thread_linux/dbus_thread_linux.h
@@ -7,7 +7,7 @@
 
 #include "base/component_export.h"
 #include "base/memory/ref_counted.h"
-#include "base/single_thread_task_runner.h"
+#include "base/task/single_thread_task_runner.h"
 #include "build/build_config.h"
 #include "build/chromeos_buildflags.h"