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

mojo/public/cpp/environment/tests/async_waiter_unittest.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 <string>
 
-#include "mojo/public/cpp/environment/default_async_waiter.h"
+#include "mojo/public/c/environment/async_waiter.h"
 #include "mojo/public/cpp/environment/environment.h"
 #include "mojo/public/cpp/system/core.h"
 #include "mojo/public/cpp/system/macros.h"
 #include "mojo/public/cpp/test_support/test_utils.h"
 #include "mojo/public/cpp/utility/run_loop.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 namespace {
 
@@ skipping 17 matching lines @@
  private:
   int result_count_;
   MojoResult last_result_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(TestAsyncWaitCallback);
 };
 
 MojoAsyncWaitID CallAsyncWait(const Handle& handle,
                               MojoHandleSignals signals,
                               TestAsyncWaitCallback* callback) {
-  return GetDefaultAsyncWaiter()->AsyncWait(
+  return Environment::GetDefaultAsyncWaiter()->AsyncWait(
       handle.value(),
       signals,
       MOJO_DEADLINE_INDEFINITE,
       &TestAsyncWaitCallback::OnHandleReady,
       callback);
 }
 
 void CallCancelWait(MojoAsyncWaitID wait_id) {
-  GetDefaultAsyncWaiter()->CancelWait(wait_id);
+  Environment::GetDefaultAsyncWaiter()->CancelWait(wait_id);
 }
 
 class AsyncWaiterTest : public testing::Test {
  public:
   AsyncWaiterTest() {}
 
  private:
   Environment environment_;
   RunLoop run_loop_;
 
@@ skipping 46 matching lines @@
   CallCancelWait(
       CallAsyncWait(test_pipe.handle0.get(),
                     MOJO_HANDLE_SIGNAL_READABLE,
                     &callback));
   RunLoop::current()->Run();
   EXPECT_EQ(0, callback.result_count());
 }
 
 }  // namespace
 }  // namespace mojo