Fix a bunch of mojo_public_*_unittests with the new EDK.

mojo/public/cpp/environment/logging.h

 // 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.
 
 // Logging macros, similar to Chromium's base/logging.h, except with |MOJO_|
 // prefixes and missing some features (notably |CHECK_EQ()|, etc.).
 
 // TODO(vtl): It's weird that this is in the environment directory, since its
 // implementation (in environment/lib) is meant to be used by any implementation
 // of the environment.
 
 #ifndef MOJO_PUBLIC_CPP_ENVIRONMENT_LOGGING_H_
 #define MOJO_PUBLIC_CPP_ENVIRONMENT_LOGGING_H_
 
 #include <sstream>
 
 #include "mojo/public/c/environment/logger.h"
 #include "mojo/public/cpp/environment/environment.h"
 #include "mojo/public/cpp/system/macros.h"
 
+#if defined(OS_WIN)
+// To avoid a compile failure on Windows because it defines ERROR, which is also
+// used by the logs. Similar to change in base/logging.h.
+#undef ERROR
+#endif
+
 #define MOJO_LOG_STREAM(level)                                             \
   ::mojo::internal::LogMessage(MOJO_LOG_LEVEL_##level, __FILE__, __LINE__) \
       .stream()
 
 #define MOJO_LAZY_LOG_STREAM(level, condition) \
   !(condition) ? (void)0                       \
                : ::mojo::internal::VoidifyOstream() & MOJO_LOG_STREAM(level)
 
 #define MOJO_SHOULD_LOG(level) \
   (MOJO_LOG_LEVEL_##level >=   \
@@ skipping 50 matching lines @@
 // Used to ignore a stream.
 struct VoidifyOstream {
   // Use & since it has precedence lower than << but higher than ?:.
   void operator&(std::ostream&) {}
 };
 
 }  // namespace internal
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_CPP_ENVIRONMENT_LOGGING_H_