Mojo C++ bindings: introduce an optional array to store transferred interface IDs in messages.

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 83 matching lines @@
   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 IsHandleOrInterfaceValid(const AssociatedInterface_Data& input) {
-  return IsValidInterfaceId(input.interface_id);
+  return input.handle.is_valid();
 }
 
-bool IsHandleOrInterfaceValid(const AssociatedInterfaceRequest_Data& input) {
-  return IsValidInterfaceId(input.interface_id);
+bool IsHandleOrInterfaceValid(const AssociatedEndpointHandle_Data& input) {
+  return input.is_valid();
 }
 
 bool IsHandleOrInterfaceValid(const Interface_Data& input) {
   return input.handle.is_valid();
 }
 
 bool IsHandleOrInterfaceValid(const Handle_Data& input) {
   return input.is_valid();
 }
 
 bool ValidateHandleOrInterfaceNonNullable(
     const AssociatedInterface_Data& input,
     const char* error_message,
     ValidationContext* validation_context) {
   if (IsHandleOrInterfaceValid(input))
     return true;
 
   ReportValidationError(validation_context,
                         VALIDATION_ERROR_UNEXPECTED_INVALID_INTERFACE_ID,
                         error_message);
   return false;
 }
 
 bool ValidateHandleOrInterfaceNonNullable(
-    const AssociatedInterfaceRequest_Data& input,
+    const AssociatedEndpointHandle_Data& input,
     const char* error_message,
     ValidationContext* validation_context) {
   if (IsHandleOrInterfaceValid(input))
     return true;
 
   ReportValidationError(validation_context,
                         VALIDATION_ERROR_UNEXPECTED_INVALID_INTERFACE_ID,
                         error_message);
   return false;
 }
@@ skipping 19 matching lines @@
     return true;
 
   ReportValidationError(validation_context,
                         VALIDATION_ERROR_UNEXPECTED_INVALID_HANDLE,
                         error_message);
   return false;
 }
 
 bool ValidateHandleOrInterface(const AssociatedInterface_Data& input,
                                ValidationContext* validation_context) {
-  if (!IsMasterInterfaceId(input.interface_id))
+  if (validation_context->ClaimAssociatedEndpointHandle(input.handle))
     return true;
 
   ReportValidationError(validation_context,
                         VALIDATION_ERROR_ILLEGAL_INTERFACE_ID);
   return false;
 }
 
-bool ValidateHandleOrInterface(const AssociatedInterfaceRequest_Data& input,
+bool ValidateHandleOrInterface(const AssociatedEndpointHandle_Data& input,
                                ValidationContext* validation_context) {
-  if (!IsMasterInterfaceId(input.interface_id))
+  if (validation_context->ClaimAssociatedEndpointHandle(input))
     return true;
 
   ReportValidationError(validation_context,
                         VALIDATION_ERROR_ILLEGAL_INTERFACE_ID);
   return false;
 }
 
 bool ValidateHandleOrInterface(const Interface_Data& input,
                                ValidationContext* validation_context) {
   if (validation_context->ClaimHandle(input.handle))
     return true;
 
   ReportValidationError(validation_context, VALIDATION_ERROR_ILLEGAL_HANDLE);
   return false;
 }
 
 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;
 }
 
 }  // namespace internal
 }  // namespace mojo