Mojo: Make GetDefault{AsyncWaiter,Logger} static methods of Environment.

mojo/public/cpp/environment/lib/default_async_waiter.cc

Index: mojo/public/cpp/environment/lib/default_async_waiter.cc
diff --git a/mojo/public/cpp/environment/lib/default_async_waiter.cc b/mojo/public/cpp/environment/lib/default_async_waiter.cc
index ae89a86f45e2d351eec422d29deec477643e8bf9..257f1c8d797c02c37e0341c158c0576fa11c7e28 100644
--- a/mojo/public/cpp/environment/lib/default_async_waiter.cc
+++ b/mojo/public/cpp/environment/lib/default_async_waiter.cc
@@ -2,14 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/public/cpp/environment/default_async_waiter.h"
+#include "mojo/public/cpp/environment/lib/default_async_waiter.h"
 
 #include <assert.h>
 
+#include "mojo/public/c/environment/async_waiter.h"
 #include "mojo/public/cpp/utility/run_loop.h"
 #include "mojo/public/cpp/utility/run_loop_handler.h"
 
 namespace mojo {
+
 namespace {
 
 // RunLoopHandler implementation used for a request to AsyncWait(). There are
@@ -78,15 +80,15 @@ void CancelWait(MojoAsyncWaitID wait_id) {
   delete reinterpret_cast<RunLoopHandlerImpl*>(wait_id);
 }
 
+}  // namespace
+
+namespace internal {
+
 const MojoAsyncWaiter kDefaultAsyncWaiter = {
   AsyncWait,
   CancelWait
 };
 
-}  // namespace
-
-const MojoAsyncWaiter* GetDefaultAsyncWaiter() {
-  return &kDefaultAsyncWaiter;
-}
+}  // namespace internal
 
 }  // namespace mojo