Mojo: Report bindings validation errors via MojoNotifyBadMessage

mojo/public/cpp/bindings/lib/validation_errors.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/bindings/lib/validation_errors.h"
 
+#include "base/strings/stringprintf.h"
+#include "mojo/public/cpp/bindings/message.h"
+
 namespace mojo {
 namespace internal {
 namespace {
 
 ValidationErrorObserverForTesting* g_validation_error_observer = nullptr;
 SerializationWarningObserverForTesting* g_serialization_warning_observer =
     nullptr;
 
 }  // namespace
 
@@ skipping 26 matching lines @@
     case VALIDATION_ERROR_MESSAGE_HEADER_MISSING_REQUEST_ID:
       return "VALIDATION_ERROR_MESSAGE_HEADER_MISSING_REQUEST_ID";
     case VALIDATION_ERROR_MESSAGE_HEADER_UNKNOWN_METHOD:
       return "VALIDATION_ERROR_MESSAGE_HEADER_UNKNOWN_METHOD";
     case VALIDATION_ERROR_DIFFERENT_SIZED_ARRAYS_IN_MAP:
       return "VALIDATION_ERROR_DIFFERENT_SIZED_ARRAYS_IN_MAP";
     case VALIDATION_ERROR_UNKNOWN_UNION_TAG:
       return "VALIDATION_ERROR_UNKNOWN_UNION_TAG";
     case VALIDATION_ERROR_UNKNOWN_ENUM_VALUE:
       return "VALIDATION_ERROR_UNKNOWN_ENUM_VALUE";
+    case VALIDATION_ERROR_DESERIALIZATION_FAILED:
+      return "VALIDATION_ERROR_DESERIALIZATION_FAILED";
   }
 
   return "Unknown error";
 }
 
-void ReportValidationError(ValidationError error, const char* description) {
+void ReportValidationError(ValidationContext* context,
+                           ValidationError error,
+                           const char* description) {
   if (g_validation_error_observer) {
     g_validation_error_observer->set_last_error(error);
   } else if (description) {
     LOG(ERROR) << "Invalid message: " << ValidationErrorToString(error) << " ("
                << description << ")";
   } else {
     LOG(ERROR) << "Invalid message: " << ValidationErrorToString(error);
   }
+
+  if (context->message()) {

[yzshen1, 2016/06/15 22:20:09]

When g_validation_error_observer is set, we are in validation tests. Do we still
want to NotifyBadMessage in that case?

[Ken Rockot(use gerrit already), 2016/06/15 22:38:23]

I guess not. Done.

+    if (description) {
+      context->message()->NotifyBadMessage(
+          base::StringPrintf("Validation failed for %s [%s (%s)]",
+                             context->description().data(),
+                             ValidationErrorToString(error), description));
+    } else {
+      context->message()->NotifyBadMessage(
+          base::StringPrintf("Validation failed for %s [%s]",
+                             context->description().data(),
+                             ValidationErrorToString(error)));
+    }
+  }
 }
 
 ValidationErrorObserverForTesting::ValidationErrorObserverForTesting(
     const Callback<void()>& callback)
     : last_error_(VALIDATION_ERROR_NONE), callback_(callback) {
   DCHECK(!g_validation_error_observer);
   g_validation_error_observer = this;
 }
 
 ValidationErrorObserverForTesting::~ValidationErrorObserverForTesting() {
@@ skipping 17 matching lines @@
 }
 
 SerializationWarningObserverForTesting::
     ~SerializationWarningObserverForTesting() {
   DCHECK(g_serialization_warning_observer == this);
   g_serialization_warning_observer = nullptr;
 }
 
 }  // namespace internal
 }  // namespace mojo