[WIP] Mojo native bindings interface.

third_party/WebKit/LayoutTests/resources/mojo-helpers.js

Index: third_party/WebKit/LayoutTests/resources/mojo-helpers.js
diff --git a/third_party/WebKit/LayoutTests/resources/mojo-helpers.js b/third_party/WebKit/LayoutTests/resources/mojo-helpers.js
index 481ed60b8f1c0a5b7a640668cc992b263e75a7b4..94f18a67b4c077daeabeb54b91d27816a51d54d5 100644
--- a/third_party/WebKit/LayoutTests/resources/mojo-helpers.js
+++ b/third_party/WebKit/LayoutTests/resources/mojo-helpers.js
@@ -30,12 +30,11 @@ let define = (function(){
 define('Mojo Helpers', [
     'mojo/public/js/core',
     'mojo/public/js/router',
-    'mojo/public/js/support',
     'content/public/renderer/frame_interfaces',
     'content/public/renderer/interfaces',
     'content/shell/renderer/layout_test/frame_interface_registry',
     'content/shell/renderer/layout_test/interface_registry',
-], (core, router, support, frameInterfaces, interfaces, frameInterfaceRegistry,
+], (core, router, frameInterfaces, interfaces, frameInterfaceRegistry,
     interfaceRegistry) => {
   let tearDown = () => {
     frameInterfaces.clearInterfaceOverridesForTesting();
@@ -48,7 +47,6 @@ define('Mojo Helpers', [
   return {
     core,
     router,
-    support,
     frameInterfaces,
     frameInterfaceRegistry,
     interfaces,
@@ -80,7 +78,8 @@ function mojo_test(func, name, properties) {
 // Waits for a message to become available on a pipe.
 function mojo_wait_for_incoming_message(mojo, pipe) {
   return new Promise((resolve, reject) => {
-    mojo.support.asyncWait(pipe, mojo.core.HANDLE_SIGNAL_READABLE, result => {
+    let watcher = mojo.core.watch(pipe, mojo.core.HANDLE_SIGNAL_READABLE, result => {
+      watcher.cancel();
       if (result != mojo.core.RESULT_OK) {
         reject(result);
         return;