| Index: mojo/public/cpp/bindings/lib/array_serialization.h
|
| diff --git a/mojo/public/cpp/bindings/lib/array_serialization.h b/mojo/public/cpp/bindings/lib/array_serialization.h
|
| index 492de788b4530f4997101b8772cd864958e1845b..2c399c897abd3dfb33d5aa8fe124faf7d50e8ad3 100644
|
| --- a/mojo/public/cpp/bindings/lib/array_serialization.h
|
| +++ b/mojo/public/cpp/bindings/lib/array_serialization.h
|
| @@ -102,8 +102,7 @@ template <typename H> struct ArraySerializer<ScopedHandleBase<H>, H, true> {
|
| for (size_t i = 0; i < input.size(); ++i) {
|
| output->at(i) = input[i].release(); // Transfer ownership of the handle.
|
| MOJO_INTERNAL_DLOG_SERIALIZATION_WARNING(
|
| - IsNonNullableValidationEnabled() && !element_is_nullable &&
|
| - !output->at(i).is_valid(),
|
| + !element_is_nullable && !output->at(i).is_valid(),
|
| VALIDATION_ERROR_UNEXPECTED_INVALID_HANDLE);
|
| }
|
| }
|
| @@ -134,7 +133,7 @@ template <typename S> struct ArraySerializer<S, typename S::Data_*, true> {
|
| input[i].Pass(), buf, &element);
|
| output->at(i) = element;
|
| MOJO_INTERNAL_DLOG_SERIALIZATION_WARNING(
|
| - IsNonNullableValidationEnabled() && !element_is_nullable && !element,
|
| + !element_is_nullable && !element,
|
| VALIDATION_ERROR_UNEXPECTED_NULL_POINTER);
|
| }
|
| }
|
| @@ -193,7 +192,7 @@ template <> struct ArraySerializer<String, String_Data*, false> {
|
| Serialize_(input[i], buf, &element);
|
| output->at(i) = element;
|
| MOJO_INTERNAL_DLOG_SERIALIZATION_WARNING(
|
| - IsNonNullableValidationEnabled() && !element_is_nullable && !element,
|
| + !element_is_nullable && !element,
|
| VALIDATION_ERROR_UNEXPECTED_NULL_POINTER);
|
| }
|
| }
|
|
|