Switch the MediaSession LayoutTests to the new Mojo JS bindings

This change enables generation of both Mojo JS bindings styles in the
//third_party/WebKit/public:android_mojo_bindings target and updates the
LayoutTests for the MediaSession API to use the new style.

Bug: 699569
Change-Id: Ifebdcbe5cffffd61d3dfcb48b590c447416d8d7a
Reviewed-on: https://chromium-review.googlesource.com/563704Reviewed-by: danakj <danakj@chromium.org>
Reviewed-by: Yuzhu Shen <yzshen@chromium.org>
Commit-Queue: Reilly Grant <reillyg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#485452}

third_party/WebKit/LayoutTests/media/mediasession/mojo/callback-alive-after-gc.html

@@ -2,8 +2,9 @@
 <title>Test that setting MediaSession callbacks are alive after garbage-collection</title>
 <script src="../../../resources/testharness.js"></script>
 <script src="../../../resources/testharnessreport.js"></script>
-<script src="../../../resources/mojo-helpers.js"></script>
 <script src="../../../resources/gc.js"></script>
+<script src="file:///gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script>
+<script src="file:///gen/third_party/WebKit/public/platform/modules/mediasession/media_session.mojom.js"></script>
 <script src="resources/mediasessionservice-mock.js"></script>
 <script src="resources/utils.js"></script>
 <script>
