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

mojo/public/cpp/environment/lib/default_logger.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_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;
 
 const char* GetLogLevelString(MojoLogLevel log_level) {
   if (log_level < MOJO_LOG_LEVEL_VERBOSE)
     return "VERBOSE";
   switch (log_level) {
     case MOJO_LOG_LEVEL_VERBOSE:
       return "VERBOSE";
@@ skipping 15 matching lines @@
   // TODO(vtl): Add timestamp also?
   fprintf(stderr, "%s:%s\n", GetLogLevelString(log_level), message);
   if (log_level >= MOJO_LOG_LEVEL_FATAL)
     abort();
 }
 
 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