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

mojo/public/cpp/bindings/lib/validation_errors.h

Index: mojo/public/cpp/bindings/lib/validation_errors.h
diff --git a/mojo/public/cpp/bindings/lib/validation_errors.h b/mojo/public/cpp/bindings/lib/validation_errors.h
index d1abfdd0e4e1f3177f1970fcf9f03b433f5015b9..3208d5d11ce1f4e3f60b1cd9449d372cea91a7ec 100644
--- a/mojo/public/cpp/bindings/lib/validation_errors.h
+++ b/mojo/public/cpp/bindings/lib/validation_errors.h
@@ -5,7 +5,13 @@
 #ifndef MOJO_PUBLIC_CPP_BINDINGS_LIB_VALIDATION_ERRORS_H_
 #define MOJO_PUBLIC_CPP_BINDINGS_LIB_VALIDATION_ERRORS_H_
 
+#include "mojo/public/cpp/bindings/callback.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.
+#undef ERROR
+#endif
 
 namespace mojo {
 namespace internal {
@@ -70,14 +76,18 @@ void ReportValidationError(ValidationError error,
 // validation.
 class ValidationErrorObserverForTesting {
  public:
-  ValidationErrorObserverForTesting();
+  explicit ValidationErrorObserverForTesting(const Callback<void()>& callback);
   ~ValidationErrorObserverForTesting();
 
   ValidationError last_error() const { return last_error_; }
-  void set_last_error(ValidationError error) { last_error_ = error; }
+  void set_last_error(ValidationError error) {
+    last_error_ = error;
+    callback_.Run();
+  }
 
  private:
   ValidationError last_error_;
+  Callback<void()> callback_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(ValidationErrorObserverForTesting);
 };