Mojo: Report bindings validation errors via MojoNotifyBadMessage

mojo/public/cpp/bindings/tests/union_unittest.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 <stddef.h>
 #include <stdint.h>
 #include <utility>
 #include <vector>
 
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "mojo/public/cpp/bindings/array.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/bindings/lib/array_internal.h"
-#include "mojo/public/cpp/bindings/lib/bounds_checker.h"
 #include "mojo/public/cpp/bindings/lib/fixed_buffer.h"
 #include "mojo/public/cpp/bindings/lib/serialization.h"
+#include "mojo/public/cpp/bindings/lib/validation_context.h"
 #include "mojo/public/cpp/bindings/string.h"
 #include "mojo/public/cpp/test_support/test_utils.h"
 #include "mojo/public/interfaces/bindings/tests/test_structs.mojom.h"
 #include "mojo/public/interfaces/bindings/tests/test_unions.mojom.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 namespace test {
 
 TEST(UnionTest, PlainOldDataGetterSetter) {
@@ skipping 137 matching lines @@
   size_t size =
       mojo::internal::PrepareToSerialize<PodUnionPtr>(pod, false, nullptr);
   EXPECT_EQ(16U, size);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::PodUnion_Data* data = nullptr;
   mojo::internal::Serialize<PodUnionPtr>(pod, &buf, &data, false, nullptr);
   data->EncodePointers();
 
   void* raw_buf = buf.Leak();
-  mojo::internal::BoundsChecker bounds_checker(data,
-                                               static_cast<uint32_t>(size), 0);
+  mojo::internal::ValidationContext validation_context(
+      data, static_cast<uint32_t>(size), 0);
   EXPECT_TRUE(
-      internal::PodUnion_Data::Validate(raw_buf, &bounds_checker, false));
+      internal::PodUnion_Data::Validate(raw_buf, &validation_context, false));
   free(raw_buf);
 }
 
 TEST(UnionTest, SerializeNotNull) {
   PodUnionPtr pod(PodUnion::New());
   pod->set_f_int8(0);
   size_t size =
       mojo::internal::PrepareToSerialize<PodUnionPtr>(pod, false, nullptr);
   mojo::internal::FixedBufferForTesting buf(size);
   internal::PodUnion_Data* data = nullptr;
@@ skipping 28 matching lines @@
       mojo::internal::PrepareToSerialize<PodUnionPtr>(pod, false, nullptr);
   EXPECT_EQ(16U, size);
   mojo::internal::FixedBufferForTesting buf(size);
   internal::PodUnion_Data* data = nullptr;
   mojo::internal::Serialize<PodUnionPtr>(pod, &buf, &data, false, nullptr);
   EXPECT_EQ(nullptr, data);
 }
 
 TEST(UnionTest, NullValidation) {
   void* buf = nullptr;
-  mojo::internal::BoundsChecker bounds_checker(buf, 0, 0);
-  EXPECT_TRUE(internal::PodUnion_Data::Validate(buf, &bounds_checker, false));
+  mojo::internal::ValidationContext validation_context(buf, 0, 0);
+  EXPECT_TRUE(internal::PodUnion_Data::Validate(
+      buf, &validation_context, false));
 }
 
 TEST(UnionTest, OutOfAlignmentValidation) {
   size_t size = sizeof(internal::PodUnion_Data);
   // Get an aligned object and shift the alignment.
   mojo::internal::FixedBufferForTesting aligned_buf(size + 1);
   void* raw_buf = aligned_buf.Leak();
   char* buf = reinterpret_cast<char*>(raw_buf) + 1;
 
   internal::PodUnion_Data* data =
       reinterpret_cast<internal::PodUnion_Data*>(buf);
-  mojo::internal::BoundsChecker bounds_checker(data,
-                                               static_cast<uint32_t>(size), 0);
-  EXPECT_FALSE(internal::PodUnion_Data::Validate(buf, &bounds_checker, false));
+  mojo::internal::ValidationContext validation_context(
+      data, static_cast<uint32_t>(size), 0);
+  EXPECT_FALSE(internal::PodUnion_Data::Validate(
+      buf, &validation_context, false));
   free(raw_buf);
 }
 
 TEST(UnionTest, OOBValidation) {
   size_t size = sizeof(internal::PodUnion_Data) - 1;
   mojo::internal::FixedBufferForTesting buf(size);
   internal::PodUnion_Data* data = internal::PodUnion_Data::New(&buf);
-  mojo::internal::BoundsChecker bounds_checker(data,
-                                               static_cast<uint32_t>(size), 0);
+  mojo::internal::ValidationContext validation_context(
+      data, static_cast<uint32_t>(size), 0);
   void* raw_buf = buf.Leak();
   EXPECT_FALSE(
-      internal::PodUnion_Data::Validate(raw_buf, &bounds_checker, false));
+      internal::PodUnion_Data::Validate(raw_buf, &validation_context, false));
   free(raw_buf);
 }
 
 TEST(UnionTest, UnknownTagValidation) {
   size_t size = sizeof(internal::PodUnion_Data);
   mojo::internal::FixedBufferForTesting buf(size);
   internal::PodUnion_Data* data = internal::PodUnion_Data::New(&buf);
   data->tag = static_cast<internal::PodUnion_Data::PodUnion_Tag>(0xFFFFFF);
-  mojo::internal::BoundsChecker bounds_checker(data,
-                                               static_cast<uint32_t>(size), 0);
+  mojo::internal::ValidationContext validation_context(
+      data, static_cast<uint32_t>(size), 0);
   void* raw_buf = buf.Leak();
   EXPECT_FALSE(
-      internal::PodUnion_Data::Validate(raw_buf, &bounds_checker, false));
+      internal::PodUnion_Data::Validate(raw_buf, &validation_context, false));
   free(raw_buf);
 }
 
 TEST(UnionTest, UnknownEnumValueValidation) {
   PodUnionPtr pod(PodUnion::New());
   pod->set_f_enum(static_cast<AnEnum>(0xFFFF));
 
   size_t size =
       mojo::internal::PrepareToSerialize<PodUnionPtr>(pod, false, nullptr);
   EXPECT_EQ(16U, size);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::PodUnion_Data* data = nullptr;
   mojo::internal::Serialize<PodUnionPtr>(pod, &buf, &data, false, nullptr);
 
   void* raw_buf = buf.Leak();
-  mojo::internal::BoundsChecker bounds_checker(data,
-                                               static_cast<uint32_t>(size), 0);
+  mojo::internal::ValidationContext validation_context(
+      data, static_cast<uint32_t>(size), 0);
   EXPECT_FALSE(
-      internal::PodUnion_Data::Validate(raw_buf, &bounds_checker, false));
+      internal::PodUnion_Data::Validate(raw_buf, &validation_context, false));
   free(raw_buf);
 }
 
 TEST(UnionTest, UnknownExtensibleEnumValueValidation) {
   PodUnionPtr pod(PodUnion::New());
   pod->set_f_extensible_enum(static_cast<AnExtensibleEnum>(0xFFFF));
 
   size_t size =
       mojo::internal::PrepareToSerialize<PodUnionPtr>(pod, false, nullptr);
   EXPECT_EQ(16U, size);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::PodUnion_Data* data = nullptr;
   mojo::internal::Serialize<PodUnionPtr>(pod, &buf, &data, false, nullptr);
 
   void* raw_buf = buf.Leak();
-  mojo::internal::BoundsChecker bounds_checker(data,
-                                               static_cast<uint32_t>(size), 0);
+  mojo::internal::ValidationContext validation_context(
+      data, static_cast<uint32_t>(size), 0);
   EXPECT_TRUE(
-      internal::PodUnion_Data::Validate(raw_buf, &bounds_checker, false));
+      internal::PodUnion_Data::Validate(raw_buf, &validation_context, false));
   free(raw_buf);
 }
 
 TEST(UnionTest, StringGetterSetter) {
   ObjectUnionPtr pod(ObjectUnion::New());
 
   String hello("hello world");
   pod->set_f_string(hello);
   EXPECT_EQ(hello, pod->get_f_string());
   EXPECT_TRUE(pod->is_f_string());
@@ skipping 44 matching lines @@
   EXPECT_TRUE(pod2->is_f_string());
   EXPECT_EQ(pod2->which(), ObjectUnion::Tag::F_STRING);
 }
 
 TEST(UnionTest, NullStringValidation) {
   size_t size = sizeof(internal::ObjectUnion_Data);
   mojo::internal::FixedBufferForTesting buf(size);
   internal::ObjectUnion_Data* data = internal::ObjectUnion_Data::New(&buf);
   data->tag = internal::ObjectUnion_Data::ObjectUnion_Tag::F_STRING;
   data->data.unknown = 0x0;
-  mojo::internal::BoundsChecker bounds_checker(data,
-                                               static_cast<uint32_t>(size), 0);
+  mojo::internal::ValidationContext validation_context(
+      data, static_cast<uint32_t>(size), 0);
   void* raw_buf = buf.Leak();
-  EXPECT_FALSE(
-      internal::ObjectUnion_Data::Validate(raw_buf, &bounds_checker, false));
+  EXPECT_FALSE(internal::ObjectUnion_Data::Validate(
+      raw_buf, &validation_context, false));
   free(raw_buf);
 }
 
 TEST(UnionTest, StringPointerOverflowValidation) {
   size_t size = sizeof(internal::ObjectUnion_Data);
   mojo::internal::FixedBufferForTesting buf(size);
   internal::ObjectUnion_Data* data = internal::ObjectUnion_Data::New(&buf);
   data->tag = internal::ObjectUnion_Data::ObjectUnion_Tag::F_STRING;
   data->data.unknown = 0xFFFFFFFFFFFFFFFF;
-  mojo::internal::BoundsChecker bounds_checker(data,
-                                               static_cast<uint32_t>(size), 0);
+  mojo::internal::ValidationContext validation_context(
+      data, static_cast<uint32_t>(size), 0);
   void* raw_buf = buf.Leak();
-  EXPECT_FALSE(
-      internal::ObjectUnion_Data::Validate(raw_buf, &bounds_checker, false));
+  EXPECT_FALSE(internal::ObjectUnion_Data::Validate(
+      raw_buf, &validation_context, false));
   free(raw_buf);
 }
 
 TEST(UnionTest, StringValidateOOB) {
   size_t size = 32;
   mojo::internal::FixedBufferForTesting buf(size);
   internal::ObjectUnion_Data* data = internal::ObjectUnion_Data::New(&buf);
   data->tag = internal::ObjectUnion_Data::ObjectUnion_Tag::F_STRING;
 
   data->data.f_f_string.offset = 8;
   char* ptr = reinterpret_cast<char*>(&data->data.f_f_string);
   mojo::internal::ArrayHeader* array_header =
       reinterpret_cast<mojo::internal::ArrayHeader*>(ptr + *ptr);
   array_header->num_bytes = 20;  // This should go out of bounds.
   array_header->num_elements = 20;
-  mojo::internal::BoundsChecker bounds_checker(data, 32, 0);
+  mojo::internal::ValidationContext validation_context(data, 32, 0);
   void* raw_buf = buf.Leak();
-  EXPECT_FALSE(
-      internal::ObjectUnion_Data::Validate(raw_buf, &bounds_checker, false));
+  EXPECT_FALSE(internal::ObjectUnion_Data::Validate(
+      raw_buf, &validation_context, false));
   free(raw_buf);
 }
 
 // TODO(azani): Move back in array_unittest.cc when possible.
 // Array tests
 TEST(UnionTest, PodUnionInArray) {
   SmallStructPtr small_struct(SmallStruct::New());
   small_struct->pod_union_array = Array<PodUnionPtr>(2);
   small_struct->pod_union_array[0] = PodUnion::New();
   small_struct->pod_union_array[1] = PodUnion::New();
@@ skipping 84 matching lines @@
   std::vector<char> new_buf;
   new_buf.resize(size);
 
   void* raw_buf = buf.Leak();
   memcpy(new_buf.data(), raw_buf, size);
   free(raw_buf);
 
   data =
       reinterpret_cast<mojo::internal::Array_Data<internal::ObjectUnion_Data>*>(
           new_buf.data());
-  mojo::internal::BoundsChecker bounds_checker(data,
-                                               static_cast<uint32_t>(size), 0);
+  mojo::internal::ValidationContext validation_context(
+      data, static_cast<uint32_t>(size), 0);
   ASSERT_TRUE(mojo::internal::Array_Data<internal::ObjectUnion_Data>::Validate(
-      data, &bounds_checker, &validate_params));
+      data, &validation_context, &validate_params));
 
   data->DecodePointers();
   Array<ObjectUnionPtr> array2;
   mojo::internal::Deserialize<Array<ObjectUnionPtr>>(data, &array2, nullptr);
 
   EXPECT_EQ(2U, array2.size());
 
   EXPECT_EQ(String("hello"), array2[0]->get_f_string());
   EXPECT_EQ(String("world"), array2[1]->get_f_string());
 }
