Update mojo sdk to rev 04a510fb37db10642e156957f9b2c11c2f6442ac

mojo/public/cpp/environment/async_waiter.h

Index: mojo/public/cpp/environment/async_waiter.h
diff --git a/device/serial/async_waiter.h b/mojo/public/cpp/environment/async_waiter.h
similarity index 69%
copy from device/serial/async_waiter.h
copy to mojo/public/cpp/environment/async_waiter.h
index f39bf32a60bdb53c9262d11982b7891f158d12dc..83b7c8a7c5d7d8b0f116d0e0f479f73da0e4e677 100644
--- a/device/serial/async_waiter.h
+++ b/mojo/public/cpp/environment/async_waiter.h
@@ -2,24 +2,24 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef DEVICE_SERIAL_ASYNC_WAITER_H_
-#define DEVICE_SERIAL_ASYNC_WAITER_H_
+#ifndef MOJO_PUBLIC_CPP_ENVIRONMENT_ASYNC_WAITER_H_
+#define MOJO_PUBLIC_CPP_ENVIRONMENT_ASYNC_WAITER_H_
 
-#include "base/callback.h"
 #include "mojo/public/c/environment/async_waiter.h"
+#include "mojo/public/cpp/bindings/callback.h"
 #include "mojo/public/cpp/environment/environment.h"
 #include "mojo/public/cpp/system/handle.h"
 
-namespace device {
+namespace mojo {
 
 // A class that waits until a handle is ready and calls |callback| with the
 // result. If the AsyncWaiter is deleted before the handle is ready, the wait is
 // cancelled and the callback will not be called.
 class AsyncWaiter {
  public:
-  typedef base::Callback<void(MojoResult)> Callback;
+  typedef mojo::Callback<void(MojoResult)> Callback;
 
-  AsyncWaiter(mojo::Handle handle,
+  AsyncWaiter(Handle handle,
               MojoHandleSignals signals,
               const Callback& callback);
   ~AsyncWaiter();
@@ -32,9 +32,9 @@ class AsyncWaiter {
   MojoAsyncWaitID id_;
   const Callback callback_;
 
-  DISALLOW_COPY_AND_ASSIGN(AsyncWaiter);
+  MOJO_DISALLOW_COPY_AND_ASSIGN(AsyncWaiter);
 };
 
-}  // namespace device
+}  // namespace mojo
 
-#endif  // DEVICE_SERIAL_ASYNC_WAITER_H_
+#endif  // MOJO_PUBLIC_CPP_ENVIRONMENT_ASYNC_WAITER_H_