1 files changed, 15 insertions, 15 deletions

diff --git a/chromium/third_party/blink/renderer/modules/mediasession/media_session.cc b/chromium/third_party/blink/renderer/modules/mediasession/media_session.cc
index 697e0f48ffc..80ded6b5ef6 100644
--- a/chromium/third_party/blink/renderer/modules/mediasession/media_session.cc
+++ b/chromium/third_party/blink/renderer/modules/mediasession/media_session.cc
@@ -20,7 +20,7 @@ namespace blink {
 
 namespace {
 
-using ::blink::mojom::blink::MediaSessionAction;
+using ::media_session::mojom::blink::MediaSessionAction;
 
 const AtomicString& MojomActionToActionName(MediaSessionAction action) {
   DEFINE_STATIC_LOCAL(const AtomicString, play_action_name, ("play"));
@@ -35,17 +35,17 @@ const AtomicString& MojomActionToActionName(MediaSessionAction action) {
                       ("seekforward"));
 
   switch (action) {
-    case MediaSessionAction::PLAY:
+    case MediaSessionAction::kPlay:
       return play_action_name;
-    case MediaSessionAction::PAUSE:
+    case MediaSessionAction::kPause:
       return pause_action_name;
-    case MediaSessionAction::PREVIOUS_TRACK:
+    case MediaSessionAction::kPreviousTrack:
       return previous_track_action_name;
-    case MediaSessionAction::NEXT_TRACK:
+    case MediaSessionAction::kNextTrack:
       return next_track_action_name;
-    case MediaSessionAction::SEEK_BACKWARD:
+    case MediaSessionAction::kSeekBackward:
       return seek_backward_action_name;
-    case MediaSessionAction::SEEK_FORWARD:
+    case MediaSessionAction::kSeekForward:
       return seek_forward_action_name;
     default:
       NOTREACHED();
@@ -56,17 +56,17 @@ const AtomicString& MojomActionToActionName(MediaSessionAction action) {
 base::Optional<MediaSessionAction> ActionNameToMojomAction(
     const String& action_name) {
   if ("play" == action_name)
-    return MediaSessionAction::PLAY;
+    return MediaSessionAction::kPlay;
   if ("pause" == action_name)
-    return MediaSessionAction::PAUSE;
+    return MediaSessionAction::kPause;
   if ("previoustrack" == action_name)
-    return MediaSessionAction::PREVIOUS_TRACK;
+    return MediaSessionAction::kPreviousTrack;
   if ("nexttrack" == action_name)
-    return MediaSessionAction::NEXT_TRACK;
+    return MediaSessionAction::kNextTrack;
   if ("seekbackward" == action_name)
-    return MediaSessionAction::SEEK_BACKWARD;
+    return MediaSessionAction::kSeekBackward;
   if ("seekforward" == action_name)
-    return MediaSessionAction::SEEK_FORWARD;
+    return MediaSessionAction::kSeekForward;
 
   NOTREACHED();
   return base::nullopt;
@@ -108,7 +108,7 @@ MediaSession::MediaSession(ExecutionContext* execution_context)
       client_binding_(this) {}
 
 MediaSession* MediaSession::Create(ExecutionContext* execution_context) {
-  return new MediaSession(execution_context);
+  return MakeGarbageCollected<MediaSession>(execution_context);
 }
 
 void MediaSession::Dispose() {
@@ -213,7 +213,7 @@ mojom::blink::MediaSessionService* MediaSession::GetService() {
 }
 
 void MediaSession::DidReceiveAction(
-    blink::mojom::blink::MediaSessionAction action) {
+    media_session::mojom::blink::MediaSessionAction action) {
   Document* document = To<Document>(GetExecutionContext());
   std::unique_ptr<UserGestureIndicator> gesture_indicator =
       LocalFrame::NotifyUserActivation(document ? document->GetFrame()