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

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

Index: mojo/public/cpp/environment/lib/default_logger.cc
diff --git a/mojo/public/cpp/environment/lib/default_logger.cc b/mojo/public/cpp/environment/lib/default_logger.cc
index 7f0116a92f0638cc43fe5c9212326fcacdcf3f6f..80a74396049f611020e0e980df390ec3b5c4b427 100644
--- a/mojo/public/cpp/environment/lib/default_logger.cc
+++ b/mojo/public/cpp/environment/lib/default_logger.cc
@@ -2,14 +2,17 @@
 // 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_logger.h"
+#include "mojo/public/cpp/environment/lib/default_logger.h"
 
 #include <stdio.h>
 #include <stdlib.h>  // For |abort()|.
 
 #include <algorithm>
 
+#include "mojo/public/c/environment/logger.h"
+
 namespace mojo {
+
 namespace {
 
 MojoLogLevel g_minimum_log_level = MOJO_LOG_LEVEL_INFO;
@@ -45,25 +48,20 @@ MojoLogLevel GetMinimumLogLevel() {
   return g_minimum_log_level;
 }
 
-const MojoLogger kDefaultLogger = {
-  LogMessage,
-  GetMinimumLogLevel
-};
+void SetMinimumLogLevel(MojoLogLevel minimum_log_level) {
+  g_minimum_log_level = std::min(minimum_log_level, MOJO_LOG_LEVEL_FATAL);
+}
 
 }  // namespace
 
 namespace internal {
 
-// Declared in mojo/public/cpp/environment/lib/default_logger_internal.h:
-void SetMinimumLogLevel(MojoLogLevel minimum_log_level) {
-  g_minimum_log_level = std::min(minimum_log_level, MOJO_LOG_LEVEL_FATAL);
-}
+const MojoLogger kDefaultLogger = {
+  LogMessage,
+  GetMinimumLogLevel,
+  SetMinimumLogLevel
+};
 
 }  // namespace internal
 
-// Declared in mojo/public/cpp/environment/default_logger.h:
-const MojoLogger* GetDefaultLogger() {
-  return &kDefaultLogger;
-}
-
 }  // namespace mojo