Two fixes for mojo JS bindings

mojo/bindings/js/support.cc

Index: mojo/bindings/js/support.cc
diff --git a/mojo/bindings/js/support.cc b/mojo/bindings/js/support.cc
index cb8cb99665d6dcfe9ae6274f40ed6054ffd7a2ad..ac6cb3400fa68353f5ca7297c20d31d7a1d969d8 100644
--- a/mojo/bindings/js/support.cc
+++ b/mojo/bindings/js/support.cc
@@ -25,30 +25,11 @@ namespace {
 WaitingCallback* AsyncWait(const gin::Arguments& args, mojo::Handle handle,
                            MojoWaitFlags flags,
                            v8::Handle<v8::Function> callback) {
-  gin::Handle<WaitingCallback> waiting_callback =
-      WaitingCallback::Create(args.isolate(), callback);
-
-  MojoAsyncWaiter* waiter = GetDefaultAsyncWaiter();
-  MojoAsyncWaitID wait_id = waiter->AsyncWait(
-      waiter,
-      handle.value(),
-      flags,
-      MOJO_DEADLINE_INDEFINITE,
-      &WaitingCallback::CallOnHandleReady,
-      waiting_callback.get());
-
-  waiting_callback->set_wait_id(wait_id);
-
-  return waiting_callback.get();
+  return WaitingCallback::Create(args.isolate(), callback, handle, flags).get();
 }
 
 void CancelWait(WaitingCallback* waiting_callback) {
-  if (!waiting_callback->wait_id())
-    return;
-
-  MojoAsyncWaiter* waiter = GetDefaultAsyncWaiter();
-  waiter->CancelWait(waiter, waiting_callback->wait_id());
-  waiting_callback->set_wait_id(0);
+  waiting_callback->Cancel();
 }
 
 gin::WrapperInfo g_wrapper_info = { gin::kEmbedderNativeGin };