@@ skipping 65 matching lines @@
                                                                    &context);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::SmallStruct_Data* data = nullptr;
   mojo::internal::Serialize<SmallStructPtr>(small_struct, &buf, &data,
                                             &context);
 
   data->EncodePointers();
 
   void* raw_buf = buf.Leak();
-  mojo::internal::BoundsChecker bounds_checker(data,
-                                               static_cast<uint32_t>(size), 0);
-  EXPECT_TRUE(internal::SmallStruct_Data::Validate(raw_buf, &bounds_checker));
+  mojo::internal::ValidationContext validation_context(
+      data, static_cast<uint32_t>(size), 0);
+  EXPECT_TRUE(internal::SmallStruct_Data::Validate(
+      raw_buf, &validation_context));
   free(raw_buf);
 }
 
 // Validation test of a struct union fails due to unknown union tag.
 TEST(UnionTest, Validation_PodUnionInStruct_Failure) {
   SmallStructPtr small_struct(SmallStruct::New());
   small_struct->pod_union = PodUnion::New();
   small_struct->pod_union->set_f_int32(10);
 
   mojo::internal::SerializationContext context;
   size_t size = mojo::internal::PrepareToSerialize<SmallStructPtr>(small_struct,
                                                                    &context);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::SmallStruct_Data* data = nullptr;
   mojo::internal::Serialize<SmallStructPtr>(small_struct, &buf, &data,
                                             &context);
   data->pod_union.tag = static_cast<internal::PodUnion_Data::PodUnion_Tag>(100);
 
   data->EncodePointers();
 
   void* raw_buf = buf.Leak();
-  mojo::internal::BoundsChecker bounds_checker(data,
-                                               static_cast<uint32_t>(size), 0);
-  EXPECT_FALSE(internal::SmallStruct_Data::Validate(raw_buf, &bounds_checker));
+  mojo::internal::ValidationContext validation_context(
+      data, static_cast<uint32_t>(size), 0);
+  EXPECT_FALSE(internal::SmallStruct_Data::Validate(
+      raw_buf, &validation_context));
   free(raw_buf);
 }
 
 // Validation fails due to non-nullable null union in struct.
 TEST(UnionTest, Validation_NullUnion_Failure) {
   SmallStructNonNullableUnionPtr small_struct(
       SmallStructNonNullableUnion::New());
 
   size_t size =
       mojo::internal::PrepareToSerialize<SmallStructNonNullableUnionPtr>(
           small_struct, nullptr);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::SmallStructNonNullableUnion_Data* data =
       internal::SmallStructNonNullableUnion_Data::New(&buf);
 
   void* raw_buf = buf.Leak();
-  mojo::internal::BoundsChecker bounds_checker(data,
-                                               static_cast<uint32_t>(size), 0);
+  mojo::internal::ValidationContext validation_context(
+      data, static_cast<uint32_t>(size), 0);
   EXPECT_FALSE(internal::SmallStructNonNullableUnion_Data::Validate(
-      raw_buf, &bounds_checker));
+      raw_buf, &validation_context));
   free(raw_buf);
 }
 
 // Validation passes with nullable null union.
 TEST(UnionTest, Validation_NullableUnion) {
   SmallStructPtr small_struct(SmallStruct::New());
 
   mojo::internal::SerializationContext context;
   size_t size = mojo::internal::PrepareToSerialize<SmallStructPtr>(small_struct,
                                                                    &context);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::SmallStruct_Data* data = nullptr;
   mojo::internal::Serialize<SmallStructPtr>(small_struct, &buf, &data,
                                             &context);
 
   data->EncodePointers();
 
   void* raw_buf = buf.Leak();
-  mojo::internal::BoundsChecker bounds_checker(data,
-                                               static_cast<uint32_t>(size), 0);
-  EXPECT_TRUE(internal::SmallStruct_Data::Validate(raw_buf, &bounds_checker));
+  mojo::internal::ValidationContext validation_context(
+      data, static_cast<uint32_t>(size), 0);
+  EXPECT_TRUE(internal::SmallStruct_Data::Validate(
+      raw_buf, &validation_context));
   free(raw_buf);
 }
 
 // TODO(azani): Move back in map_unittest.cc when possible.
 // Map Tests
 TEST(UnionTest, PodUnionInMap) {
   SmallStructPtr small_struct(SmallStruct::New());
   small_struct->pod_union_map = Map<String, PodUnionPtr>();
   small_struct->pod_union_map.insert("one", PodUnion::New());
   small_struct->pod_union_map.insert("two", PodUnion::New());
@@ skipping 105 matching lines @@
   size_t size =
       mojo::internal::PrepareToSerialize<ObjectUnionPtr>(obj, false, nullptr);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::ObjectUnion_Data* data = nullptr;
   mojo::internal::Serialize<ObjectUnionPtr>(obj, &buf, &data, false, nullptr);
 
   data->EncodePointers();
 
   void* raw_buf = buf.Leak();
-  mojo::internal::BoundsChecker bounds_checker(data,
-                                               static_cast<uint32_t>(size), 0);
-  EXPECT_TRUE(
-      internal::ObjectUnion_Data::Validate(raw_buf, &bounds_checker, false));
+  mojo::internal::ValidationContext validation_context(
+      data, static_cast<uint32_t>(size), 0);
+  EXPECT_TRUE(internal::ObjectUnion_Data::Validate(
+      raw_buf, &validation_context, false));
   free(raw_buf);
 }
 
 TEST(UnionTest, StructInUnionValidationNonNullable) {
   DummyStructPtr dummy(nullptr);
 
   ObjectUnionPtr obj(ObjectUnion::New());
   obj->set_f_dummy(std::move(dummy));
 
   size_t size =
       mojo::internal::PrepareToSerialize<ObjectUnionPtr>(obj, false, nullptr);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::ObjectUnion_Data* data = nullptr;
   mojo::internal::Serialize<ObjectUnionPtr>(obj, &buf, &data, false, nullptr);
 
   data->EncodePointers();
 
   void* raw_buf = buf.Leak();
-  mojo::internal::BoundsChecker bounds_checker(data,
-                                               static_cast<uint32_t>(size), 0);
-  EXPECT_FALSE(
-      internal::ObjectUnion_Data::Validate(raw_buf, &bounds_checker, false));
+  mojo::internal::ValidationContext validation_context(
+      data, static_cast<uint32_t>(size), 0);
+  EXPECT_FALSE(internal::ObjectUnion_Data::Validate(
+      raw_buf, &validation_context, false));
   free(raw_buf);
 }
 
 TEST(UnionTest, StructInUnionValidationNullable) {
   DummyStructPtr dummy(nullptr);
 
   ObjectUnionPtr obj(ObjectUnion::New());
   obj->set_f_nullable(std::move(dummy));
 
   size_t size =
       mojo::internal::PrepareToSerialize<ObjectUnionPtr>(obj, false, nullptr);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::ObjectUnion_Data* data = nullptr;
   mojo::internal::Serialize<ObjectUnionPtr>(obj, &buf, &data, false, nullptr);
 
   data->EncodePointers();
 
   void* raw_buf = buf.Leak();
-  mojo::internal::BoundsChecker bounds_checker(data,
-                                               static_cast<uint32_t>(size), 0);
-  EXPECT_TRUE(
-      internal::ObjectUnion_Data::Validate(raw_buf, &bounds_checker, false));
+  mojo::internal::ValidationContext validation_context(
+      data, static_cast<uint32_t>(size), 0);
+  EXPECT_TRUE(internal::ObjectUnion_Data::Validate(
+      raw_buf, &validation_context, false));
   free(raw_buf);
 }
 
 TEST(UnionTest, ArrayInUnionGetterSetter) {
   Array<int8_t> array(2);
   array[0] = 8;
   array[1] = 9;
 
   ObjectUnionPtr obj(ObjectUnion::New());
   obj->set_f_array_int8(std::move(array));
@@ skipping 38 matching lines @@
 
   size_t size =
       mojo::internal::PrepareToSerialize<ObjectUnionPtr>(obj, false, nullptr);
   mojo::internal::FixedBufferForTesting buf(size);
   internal::ObjectUnion_Data* data = nullptr;
   mojo::internal::Serialize<ObjectUnionPtr>(obj, &buf, &data, false, nullptr);
 
   data->EncodePointers();
 
   void* raw_buf = buf.Leak();
-  mojo::internal::BoundsChecker bounds_checker(data,
-                                               static_cast<uint32_t>(size), 0);
+  mojo::internal::ValidationContext validation_context(
+      data, static_cast<uint32_t>(size), 0);
 
-  EXPECT_TRUE(
-      internal::ObjectUnion_Data::Validate(raw_buf, &bounds_checker, false));
+  EXPECT_TRUE(internal::ObjectUnion_Data::Validate(
+      raw_buf, &validation_context, false));
   free(raw_buf);
 }
 
 TEST(UnionTest, MapInUnionGetterSetter) {
   Map<String, int8_t> map;
   map.insert("one", 1);
   map.insert("two", 2);
 
   ObjectUnionPtr obj(ObjectUnion::New());
   obj->set_f_map_int8(std::move(map));
@@ skipping 42 matching lines @@
       mojo::internal::PrepareToSerialize<ObjectUnionPtr>(obj, false, &context);
   EXPECT_EQ(112U, size);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::ObjectUnion_Data* data = nullptr;
   mojo::internal::Serialize<ObjectUnionPtr>(obj, &buf, &data, false, &context);
 
   data->EncodePointers();
 
   void* raw_buf = buf.Leak();
-  mojo::internal::BoundsChecker bounds_checker(data,
-                                               static_cast<uint32_t>(size), 0);
+  mojo::internal::ValidationContext validation_context(
+      data, static_cast<uint32_t>(size), 0);
 
-  EXPECT_TRUE(
-      internal::ObjectUnion_Data::Validate(raw_buf, &bounds_checker, false));
+  EXPECT_TRUE(internal::ObjectUnion_Data::Validate(
+      raw_buf, &validation_context, false));
   free(raw_buf);
 }
 
 TEST(UnionTest, UnionInUnionGetterSetter) {
   PodUnionPtr pod(PodUnion::New());
   pod->set_f_int8(10);
 
   ObjectUnionPtr obj(ObjectUnion::New());
   obj->set_f_pod_union(std::move(pod));
 
@@ skipping 34 matching lines @@
       mojo::internal::PrepareToSerialize<ObjectUnionPtr>(obj, false, nullptr);
   EXPECT_EQ(32U, size);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::ObjectUnion_Data* data = nullptr;
   mojo::internal::Serialize<ObjectUnionPtr>(obj, &buf, &data, false, nullptr);
 
   data->EncodePointers();
 
   void* raw_buf = buf.Leak();
-  mojo::internal::BoundsChecker bounds_checker(data,
-                                               static_cast<uint32_t>(size), 0);
-  EXPECT_TRUE(
-      internal::ObjectUnion_Data::Validate(raw_buf, &bounds_checker, false));
+  mojo::internal::ValidationContext validation_context(
+      data, static_cast<uint32_t>(size), 0);
+  EXPECT_TRUE(internal::ObjectUnion_Data::Validate(
+      raw_buf, &validation_context, false));
   free(raw_buf);
 }
 
 TEST(UnionTest, UnionInUnionValidationNonNullable) {
   PodUnionPtr pod(nullptr);
 
   ObjectUnionPtr obj(ObjectUnion::New());
   obj->set_f_pod_union(std::move(pod));
 
   size_t size =
       mojo::internal::PrepareToSerialize<ObjectUnionPtr>(obj, false, nullptr);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::ObjectUnion_Data* data = nullptr;
   mojo::internal::Serialize<ObjectUnionPtr>(obj, &buf, &data, false, nullptr);
   data->EncodePointers();
 
   void* raw_buf = buf.Leak();
-  mojo::internal::BoundsChecker bounds_checker(data,
-                                               static_cast<uint32_t>(size), 0);
-  EXPECT_FALSE(
-      internal::ObjectUnion_Data::Validate(raw_buf, &bounds_checker, false));
+  mojo::internal::ValidationContext validation_context(
+      data, static_cast<uint32_t>(size), 0);
+  EXPECT_FALSE(internal::ObjectUnion_Data::Validate(
+      raw_buf, &validation_context, false));
   free(raw_buf);
 }
 
 TEST(UnionTest, HandleInUnionGetterSetter) {
   ScopedMessagePipeHandle pipe0;
   ScopedMessagePipeHandle pipe1;
 
   CreateMessagePipe(nullptr, &pipe0, &pipe1);
 
   HandleUnionPtr handle(HandleUnion::New());
@@ skipping 53 matching lines @@
   size_t size = mojo::internal::PrepareToSerialize<HandleUnionPtr>(
       handle, false, &context);
   EXPECT_EQ(16U, size);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::HandleUnion_Data* data = nullptr;
   mojo::internal::Serialize<HandleUnionPtr>(handle, &buf, &data, false,
                                             &context);
 
   void* raw_buf = buf.Leak();
-  mojo::internal::BoundsChecker bounds_checker(data,
-                                               static_cast<uint32_t>(size), 1);
-  EXPECT_TRUE(
-      internal::HandleUnion_Data::Validate(raw_buf, &bounds_checker, false));
+  mojo::internal::ValidationContext validation_context(
+      data, static_cast<uint32_t>(size), 1);
+  EXPECT_TRUE(internal::HandleUnion_Data::Validate(
+      raw_buf, &validation_context, false));
   free(raw_buf);
 }
 
 TEST(UnionTest, HandleInUnionValidationNull) {
   ScopedMessagePipeHandle pipe;
   HandleUnionPtr handle(HandleUnion::New());
   handle->set_f_message_pipe(std::move(pipe));
 
   mojo::internal::SerializationContext context;
   size_t size = mojo::internal::PrepareToSerialize<HandleUnionPtr>(
       handle, false, &context);
   EXPECT_EQ(16U, size);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::HandleUnion_Data* data = nullptr;
   mojo::internal::Serialize<HandleUnionPtr>(handle, &buf, &data, false,
                                             &context);
 
   void* raw_buf = buf.Leak();
-  mojo::internal::BoundsChecker bounds_checker(data,
-                                               static_cast<uint32_t>(size), 1);
-  EXPECT_FALSE(
-      internal::HandleUnion_Data::Validate(raw_buf, &bounds_checker, false));
+  mojo::internal::ValidationContext validation_context(
+      data, static_cast<uint32_t>(size), 1);
+  EXPECT_FALSE(internal::HandleUnion_Data::Validate(
+      raw_buf, &validation_context, false));
   free(raw_buf);
 }
 
 class SmallCacheImpl : public SmallCache {
  public:
   explicit SmallCacheImpl(const base::Closure& closure)
       : int_value_(0), closure_(closure) {}
   ~SmallCacheImpl() override {}
   int64_t int_value() const { return int_value_; }
 
@@ skipping 73 matching lines @@
   PodUnionPtr pod(PodUnion::New());
   pod->set_f_int16(16);
 
   ptr->Echo(std::move(pod),
             [](PodUnionPtr out) { EXPECT_EQ(16, out->get_f_int16()); });
   run_loop.RunUntilIdle();
 }
 
 }  // namespace test
 }  // namespace mojo