Mojo: AsyncWaiter and mojo/public/environment

mojo/apps/js/bindings/waiting_callback.h

Index: mojo/apps/js/bindings/waiting_callback.h
diff --git a/mojo/apps/js/bindings/waiting_callback.h b/mojo/apps/js/bindings/waiting_callback.h
index 63b3dda7202000da44d33a63febe824a05f33b2a..c8410286d043826357ebcf09b449582ce58dbe49 100644
--- a/mojo/apps/js/bindings/waiting_callback.h
+++ b/mojo/apps/js/bindings/waiting_callback.h
@@ -8,35 +8,37 @@
 #include "gin/handle.h"
 #include "gin/runner.h"
 #include "gin/wrappable.h"
-#include "mojo/public/bindings/lib/bindings_support.h"
+#include "mojo/public/system/async_waiter.h"
 
 namespace mojo {
 namespace js {
 
-class WaitingCallback : public gin::Wrappable<WaitingCallback>,
-                        public BindingsSupport::AsyncWaitCallback {
+class WaitingCallback : public gin::Wrappable<WaitingCallback> {
  public:
   static gin::WrapperInfo kWrapperInfo;
 
   static gin::Handle<WaitingCallback> Create(
       v8::Isolate* isolate, v8::Handle<v8::Function> callback);
 
-  BindingsSupport::AsyncWaitID wait_id() const {
+  MojoAsyncWaitID wait_id() const {
     return wait_id_;
   }
 
-  void set_wait_id(BindingsSupport::AsyncWaitID wait_id) {
+  void set_wait_id(MojoAsyncWaitID wait_id) {
     wait_id_ = wait_id;
   }
 
+  // MojoAsyncWaitCallback
+  static void CallOnHandleReady(void* closure, MojoResult result);
+
  private:
   WaitingCallback(v8::Isolate* isolate, v8::Handle<v8::Function> callback);
   virtual ~WaitingCallback();
 
-  virtual void OnHandleReady(MojoResult result) OVERRIDE;
+  void OnHandleReady(MojoResult result);
 
   base::WeakPtr<gin::Runner> runner_;
-  BindingsSupport::AsyncWaitID wait_id_;
+  MojoAsyncWaitID wait_id_;
 
   DISALLOW_COPY_AND_ASSIGN(WaitingCallback);
 };