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

mojo/public/cpp/environment/logging.h

Index: mojo/public/cpp/environment/logging.h
diff --git a/mojo/public/cpp/environment/logging.h b/mojo/public/cpp/environment/logging.h
index bfc5c13f6c2e4b1e5dbc945abae9d2bd0750490d..fb275dbecce238fa27f9e60fc7a18085ed01f088 100644
--- a/mojo/public/cpp/environment/logging.h
+++ b/mojo/public/cpp/environment/logging.h
@@ -18,6 +18,12 @@
 #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()