1 files changed, 10 insertions, 10 deletions

diff --git a/chromium/third_party/blink/renderer/modules/gamepad/navigator_gamepad.cc b/chromium/third_party/blink/renderer/modules/gamepad/navigator_gamepad.cc
index 66209e12b2f..3f027a1ad5a 100644
--- a/chromium/third_party/blink/renderer/modules/gamepad/navigator_gamepad.cc
+++ b/chromium/third_party/blink/renderer/modules/gamepad/navigator_gamepad.cc
@@ -150,9 +150,9 @@ static void SampleGamepads(ListType* into,
     bool hide_xr_gamepad = false;
     if (web_gamepad.is_xr) {
       bool webxr_enabled =
-          (context && OriginTrials::WebXRGamepadSupportEnabled(context) &&
-           OriginTrials::WebXREnabled(context));
-      bool webvr_enabled = (context && OriginTrials::WebVREnabled(context));
+          (context && origin_trials::WebXRGamepadSupportEnabled(context) &&
+           origin_trials::WebXREnabled(context));
+      bool webvr_enabled = (context && origin_trials::WebVREnabled(context));
 
       if (!webxr_enabled && !webvr_enabled) {
         // If neither WebXR nor WebVR are enabled, we should not expose XR-
@@ -189,7 +189,7 @@ NavigatorGamepad& NavigatorGamepad::From(Navigator& navigator) {
   NavigatorGamepad* supplement =
       Supplement<Navigator>::From<NavigatorGamepad>(navigator);
   if (!supplement) {
-    supplement = new NavigatorGamepad(navigator);
+    supplement = MakeGarbageCollected<NavigatorGamepad>(navigator);
     ProvideTo(navigator, supplement);
   }
   return *supplement;
@@ -260,8 +260,8 @@ void NavigatorGamepad::DispatchOneEvent() {
 
   Gamepad* gamepad = pending_events_.TakeFirst();
   const AtomicString& event_name = gamepad->connected()
-                                       ? EventTypeNames::gamepadconnected
-                                       : EventTypeNames::gamepaddisconnected;
+                                       ? event_type_names::kGamepadconnected
+                                       : event_type_names::kGamepaddisconnected;
   DomWindow()->DispatchEvent(*GamepadEvent::Create(
       event_name, Event::Bubbles::kNo, Event::Cancelable::kYes, gamepad));
 
@@ -315,8 +315,8 @@ bool NavigatorGamepad::HasLastData() {
 }
 
 static bool IsGamepadEvent(const AtomicString& event_type) {
-  return event_type == EventTypeNames::gamepadconnected ||
-         event_type == EventTypeNames::gamepaddisconnected;
+  return event_type == event_type_names::kGamepadconnected ||
+         event_type == event_type_names::kGamepaddisconnected;
 }
 
 void NavigatorGamepad::DidAddEventListener(LocalDOMWindow*,
@@ -337,8 +337,8 @@ void NavigatorGamepad::DidAddEventListener(LocalDOMWindow*,
 void NavigatorGamepad::DidRemoveEventListener(LocalDOMWindow* window,
                                               const AtomicString& event_type) {
   if (IsGamepadEvent(event_type) &&
-      !window->HasEventListeners(EventTypeNames::gamepadconnected) &&
-      !window->HasEventListeners(EventTypeNames::gamepaddisconnected)) {
+      !window->HasEventListeners(event_type_names::kGamepadconnected) &&
+      !window->HasEventListeners(event_type_names::kGamepaddisconnected)) {
     DidRemoveGamepadEventListeners();
   }
 }