@@ -11,8 +12,7 @@
 var mock;
 
 async_test(function(t) {
-  mediaSessionServiceMock.then(m => {
-    mock = m;
+  let mock = mediaSessionServiceMock;
   mock.setClientCallback(_ => {
     gc();
     setTimeout(_ => {
@@ -20,6 +20,5 @@ async_test(function(t) {
     });
   });
   window.navigator.mediaSession.setActionHandler("play", _ => { t.done(); });
-  });
 });
 </script>

third_party/WebKit/LayoutTests/media/mediasession/mojo/file-image-removed.html

@@ -2,13 +2,14 @@
 <title>MediaSession Mojo Test</title>
 <script src="../../../resources/testharness.js"></script>
 <script src="../../../resources/testharnessreport.js"></script>
-<script src="../../../resources/mojo-helpers.js"></script>
+<script src="file:///gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script>
+<script src="file:///gen/third_party/WebKit/public/platform/modules/mediasession/media_session.mojom.js"></script>
 <script src="resources/mediasessionservice-mock.js"></script>
 <script src="resources/utils.js"></script>
 <script>
 
 async_test(function(t) {
-  mediaSessionServiceMock.then(m => {
+  let m = mediaSessionServiceMock;
   var metadata = new MediaMetadata({
     artwork: [
       { src: "file:///foo/bar.jpg", type: "image/jpeg"}
@@ -20,7 +21,6 @@ async_test(function(t) {
     t.done();
   }));
   window.navigator.mediaSession.metadata = metadata;
-  });
 }, "test that null MediaMetadata is correctly propagated");
 
 </script>

third_party/WebKit/LayoutTests/media/mediasession/mojo/media-control-action-reaches-client.html

@@ -2,7 +2,8 @@
 <title>MediaSession Mojo Test</title>
 <script src="../../../resources/testharness.js"></script>
 <script src="../../../resources/testharnessreport.js"></script>
-<script src="../../../resources/mojo-helpers.js"></script>
+<script src="file:///gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script>
+<script src="file:///gen/third_party/WebKit/public/platform/modules/mediasession/media_session.mojom.js"></script>
 <script src="resources/mediasessionservice-mock.js"></script>
 <script src="resources/utils.js"></script>
 <script>
@@ -52,12 +53,10 @@ function runTests(t) {
 // Use async_test to do asynchronous setup since setup() only works for
 // synchronous setup.
 async_test(function(t) {
-  mediaSessionServiceMock.then(m => {
-    mock = m;
+  mock = mediaSessionServiceMock;
   mock.setClientCallback(t.step_func(runTests.bind(null, t)));
   // Touch window.navigator.mediaSession to start the service.
   window.navigator.mediaSession.metadata = null;
-  });
 }, "test that the mock service is setup");
 
 </script>

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

@@ -2,7 +2,8 @@
 <title>Test that setting MediaSession event handler should notify the service</title>
 <script src="../../../resources/testharness.js"></script>
 <script src="../../../resources/testharnessreport.js"></script>
-<script src="../../../resources/mojo-helpers.js"></script>
+<script src="file:///gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script>
+<script src="file:///gen/third_party/WebKit/public/platform/modules/mediasession/media_session.mojom.js"></script>
 <script src="resources/mediasessionservice-mock.js"></script>
 <script src="resources/utils.js"></script>
 <script>
@@ -39,7 +40,7 @@ function getExpectations() {
 }
 
 async_test(function(t) {
-  mediaSessionServiceMock.then(m => {
+  let m = mediaSessionServiceMock;
   m.setEnableDisableActionCallback(t.step_func(function(action, isEnabled) {
     var expectedAction = getExpectations()[nextExpectation][0];
     var expectedIsEnabled = getExpectations()[nextExpectation][1];
@@ -88,7 +89,6 @@ async_test(function(t) {
   window.navigator.mediaSession.setActionHandler("nexttrack", _ => {});
   window.navigator.mediaSession.setActionHandler("seekbackward", _ => {});
   window.navigator.mediaSession.setActionHandler("seekforward", _ => {});
-  });
 }, "test that setting event handler notifies the mojo service");
 
 </script>

third_party/WebKit/LayoutTests/media/mediasession/mojo/metadata-async.html

@@ -2,7 +2,8 @@
 <title>MediaMetadata Mojo Test</title>
 <script src="../../../resources/testharness.js"></script>
 <script src="../../../resources/testharnessreport.js"></script>
-<script src="../../../resources/mojo-helpers.js"></script>
+<script src="file:///gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script>
+<script src="file:///gen/third_party/WebKit/public/platform/modules/mediasession/media_session.mojom.js"></script>
 <script src="resources/mediasessionservice-mock.js"></script>
 <script src="resources/utils.js"></script>
 <script>
@@ -38,7 +39,7 @@ async_test(t => {
   ];
   var resultId = 0;
 
-  mediaSessionServiceMock.then(m => {
+  let m = mediaSessionServiceMock;
   m.setMetadataCallback(t.step_func(receivedMetadata => {
     assert_metadata_equals(receivedMetadata, results[resultId]);
     ++resultId;
@@ -66,7 +67,6 @@ async_test(t => {
       window.navigator.mediaSession.metadata.title = 'second timeout';
     });
   });
-  });
 }, "test that MediaMetadata is correctly propagated twice");
 
 </script>

third_party/WebKit/LayoutTests/media/mediasession/mojo/metadata-propagated-twice.html

@@ -2,13 +2,14 @@
 <title>MediaSession Mojo Test</title>
 <script src="../../../resources/testharness.js"></script>
 <script src="../../../resources/testharnessreport.js"></script>
-<script src="../../../resources/mojo-helpers.js"></script>
+<script src="file:///gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script>
+<script src="file:///gen/third_party/WebKit/public/platform/modules/mediasession/media_session.mojom.js"></script>
 <script src="resources/mediasessionservice-mock.js"></script>
 <script src="resources/utils.js"></script>
 <script>
 
 async_test(function(t) {
-  mediaSessionServiceMock.then(m => {
+  let m = mediaSessionServiceMock;
   var dontCareMetadata = new MediaMetadata({});
 
   m.setMetadataCallback(t.step_func(function() {
@@ -27,7 +28,6 @@ async_test(function(t) {
     window.navigator.mediaSession.metadata = metadata;
   }));
   window.navigator.mediaSession.metadata = dontCareMetadata;
-  });
 }, "test that MediaMetadata is correctly propagated twice");
 
 </script>

third_party/WebKit/LayoutTests/media/mediasession/mojo/metadata-propagated.html

@@ -2,13 +2,14 @@
 <title>MediaSession Mojo Test</title>
 <script src="../../../resources/testharness.js"></script>
 <script src="../../../resources/testharnessreport.js"></script>
-<script src="../../../resources/mojo-helpers.js"></script>
+<script src="file:///gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script>
+<script src="file:///gen/third_party/WebKit/public/platform/modules/mediasession/media_session.mojom.js"></script>
 <script src="resources/mediasessionservice-mock.js"></script>
 <script src="resources/utils.js"></script>
 <script>
 
 async_test(function(t) {
-  mediaSessionServiceMock.then(m => {
+  let m = mediaSessionServiceMock;
   var metadata = new MediaMetadata({
     title: "title1",
     artist: "artist1",
@@ -22,7 +23,6 @@ async_test(function(t) {
     t.done();
   }));
   window.navigator.mediaSession.metadata = metadata;
-  });
 }, "test that MediaMetadata is correctly propagated");
 
 </script>

third_party/WebKit/LayoutTests/media/mediasession/mojo/metadata-session-link.html

@@ -2,7 +2,8 @@
 <title>MediaMetadata / MediaSession link Mojo Test</title>
 <script src="../../../resources/testharness.js"></script>
 <script src="../../../resources/testharnessreport.js"></script>
-<script src="../../../resources/mojo-helpers.js"></script>
+<script src="file:///gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script>
+<script src="file:///gen/third_party/WebKit/public/platform/modules/mediasession/media_session.mojom.js"></script>
 <script src="resources/mediasessionservice-mock.js"></script>
 <script src="resources/utils.js"></script>
 <script>
@@ -23,7 +24,7 @@ async_test(t => {
   ];
   var resultId = 0;
 
-  mediaSessionServiceMock.then(m => {
+  let m = mediaSessionServiceMock;
   m.setMetadataCallback(t.step_func(receivedMetadata => {
     assert_metadata_equals(receivedMetadata, results[resultId]);
     ++resultId;
@@ -55,7 +56,6 @@ async_test(t => {
     // This one will be received.
     otherMetadata.title = 'the right change';
   });
-  });
 }, "test that MediaMetadata is correctly propagated twice");
 
 </script>

third_party/WebKit/LayoutTests/media/mediasession/mojo/playback-state-propagated.html

@@ -2,7 +2,8 @@
 <title>MediaSession Mojo Test</title>
 <script src="../../../resources/testharness.js"></script>
 <script src="../../../resources/testharnessreport.js"></script>
-<script src="../../../resources/mojo-helpers.js"></script>
+<script src="file:///gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script>
+<script src="file:///gen/third_party/WebKit/public/platform/modules/mediasession/media_session.mojom.js"></script>
 <script src="resources/mediasessionservice-mock.js"></script>
 <script src="resources/utils.js"></script>
 <script>
@@ -25,7 +26,7 @@ function getExpectations() {
 }
 
 async_test(function(t) {
-  mediaSessionServiceMock.then(m => {
+  let m = mediaSessionServiceMock;
   m.setPlaybackStateCallback(t.step_func(function(state) {
     assert_equals(state, getExpectations()[nextExpectation++]);
     if (nextExpectation == getExpectations().length)
@@ -33,7 +34,6 @@ async_test(function(t) {
   }));
   for (let state of inputStates)
     window.navigator.mediaSession.playbackState = state;
-  });
 }, "test that MediaSession.playbackState is correctly propagated");
 
 </script>

third_party/WebKit/LayoutTests/media/mediasession/mojo/resources/mediasessionservice-mock.js

@@ -4,9 +4,6 @@
 
 "use strict";
 
-var MediaSessionAction;
-var MediaSessionPlaybackState;
-
 function mojoString16ToJS(mojoString16) {
   return String.fromCharCode.apply(null, mojoString16.data);
 }
@@ -39,25 +36,20 @@ function mojoMetadataToJS(mojoMetadata) {
   return new MediaMetadata({title: title, artist: artist, album: album, artwork: artwork});
 }
 
-let mediaSessionServiceMock = loadMojoModules(
-    'mediaSessionServiceMock',
-    ['third_party/WebKit/public/platform/modules/mediasession/media_session.mojom',
-     'mojo/public/js/bindings',
-    ]).then(mojo => {
-      let [mediaSessionService, bindings] = mojo.modules;
-
-      MediaSessionAction = mediaSessionService.MediaSessionAction;
-      MediaSessionPlaybackState = mediaSessionService.MediaSessionPlaybackState;
-
-      class MediaSessionServiceMock {
-        constructor(interfaceProvider) {
-          interfaceProvider.addInterfaceOverrideForTesting(
-              mediaSessionService.MediaSessionService.name,
-              handle => this.bindingSet_.addBinding(this, handle));
-          this.interfaceProvider_ = interfaceProvider;
+var MediaSessionAction = blink.mojom.MediaSessionAction;
+var MediaSessionPlaybackState = blink.mojom.MediaSessionPlaybackState;
+
+class MediaSessionServiceMock {
+  constructor() {
     this.pendingResponse_ = null;
-          this.bindingSet_ = new bindings.BindingSet(
-              mediaSessionService.MediaSessionService);
+    this.bindingSet_ = new mojo.BindingSet(
+        blink.mojom.MediaSessionService);
+
+    this.interceptor_ =
+        new MojoInterfaceInterceptor(blink.mojom.MediaSessionService.name);
+    this.interceptor_.oninterfacerequest =
+        e => this.bindingSet_.addBinding(this, e.handle);
+    this.interceptor_.start();
   }
 
   setMetadata(metadata) {
@@ -105,7 +97,6 @@ let mediaSessionServiceMock = loadMojoModules(
   getClient() {
     return this.client_;
   }
-      }
+}
 
-      return new MediaSessionServiceMock(mojo.frameInterfaces);
-    });
+let mediaSessionServiceMock = new MediaSessionServiceMock();

third_party/WebKit/LayoutTests/media/mediasession/mojo/set-null-metadata.html

@@ -2,19 +2,19 @@
 <title>MediaSession Mojo Test</title>
 <script src="../../../resources/testharness.js"></script>
 <script src="../../../resources/testharnessreport.js"></script>
-<script src="../../../resources/mojo-helpers.js"></script>
+<script src="file:///gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script>
+<script src="file:///gen/third_party/WebKit/public/platform/modules/mediasession/media_session.mojom.js"></script>
 <script src="resources/mediasessionservice-mock.js"></script>
 <script src="resources/utils.js"></script>
 <script>
 
 async_test(function(t) {
-  mediaSessionServiceMock.then(m => {
+  let m = mediaSessionServiceMock;
   m.setMetadataCallback(t.step_func(function(receivedMetadata) {
     assert_equals(receivedMetadata, null);
     t.done();
   }));
   window.navigator.mediaSession.metadata = null;
-  });
 }, "test that null MediaMetadata is correctly propagated");
 
 </script>

third_party/WebKit/public/BUILD.gn

@@ -806,7 +806,7 @@ mojom("android_mojo_bindings") {
   export_header_blink = "third_party/WebKit/public/platform/WebCommon.h"
 
   # TODO(crbug.com/699569): Convert to use the new JS bindings.
-  use_new_js_bindings = false
+  js_bindings_mode = "both"
 }
 
 # The offscreen_canvas_mojo_bindings is separated from the rest of mojom files

ui/gfx/geometry/mojo/BUILD.gn

@@ -10,9 +10,6 @@ mojom("mojo") {
   sources = [
     "geometry.mojom",
   ]
-
-  # TODO(crbug.com/699569): Convert to use the new JS bindings.
-  js_bindings_mode = "both"
 }
 
 mojom("test_interfaces") {