Mojo: Suppress validation error logging in some tests

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;
+bool g_suppress_logging = false;
 
 }  // namespace
 
 const char* ValidationErrorToString(ValidationError error) {
   switch (error) {
     case VALIDATION_ERROR_NONE:
       return "VALIDATION_ERROR_NONE";
     case VALIDATION_ERROR_MISALIGNED_OBJECT:
       return "VALIDATION_ERROR_MISALIGNED_OBJECT";
     case VALIDATION_ERROR_ILLEGAL_MEMORY_RANGE:
@@ skipping 37 matching lines @@
 
 void ReportValidationError(ValidationContext* context,
                            ValidationError error,
                            const char* description) {
   if (g_validation_error_observer) {
     g_validation_error_observer->set_last_error(error);
     return;
   }
 
   if (description) {
-    LOG(ERROR) << "Invalid message: " << ValidationErrorToString(error) << " ("
-               << description << ")";
+    if (!g_suppress_logging) {
+      LOG(ERROR) << "Invalid message: " << ValidationErrorToString(error)
+                 << " (" << description << ")";
+    }
     if (context->message()) {
       context->message()->NotifyBadMessage(
           base::StringPrintf("Validation failed for %s [%s (%s)]",
                              context->description().data(),
                              ValidationErrorToString(error), description));
     }
   } else {
-    LOG(ERROR) << "Invalid message: " << ValidationErrorToString(error);
+    if (!g_suppress_logging)
+      LOG(ERROR) << "Invalid message: " << ValidationErrorToString(error);
     if (context->message()) {
       context->message()->NotifyBadMessage(
           base::StringPrintf("Validation failed for %s [%s]",
                              context->description().data(),
                              ValidationErrorToString(error)));
     }
   }
 }
 
 void ReportValidationErrorForMessage(
     mojo::Message* message,
     ValidationError error,
     const char* description) {
   ValidationContext validation_context(
       message->data(), message->data_num_bytes(),
       message->handles()->size(), message,
       description);
   ReportValidationError(&validation_context, error);
 }
 
+void SuppressValidationErrorLoggingForTests(bool suppress) {

[yzshen1, 2016/11/02 16:44:20]

This function is not used (or declared in the .h file).

[Ken Rockot(use gerrit already), 2016/11/02 17:23:15]

Oops, forgot to delete. Done.

+  g_suppress_logging = suppress;
+}
+
+ScopedSuppressValidationErrorLoggingForTests
+    ::ScopedSuppressValidationErrorLoggingForTests()
+    : was_suppressed_(g_suppress_logging) {
+  g_suppress_logging = true;
+}
+
+ScopedSuppressValidationErrorLoggingForTests
+    ::~ScopedSuppressValidationErrorLoggingForTests() {
+  g_suppress_logging = was_suppressed_;
+}
+
 ValidationErrorObserverForTesting::ValidationErrorObserverForTesting(
     const base::Closure& callback)
     : last_error_(VALIDATION_ERROR_NONE), callback_(callback) {
   DCHECK(!g_validation_error_observer);
   g_validation_error_observer = this;
 }
 
 ValidationErrorObserverForTesting::~ValidationErrorObserverForTesting() {
   DCHECK(g_validation_error_observer == this);
   g_validation_error_observer = nullptr;
@@ skipping 15 matching lines @@
 }
 
 SerializationWarningObserverForTesting::
     ~SerializationWarningObserverForTesting() {
   DCHECK(g_serialization_warning_observer == this);
   g_serialization_warning_observer = nullptr;
 }
 
 }  // namespace internal
 }  // namespace mojo