Mojo: AsyncWaiter and mojo/public/environment

mojo/apps/js/bindings/waiting_callback.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MOJO_APPS_JS_BINDINGS_WAITING_CALLBACK_H_
 #define MOJO_APPS_JS_BINDINGS_WAITING_CALLBACK_H_
 
 #include "gin/handle.h"
 #include "gin/runner.h"
 #include "gin/wrappable.h"
-#include "mojo/public/bindings/lib/bindings_support.h"
+#include "mojo/public/environment/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(uintptr_t user_data, 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);
 };
 
 }  // namespace js
 }  // namespace mojo
 
 #endif  // MOJO_APPS_JS_BINDINGS_WAITING_CALLBACK_H_