Update monet.

mojo/environment/default_async_waiter.cc

Index: mojo/environment/default_async_waiter.cc
diff --git a/mojo/environment/default_async_waiter_impl.cc b/mojo/environment/default_async_waiter.cc
similarity index 82%
rename from mojo/environment/default_async_waiter_impl.cc
rename to mojo/environment/default_async_waiter.cc
index ff7a524752ec6e4674a9e554b796128d7b8a7ac0..014e5c1ab3e2952c2f17361246fa979ff71bacb1 100644
--- a/mojo/environment/default_async_waiter_impl.cc
+++ b/mojo/environment/default_async_waiter.cc
@@ -2,10 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/environment/default_async_waiter_impl.h"
+#include "mojo/environment/default_async_waiter.h"
 
 #include "base/bind.h"
-#include "mojo/common/handle_watcher.h"
+#include "mojo/message_pump/handle_watcher.h"
+#include "mojo/public/c/environment/async_waiter.h"
 
 namespace mojo {
 namespace internal {
@@ -35,16 +36,9 @@ void CancelWait(MojoAsyncWaitID wait_id) {
   delete reinterpret_cast<common::HandleWatcher*>(wait_id);
 }
 
-const MojoAsyncWaiter kDefaultAsyncWaiter = {
-  AsyncWait,
-  CancelWait
-};
-
 }  // namespace
 
-const MojoAsyncWaiter* GetDefaultAsyncWaiterImpl() {
-  return &kDefaultAsyncWaiter;
-}
+const MojoAsyncWaiter kDefaultAsyncWaiter = {AsyncWait, CancelWait};
 
 }  // namespace internal
 }  // namespace mojo