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

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

 // Copyright 2014 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.
 
-#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
 // two ways RunLoopHandlerImpl is deleted:
 // . when the handle is ready (or errored).
 // . when CancelWait() is invoked.
 class RunLoopHandlerImpl : public RunLoopHandler {
  public:
   RunLoopHandlerImpl(const Handle& handle,
                      MojoAsyncWaitCallback callback,
@@ skipping 48 matching lines @@
   RunLoopHandlerImpl* run_loop_handler =
       new RunLoopHandlerImpl(Handle(handle), callback, closure);
   run_loop->AddHandler(run_loop_handler, Handle(handle), signals, deadline);
   return reinterpret_cast<MojoAsyncWaitID>(run_loop_handler);
 }
 
 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