Add FlushForTesting to InterfacePtr and Binding.

mojo/public/cpp/bindings/lib/validation_util.cc

 // Copyright 2015 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_util.h"
 
 #include <stdint.h>
 
 #include <limits>
 
@@ skipping 82 matching lines @@
                                ValidationContext* validation_context) {
   if (message->has_flag(Message::kFlagExpectsResponse) ||
       !message->has_flag(Message::kFlagIsResponse)) {
     ReportValidationError(validation_context,
                           VALIDATION_ERROR_MESSAGE_HEADER_INVALID_FLAGS);
     return false;
   }
   return true;
 }
 
-bool ValidateControlRequest(const Message* message,
-                            ValidationContext* validation_context) {
-  switch (message->header()->name) {
-    case interface_control::kRunMessageId:
-      return ValidateMessageIsRequestExpectingResponse(message,
-                                                       validation_context) &&
-             ValidateMessagePayload<
-                 interface_control::internal::RunMessageParams_Data>(
-                 message, validation_context);
-    case interface_control::kRunOrClosePipeMessageId:
-      return ValidateMessageIsRequestWithoutResponse(message,
-                                                     validation_context) &&
-             ValidateMessagePayload<
-                 interface_control::internal::RunOrClosePipeMessageParams_Data>(
-                 message, validation_context);
-  }
-  return false;
-}
-
-bool ValidateControlResponse(const Message* message,
-                             ValidationContext* validation_context) {
-  if (!ValidateMessageIsResponse(message, validation_context))
-    return false;
-  switch (message->header()->name) {
-    case interface_control::kRunMessageId:
-      return ValidateMessagePayload<
-          interface_control::internal::RunResponseMessageParams_Data>(
-          message, validation_context);
-  }
-  return false;
-}
-
 bool IsHandleOrInterfaceValid(const AssociatedInterface_Data& input) {
   return IsValidInterfaceId(input.interface_id);
 }
 
 bool IsHandleOrInterfaceValid(const AssociatedInterfaceRequest_Data& input) {
   return IsValidInterfaceId(input.interface_id);
 }
 
 bool IsHandleOrInterfaceValid(const Interface_Data& input) {
   return input.handle.is_valid();
@@ skipping 86 matching lines @@
 
 bool ValidateHandleOrInterface(const Handle_Data& input,
                                ValidationContext* validation_context) {
   if (validation_context->ClaimHandle(input))
     return true;
 
   ReportValidationError(validation_context, VALIDATION_ERROR_ILLEGAL_HANDLE);
   return false;
 }
 
+bool ControlMessageValidator::Accept(Message* message) {
+  if (ControlMessageHandler::IsControlMessage(message)) {
+    ValidationContext validation_context(
+        message->data(), message->data_num_bytes(), message->handles()->size(),
+        message, "ControlMessageValidator");
+    switch (message->header()->name) {
+      case interface_control::kRunMessageId:
+        if (message->has_flag(Message::kFlagExpectsResponse)) {
+          return ValidateMessagePayload<
+              interface_control::internal::RunMessageParams_Data>(
+              message, &validation_context);
+        }
+        if (message->has_flag(Message::kFlagIsResponse)) {
+          return ValidateMessagePayload<
+              interface_control::internal::RunResponseMessageParams_Data>(
+              message, &validation_context);
+        }
+        return false;
+      case interface_control::kRunOrClosePipeMessageId:
+        return ValidateMessageIsRequestWithoutResponse(message,
+                                                       &validation_context) &&
+               ValidateMessagePayload<interface_control::internal::
+                                          RunOrClosePipeMessageParams_Data>(
+                   message, &validation_context);
+    }
+    return false;
+  }
+  return true;
+}
+
 }  // namespace internal
 }  // namespace mojo