[Blink>MediaSession] Use setActionCallback() instead of event listeners for media control actions

third_party/WebKit/LayoutTests/media/mediasession/mojo/media-control-set-handler-notifies-service.html

Index: third_party/WebKit/LayoutTests/media/mediasession/mojo/media-control-set-handler-notifies-service.html
diff --git a/third_party/WebKit/LayoutTests/media/mediasession/mojo/media-control-set-handler-notifies-service.html b/third_party/WebKit/LayoutTests/media/mediasession/mojo/media-control-set-handler-notifies-service.html
index 16752a98afe740fad47c0937399564c817a65bb4..b94325eafe70b6ceb62c9e366a56ef007b0a8a72 100644
--- a/third_party/WebKit/LayoutTests/media/mediasession/mojo/media-control-set-handler-notifies-service.html
+++ b/third_party/WebKit/LayoutTests/media/mediasession/mojo/media-control-set-handler-notifies-service.html
@@ -22,23 +22,17 @@ function getExpectations() {
       [ MediaSessionAction.SEEK_BACKWARD, true ],
       [ MediaSessionAction.SEEK_FORWARD, true ],
       [ MediaSessionAction.PLAY, false ],
-      [ MediaSessionAction.PLAY, true ],
       [ MediaSessionAction.PAUSE, false ],
-      [ MediaSessionAction.PAUSE, true ],
       [ MediaSessionAction.PREVIOUS_TRACK, false ],
-      [ MediaSessionAction.PREVIOUS_TRACK, true ],
       [ MediaSessionAction.NEXT_TRACK, false ],
-      [ MediaSessionAction.NEXT_TRACK, true ],
       [ MediaSessionAction.SEEK_BACKWARD, false ],
-      [ MediaSessionAction.SEEK_BACKWARD, true ],
       [ MediaSessionAction.SEEK_FORWARD, false ],
+      [ MediaSessionAction.PLAY, true ],
+      [ MediaSessionAction.PAUSE, true ],
+      [ MediaSessionAction.PREVIOUS_TRACK, true ],
+      [ MediaSessionAction.NEXT_TRACK, true ],
+      [ MediaSessionAction.SEEK_BACKWARD, true ],
       [ MediaSessionAction.SEEK_FORWARD, true ],
-      [ MediaSessionAction.PLAY, false ],
-      [ MediaSessionAction.PAUSE, false ],
-      [ MediaSessionAction.PREVIOUS_TRACK, false ],
-      [ MediaSessionAction.NEXT_TRACK, false ],
-      [ MediaSessionAction.SEEK_BACKWARD, false ],
-      [ MediaSessionAction.SEEK_FORWARD, false ],
     ];
   }
   return expectations;
@@ -47,6 +41,7 @@ function getExpectations() {
 async_test(function(t) {
   mediaSessionServiceMock.then(m => {
     m.setEnableDisableActionCallback(t.step_func(function(action, isEnabled) {
+      console.log(action + " " + isEnabled);

[mlamouri (slow - plz ping), 2016/12/23 12:13:58]

Should you remove this?

[Zhiqiang Zhang (Slow), 2017/01/05 09:29:15]

Done.

       var expectedAction = getExpectations()[nextExpectation][0];
       var expectedIsEnabled = getExpectations()[nextExpectation][1];
       assert_equals(expectedAction, action);
@@ -55,32 +50,45 @@ async_test(function(t) {
         t.done();
     }));
 
-    // Setting handlers
-    window.navigator.mediaSession.onresize = _ => {};  // Unknown event.
-    window.navigator.mediaSession.onplay = _ => {};
-    window.navigator.mediaSession.onpause = _ => {};
-    window.navigator.mediaSession.onprevioustrack = _ => {};
-    window.navigator.mediaSession.onnexttrack = _ => {};
-    window.navigator.mediaSession.onseekbackward = _ => {};
-    window.navigator.mediaSession.onseekforward = _ => {};
+    // Setting handlers should notify the service.
+    window.navigator.mediaSession.setActionHandler("play", _ => {});
+    window.navigator.mediaSession.setActionHandler("pause", _ => {});
+    window.navigator.mediaSession.setActionHandler("previoustrack", _ => {});
+    window.navigator.mediaSession.setActionHandler("nexttrack", _ => {});
+    window.navigator.mediaSession.setActionHandler("seekbackward", _ => {});
+    window.navigator.mediaSession.setActionHandler("seekforward", _ => {});
+
+    // Setting handlers again should not notify the service.
+    window.navigator.mediaSession.setActionHandler("play", _ => {});
+    window.navigator.mediaSession.setActionHandler("pause", _ => {});
+    window.navigator.mediaSession.setActionHandler("previoustrack", _ => {});
+    window.navigator.mediaSession.setActionHandler("nexttrack", _ => {});
+    window.navigator.mediaSession.setActionHandler("seekbackward", _ => {});
+    window.navigator.mediaSession.setActionHandler("seekforward", _ => {});
+
+    // Unsetting handlers should notify the service.
+    window.navigator.mediaSession.setActionHandler("play", null);
+    window.navigator.mediaSession.setActionHandler("pause", null);
+    window.navigator.mediaSession.setActionHandler("previoustrack", null);
+    window.navigator.mediaSession.setActionHandler("nexttrack", null);
+    window.navigator.mediaSession.setActionHandler("seekbackward", null);
+    window.navigator.mediaSession.setActionHandler("seekforward", null);
 
-    // Resetting handlers
-    window.navigator.mediaSession.onresize = _ => {};  // Unknown event.
-    window.navigator.mediaSession.onplay = _ => {};
-    window.navigator.mediaSession.onpause = _ => {};
-    window.navigator.mediaSession.onprevioustrack = _ => {};
-    window.navigator.mediaSession.onnexttrack = _ => {};
-    window.navigator.mediaSession.onseekbackward = _ => {};
-    window.navigator.mediaSession.onseekforward = _ => {};
+    // Unsetting handlers should not notify the service.
+    window.navigator.mediaSession.setActionHandler("play", null);
+    window.navigator.mediaSession.setActionHandler("pause", null);
+    window.navigator.mediaSession.setActionHandler("previoustrack", null);
+    window.navigator.mediaSession.setActionHandler("nexttrack", null);
+    window.navigator.mediaSession.setActionHandler("seekbackward", null);
+    window.navigator.mediaSession.setActionHandler("seekforward", null);
 
-    // Unsetting handlers
-    window.navigator.mediaSession.onresize = null;  // Unknown event.
-    window.navigator.mediaSession.onplay = null;
-    window.navigator.mediaSession.onpause = null;
-    window.navigator.mediaSession.onprevioustrack = null;
-    window.navigator.mediaSession.onnexttrack = null;
-    window.navigator.mediaSession.onseekbackward = null;
-    window.navigator.mediaSession.onseekforward = null;
+    // Setting handlers again should notify the service.
+    window.navigator.mediaSession.setActionHandler("play", _ => {});
+    window.navigator.mediaSession.setActionHandler("pause", _ => {});
+    window.navigator.mediaSession.setActionHandler("previoustrack", _ => {});
+    window.navigator.mediaSession.setActionHandler("nexttrack", _ => {});
+    window.navigator.mediaSession.setActionHandler("seekbackward", _ => {});
+    window.navigator.mediaSession.setActionHandler("seekforward", _ => {});
   });
 }, "test that setting event handler notifies the mojo service");