C++ Bindings: Remove 'inline' arg from generated union serialization functions.

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 <utility>
 #include <vector>
 
 #include "mojo/public/cpp/bindings/array.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/bindings/lib/array_internal.h"
@@ skipping 102 matching lines @@
   PodUnionPtr pod_clone = pod.Clone();
   EXPECT_EQ(10, pod_clone->get_f_int8());
   EXPECT_TRUE(pod_clone->is_f_int8());
   EXPECT_EQ(pod_clone->which(), PodUnion::Tag::F_INT8);
 }
 
 TEST(UnionTest, PodSerialization) {
   PodUnionPtr pod1(PodUnion::New());
   pod1->set_f_int8(10);
 
-  size_t size = GetSerializedSize_(pod1, false);
+  size_t size = GetSerializedSize_(pod1);
   EXPECT_EQ(16U, size);
 
   mojo::internal::FixedBufferForTesting buf(size);
-  internal::PodUnion_Data* data = nullptr;
-  SerializeUnion_(pod1.get(), &buf, &data, false);
+  auto* data = internal::PodUnion_Data::New(&buf);
+  SerializeUnion_(pod1.get(), &buf, &data);
 
   PodUnionPtr pod2(PodUnion::New());
   Deserialize_(data, pod2.get());
 
   EXPECT_EQ(10, pod2->get_f_int8());
   EXPECT_TRUE(pod2->is_f_int8());
   EXPECT_EQ(pod2->which(), PodUnion::Tag::F_INT8);
 }
 
 TEST(UnionTest, EnumSerialization) {
   PodUnionPtr pod1(PodUnion::New());
   pod1->set_f_enum(AnEnum::SECOND);
 
-  size_t size = GetSerializedSize_(pod1, false);
+  size_t size = GetSerializedSize_(pod1);
   EXPECT_EQ(16U, size);
 
   mojo::internal::FixedBufferForTesting buf(size);
-  internal::PodUnion_Data* data = nullptr;
-  SerializeUnion_(pod1.get(), &buf, &data, false);
+  auto* data = internal::PodUnion_Data::New(&buf);
+  SerializeUnion_(pod1.get(), &buf, &data);
 
   PodUnionPtr pod2 = PodUnion::New();
   Deserialize_(data, pod2.get());
 
   EXPECT_EQ(AnEnum::SECOND, pod2->get_f_enum());
   EXPECT_TRUE(pod2->is_f_enum());
   EXPECT_EQ(pod2->which(), PodUnion::Tag::F_ENUM);
 }
 
 TEST(UnionTest, PodValidation) {
   PodUnionPtr pod(PodUnion::New());
   pod->set_f_int8(10);
 
-  size_t size = GetSerializedSize_(pod, false);
+  size_t size = GetSerializedSize_(pod);
   EXPECT_EQ(16U, size);
 
   mojo::internal::FixedBufferForTesting buf(size);
-  internal::PodUnion_Data* data = nullptr;
-  SerializeUnion_(pod.get(), &buf, &data, false);
+  auto* data = internal::PodUnion_Data::New(&buf);
+  SerializeUnion_(pod.get(), &buf, &data);
   std::vector<Handle> handles;
   data->EncodePointersAndHandles(&handles);
   EXPECT_TRUE(handles.empty());
 
   void* raw_buf = buf.Leak();
   mojo::internal::BoundsChecker bounds_checker(data,
                                                static_cast<uint32_t>(size), 0);
   EXPECT_EQ(mojo::internal::ValidationError::NONE,
             internal::PodUnion_Data::Validate(raw_buf, &bounds_checker, false,
                                               nullptr));
   free(raw_buf);
 }
 
 TEST(UnionTest, SerializeNotNull) {
   PodUnionPtr pod(PodUnion::New());
   pod->set_f_int8(0);
-  size_t size = GetSerializedSize_(pod, false);
+  size_t size = GetSerializedSize_(pod);
   mojo::internal::FixedBufferForTesting buf(size);
-  internal::PodUnion_Data* data = nullptr;
-  SerializeUnion_(pod.get(), &buf, &data, false);
+  auto* data = internal::PodUnion_Data::New(&buf);
+  SerializeUnion_(pod.get(), &buf, &data);
   EXPECT_FALSE(data->is_null());
 }
 
-TEST(UnionTest, SerializeIsNullInlined) {
+TEST(UnionTest, SerializeIsNull) {
   PodUnionPtr pod;
-  size_t size = GetSerializedSize_(pod, false);
+  size_t size = GetSerializedSize_(pod);
   EXPECT_EQ(16U, size);
   mojo::internal::FixedBufferForTesting buf(size);
   internal::PodUnion_Data* data = internal::PodUnion_Data::New(&buf);
 
   // Check that dirty output buffers are handled correctly by serialization.
   data->size = 16U;
   data->tag = PodUnion::Tag::F_UINT16;
   data->data.f_f_int16 = 20;
 
-  SerializeUnion_(pod.get(), &buf, &data, true);
+  SerializeUnion_(pod.get(), &buf, &data);
   EXPECT_TRUE(data->is_null());
 
   PodUnionPtr pod2 = PodUnion::New();
   Deserialize_(data, pod2.get());
   EXPECT_EQ(pod2->which(), PodUnion::Tag::__UNKNOWN__);
-}
 
-TEST(UnionTest, SerializeIsNullNotInlined) {
-  PodUnionPtr pod;
-  size_t size = GetSerializedSize_(pod, false);
-  EXPECT_EQ(16U, size);
-  mojo::internal::FixedBufferForTesting buf(size);
-  internal::PodUnion_Data* data = nullptr;
-  SerializeUnion_(pod.get(), &buf, &data, false);
-  EXPECT_EQ(nullptr, data);
+  {
+    PodUnionPtr pod;
+    size_t size = GetSerializedSize_(pod);
+    EXPECT_EQ(16U, size);
+    mojo::internal::FixedBufferForTesting buf(size);
+    auto* data = internal::PodUnion_Data::New(&buf);
+    SerializeUnion_(pod.get(), &buf, &data);
+    EXPECT_EQ(static_cast<internal::PodUnion_Data::PodUnion_Tag>(0), data->tag);
+    EXPECT_EQ(0u, data->size);
+    EXPECT_EQ(0u, data->data.unknown);
+  }
 }
 
 TEST(UnionTest, NullValidation) {
   void* buf = nullptr;
   mojo::internal::BoundsChecker bounds_checker(buf, 0, 0);
   EXPECT_EQ(
       mojo::internal::ValidationError::NONE,
       internal::PodUnion_Data::Validate(buf, &bounds_checker, false, nullptr));
 }
 
@@ skipping 91 matching lines @@
   EXPECT_TRUE(pod_clone->is_f_string());
   EXPECT_EQ(pod_clone->which(), ObjectUnion::Tag::F_STRING);
 }
 
 TEST(UnionTest, StringSerialization) {
   ObjectUnionPtr pod1(ObjectUnion::New());
 
   String hello("hello world");
   pod1->set_f_string(hello);
 
-  size_t size = GetSerializedSize_(pod1, false);
+  size_t size = GetSerializedSize_(pod1);
   mojo::internal::FixedBufferForTesting buf(size);
-  internal::ObjectUnion_Data* data = nullptr;
-  SerializeUnion_(pod1.get(), &buf, &data, false);
+  auto* data = internal::ObjectUnion_Data::New(&buf);
+  SerializeUnion_(pod1.get(), &buf, &data);
 
   std::vector<Handle> handles;
   data->EncodePointersAndHandles(&handles);
   data->DecodePointersAndHandles(&handles);
 
   ObjectUnionPtr pod2 = ObjectUnion::New();
   Deserialize_(data, pod2.get());
   EXPECT_EQ(hello, pod2->get_f_string());
   EXPECT_TRUE(pod2->is_f_string());
   EXPECT_EQ(pod2->which(), ObjectUnion::Tag::F_STRING);
@@ skipping 425 matching lines @@
 }
 
 TEST(UnionTest, StructInUnionSerialization) {
   Environment environment;
   DummyStructPtr dummy(DummyStruct::New());
   dummy->f_int8 = 8;
 
   ObjectUnionPtr obj(ObjectUnion::New());
   obj->set_f_dummy(dummy.Pass());
 
-  size_t size = GetSerializedSize_(obj, false);
+  size_t size = GetSerializedSize_(obj);
   EXPECT_EQ(32U, size);
 
   mojo::internal::FixedBufferForTesting buf(size);
-  internal::ObjectUnion_Data* data = nullptr;
-  SerializeUnion_(obj.get(), &buf, &data, false);
+  auto* data = internal::ObjectUnion_Data::New(&buf);
+  SerializeUnion_(obj.get(), &buf, &data);
 
   std::vector<Handle> handles;
   data->EncodePointersAndHandles(&handles);
   data->DecodePointersAndHandles(&handles);
 
   ObjectUnionPtr obj2 = ObjectUnion::New();
   Deserialize_(data, obj2.get());
   EXPECT_EQ(8, obj2->get_f_dummy()->f_int8);
 }
 
 TEST(UnionTest, StructInUnionValidation) {
   Environment environment;
   DummyStructPtr dummy(DummyStruct::New());
   dummy->f_int8 = 8;
 
   ObjectUnionPtr obj(ObjectUnion::New());
   obj->set_f_dummy(dummy.Pass());
 
-  size_t size = GetSerializedSize_(obj, false);
+  size_t size = GetSerializedSize_(obj);
 
   mojo::internal::FixedBufferForTesting buf(size);
-  internal::ObjectUnion_Data* data = nullptr;
-  SerializeUnion_(obj.get(), &buf, &data, false);
+  auto* data = internal::ObjectUnion_Data::New(&buf);
+  SerializeUnion_(obj.get(), &buf, &data);
 
   std::vector<Handle> handles;
   data->EncodePointersAndHandles(&handles);
   EXPECT_TRUE(handles.empty());
 
   void* raw_buf = buf.Leak();
   mojo::internal::BoundsChecker bounds_checker(data,
                                                static_cast<uint32_t>(size), 0);
   EXPECT_EQ(mojo::internal::ValidationError::NONE,
             internal::ObjectUnion_Data::Validate(raw_buf, &bounds_checker,
                                                  false, nullptr));
   free(raw_buf);
 }
 
 TEST(UnionTest, StructInUnionValidationNonNullable) {
   Environment environment;
   DummyStructPtr dummy(nullptr);
 
   ObjectUnionPtr obj(ObjectUnion::New());
   obj->set_f_dummy(dummy.Pass());
 
-  size_t size = GetSerializedSize_(obj, false);
+  size_t size = GetSerializedSize_(obj);
 
   mojo::internal::FixedBufferForTesting buf(size);
-  internal::ObjectUnion_Data* data = nullptr;
-  SerializeUnion_(obj.get(), &buf, &data, false);
+  auto* data = internal::ObjectUnion_Data::New(&buf);
+  SerializeUnion_(obj.get(), &buf, &data);
 
   std::vector<Handle> handles;
   data->EncodePointersAndHandles(&handles);
   EXPECT_TRUE(handles.empty());
 
   void* raw_buf = buf.Leak();
   mojo::internal::BoundsChecker bounds_checker(data,
                                                static_cast<uint32_t>(size), 0);
   EXPECT_NE(mojo::internal::ValidationError::NONE,
             internal::ObjectUnion_Data::Validate(raw_buf, &bounds_checker,
                                                  false, nullptr));
   free(raw_buf);
 }
 
 TEST(UnionTest, StructInUnionValidationNullable) {
   Environment environment;
   DummyStructPtr dummy(nullptr);
 
   ObjectUnionPtr obj(ObjectUnion::New());
   obj->set_f_nullable(dummy.Pass());
 
-  size_t size = GetSerializedSize_(obj, false);
+  size_t size = GetSerializedSize_(obj);
 
   mojo::internal::FixedBufferForTesting buf(size);
-  internal::ObjectUnion_Data* data = nullptr;
-  SerializeUnion_(obj.get(), &buf, &data, false);
+  auto* data = internal::ObjectUnion_Data::New(&buf);
+  SerializeUnion_(obj.get(), &buf, &data);
 
   std::vector<Handle> handles;
   data->EncodePointersAndHandles(&handles);
   EXPECT_TRUE(handles.empty());
 
   void* raw_buf = buf.Leak();
   mojo::internal::BoundsChecker bounds_checker(data,
                                                static_cast<uint32_t>(size), 0);
   EXPECT_EQ(mojo::internal::ValidationError::NONE,
             internal::ObjectUnion_Data::Validate(raw_buf, &bounds_checker,
@@ skipping 18 matching lines @@
 TEST(UnionTest, ArrayInUnionSerialization) {
   Environment environment;
 
   auto array = Array<int8_t>::New(2);
   array[0] = 8;
   array[1] = 9;
 
   ObjectUnionPtr obj(ObjectUnion::New());
   obj->set_f_array_int8(array.Pass());
 
-  size_t size = GetSerializedSize_(obj, false);
+  size_t size = GetSerializedSize_(obj);
   EXPECT_EQ(32U, size);
 
   mojo::internal::FixedBufferForTesting buf(size);
-  internal::ObjectUnion_Data* data = nullptr;
-  SerializeUnion_(obj.get(), &buf, &data, false);
+  auto* data = internal::ObjectUnion_Data::New(&buf);
+  SerializeUnion_(obj.get(), &buf, &data);
 
   std::vector<Handle> handles;
   data->EncodePointersAndHandles(&handles);
   data->DecodePointersAndHandles(&handles);
 
   ObjectUnionPtr obj2 = ObjectUnion::New();
   Deserialize_(data, obj2.get());
 
   EXPECT_EQ(8, obj2->get_f_array_int8()[0]);
   EXPECT_EQ(9, obj2->get_f_array_int8()[1]);
 }
 
 TEST(UnionTest, ArrayInUnionValidation) {
   Environment environment;
 
   auto array = Array<int8_t>::New(2);
   array[0] = 8;
   array[1] = 9;
 
   ObjectUnionPtr obj(ObjectUnion::New());
   obj->set_f_array_int8(array.Pass());
 
-  size_t size = GetSerializedSize_(obj, false);
+  size_t size = GetSerializedSize_(obj);
   mojo::internal::FixedBufferForTesting buf(size);
-  internal::ObjectUnion_Data* data = nullptr;
-  SerializeUnion_(obj.get(), &buf, &data, false);
+  auto* data = internal::ObjectUnion_Data::New(&buf);
+  SerializeUnion_(obj.get(), &buf, &data);
 
   std::vector<Handle> handles;
   data->EncodePointersAndHandles(&handles);
   EXPECT_TRUE(handles.empty());
 
   void* raw_buf = buf.Leak();
   mojo::internal::BoundsChecker bounds_checker(data,
                                                static_cast<uint32_t>(size), 0);
 
   EXPECT_EQ(mojo::internal::ValidationError::NONE,
@@ skipping 17 matching lines @@
 
 TEST(UnionTest, MapInUnionSerialization) {
   Environment environment;
   Map<String, int8_t> map;
   map.insert("one", 1);
   map.insert("two", 2);
 
   ObjectUnionPtr obj(ObjectUnion::New());
   obj->set_f_map_int8(map.Pass());
 
-  size_t size = GetSerializedSize_(obj, false);
+  size_t size = GetSerializedSize_(obj);
   EXPECT_EQ(112U, size);
 
   mojo::internal::FixedBufferForTesting buf(size);
-  internal::ObjectUnion_Data* data = nullptr;
-  SerializeUnion_(obj.get(), &buf, &data, false);
+  auto* data = internal::ObjectUnion_Data::New(&buf);
+  SerializeUnion_(obj.get(), &buf, &data);
 
   std::vector<Handle> handles;
   data->EncodePointersAndHandles(&handles);
   data->DecodePointersAndHandles(&handles);
 
   ObjectUnionPtr obj2 = ObjectUnion::New();
   Deserialize_(data, obj2.get());
 
   EXPECT_EQ(1, obj2->get_f_map_int8()["one"]);
   EXPECT_EQ(2, obj2->get_f_map_int8()["two"]);
 }
 
 TEST(UnionTest, MapInUnionValidation) {
   Environment environment;
   Map<String, int8_t> map;
   map.insert("one", 1);
   map.insert("two", 2);
 
   ObjectUnionPtr obj(ObjectUnion::New());
   obj->set_f_map_int8(map.Pass());
 
-  size_t size = GetSerializedSize_(obj, false);
+  size_t size = GetSerializedSize_(obj);
   EXPECT_EQ(112U, size);
 
   mojo::internal::FixedBufferForTesting buf(size);
-  internal::ObjectUnion_Data* data = nullptr;
-  SerializeUnion_(obj.get(), &buf, &data, false);
+  auto* data = internal::ObjectUnion_Data::New(&buf);
+  SerializeUnion_(obj.get(), &buf, &data);
 
   std::vector<Handle> handles;
   data->EncodePointersAndHandles(&handles);
   EXPECT_TRUE(handles.empty());
 
   void* raw_buf = buf.Leak();
   mojo::internal::BoundsChecker bounds_checker(data,
                                                static_cast<uint32_t>(size), 0);
 
   EXPECT_EQ(mojo::internal::ValidationError::NONE,
@@ skipping 13 matching lines @@
 }
 
 TEST(UnionTest, UnionInUnionSerialization) {
   Environment environment;
   PodUnionPtr pod(PodUnion::New());
   pod->set_f_int8(10);
 
   ObjectUnionPtr obj(ObjectUnion::New());
   obj->set_f_pod_union(pod.Pass());
 
-  size_t size = GetSerializedSize_(obj, false);
+  size_t size = GetSerializedSize_(obj);
   EXPECT_EQ(32U, size);
 
   mojo::internal::FixedBufferForTesting buf(size);
-  internal::ObjectUnion_Data* data = nullptr;
-  SerializeUnion_(obj.get(), &buf, &data, false);
+  auto* data = internal::ObjectUnion_Data::New(&buf);
+  SerializeUnion_(obj.get(), &buf, &data);
 
   std::vector<Handle> handles;
   data->EncodePointersAndHandles(&handles);
   data->DecodePointersAndHandles(&handles);
 
   ObjectUnionPtr obj2 = ObjectUnion::New();
   Deserialize_(data, obj2.get());
   EXPECT_EQ(10, obj2->get_f_pod_union()->get_f_int8());
 }
 
 TEST(UnionTest, UnionInUnionValidation) {
   Environment environment;
   PodUnionPtr pod(PodUnion::New());
   pod->set_f_int8(10);
 
   ObjectUnionPtr obj(ObjectUnion::New());
   obj->set_f_pod_union(pod.Pass());
 
-  size_t size = GetSerializedSize_(obj, false);
+  size_t size = GetSerializedSize_(obj);
   EXPECT_EQ(32U, size);
 
   mojo::internal::FixedBufferForTesting buf(size);
-  internal::ObjectUnion_Data* data = nullptr;
-  SerializeUnion_(obj.get(), &buf, &data, false);
+  auto* data = internal::ObjectUnion_Data::New(&buf);
+  SerializeUnion_(obj.get(), &buf, &data);
 
   std::vector<Handle> handles;
   data->EncodePointersAndHandles(&handles);
 
   void* raw_buf = buf.Leak();
   mojo::internal::BoundsChecker bounds_checker(data,
                                                static_cast<uint32_t>(size), 0);
   EXPECT_EQ(mojo::internal::ValidationError::NONE,
             internal::ObjectUnion_Data::Validate(raw_buf, &bounds_checker,
                                                  false, nullptr));
   free(raw_buf);
 }
 
 TEST(UnionTest, UnionInUnionValidationNonNullable) {
   Environment environment;
   PodUnionPtr pod(nullptr);
 
   ObjectUnionPtr obj(ObjectUnion::New());
   obj->set_f_pod_union(pod.Pass());
 
-  size_t size = GetSerializedSize_(obj, false);
+  size_t size = GetSerializedSize_(obj);
 
   mojo::internal::FixedBufferForTesting buf(size);
-  internal::ObjectUnion_Data* data = nullptr;
-  SerializeUnion_(obj.get(), &buf, &data, false);
+  auto* data = internal::ObjectUnion_Data::New(&buf);
+  SerializeUnion_(obj.get(), &buf, &data);
   std::vector<Handle> handles;
   data->EncodePointersAndHandles(&handles);
 
   void* raw_buf = buf.Leak();
   mojo::internal::BoundsChecker bounds_checker(data,
                                                static_cast<uint32_t>(size), 0);
   EXPECT_NE(mojo::internal::ValidationError::NONE,
             internal::ObjectUnion_Data::Validate(raw_buf, &bounds_checker,
                                                  false, nullptr));
   free(raw_buf);
@@ skipping 19 matching lines @@
 
 TEST(UnionTest, HandleInUnionSerialization) {
   ScopedMessagePipeHandle pipe0;
   ScopedMessagePipeHandle pipe1;
 
   CreateMessagePipe(nullptr, &pipe0, &pipe1);
 
   HandleUnionPtr handle(HandleUnion::New());
   handle->set_f_message_pipe(pipe1.Pass());
 
-  size_t size = GetSerializedSize_(handle, false);
+  size_t size = GetSerializedSize_(handle);
   EXPECT_EQ(16U, size);
 
   mojo::internal::FixedBufferForTesting buf(size);
-  internal::HandleUnion_Data* data = nullptr;
-  SerializeUnion_(handle.get(), &buf, &data, false);
+  auto* data = internal::HandleUnion_Data::New(&buf);
+  SerializeUnion_(handle.get(), &buf, &data);
 
   std::vector<Handle> handles;
   data->EncodePointersAndHandles(&handles);
   EXPECT_EQ(1U, handles.size());
   data->DecodePointersAndHandles(&handles);
 
   HandleUnionPtr handle2(HandleUnion::New());
   Deserialize_(data, handle2.get());
 
   std::string golden("hello world");
   WriteTextMessage(pipe0.get(), golden);
 
   std::string actual;
   ReadTextMessage(handle2->get_f_message_pipe().get(), &actual);
 
   EXPECT_EQ(golden, actual);
 }
 
 TEST(UnionTest, HandleInUnionValidation) {
   Environment environment;
   ScopedMessagePipeHandle pipe0;
   ScopedMessagePipeHandle pipe1;
 
   CreateMessagePipe(nullptr, &pipe0, &pipe1);
 
   HandleUnionPtr handle(HandleUnion::New());
   handle->set_f_message_pipe(pipe1.Pass());
 
-  size_t size = GetSerializedSize_(handle, false);
+  size_t size = GetSerializedSize_(handle);
   EXPECT_EQ(16U, size);
 
   mojo::internal::FixedBufferForTesting buf(size);
-  internal::HandleUnion_Data* data = nullptr;
-  SerializeUnion_(handle.get(), &buf, &data, false);
+  auto* data = internal::HandleUnion_Data::New(&buf);
+  SerializeUnion_(handle.get(), &buf, &data);
 
   std::vector<Handle> handles;
   data->EncodePointersAndHandles(&handles);
 
   void* raw_buf = buf.Leak();
   mojo::internal::BoundsChecker bounds_checker(data,
                                                static_cast<uint32_t>(size), 1);
   EXPECT_EQ(mojo::internal::ValidationError::NONE,
             internal::HandleUnion_Data::Validate(raw_buf, &bounds_checker,
                                                  false, nullptr));
   free(raw_buf);
 }
 
 TEST(UnionTest, HandleInUnionValidationNull) {
   Environment environment;
   ScopedMessagePipeHandle pipe;
   HandleUnionPtr handle(HandleUnion::New());
   handle->set_f_message_pipe(pipe.Pass());
 
-  size_t size = GetSerializedSize_(handle, false);
+  size_t size = GetSerializedSize_(handle);
   EXPECT_EQ(16U, size);
 
   mojo::internal::FixedBufferForTesting buf(size);
-  internal::HandleUnion_Data* data = nullptr;
-  SerializeUnion_(handle.get(), &buf, &data, false);
+  auto* data = internal::HandleUnion_Data::New(&buf);
+  SerializeUnion_(handle.get(), &buf, &data);
 
   std::vector<Handle> handles;
   data->EncodePointersAndHandles(&handles);
 
   void* raw_buf = buf.Leak();
   mojo::internal::BoundsChecker bounds_checker(data,
                                                static_cast<uint32_t>(size), 1);
   EXPECT_NE(mojo::internal::ValidationError::NONE,
             internal::HandleUnion_Data::Validate(raw_buf, &bounds_checker,
                                                  false, nullptr));
@@ skipping 34 matching lines @@
 
 TEST(UnionTest, InterfaceInUnionSerialization) {
   Environment env;
   RunLoop run_loop;
   SmallCacheImpl impl;
   SmallCachePtr ptr;
   Binding<SmallCache> bindings(&impl, GetProxy(&ptr));
 
   HandleUnionPtr handle(HandleUnion::New());
   handle->set_f_small_cache(ptr.Pass());
-  size_t size = GetSerializedSize_(handle, false);
+  size_t size = GetSerializedSize_(handle);
   EXPECT_EQ(16U, size);
 
   mojo::internal::FixedBufferForTesting buf(size);
-  internal::HandleUnion_Data* data = nullptr;
-  SerializeUnion_(handle.get(), &buf, &data, false);
+  auto* data = internal::HandleUnion_Data::New(&buf);
+  SerializeUnion_(handle.get(), &buf, &data);
 
   std::vector<Handle> handles;
   data->EncodePointersAndHandles(&handles);
   EXPECT_EQ(1U, handles.size());
   data->DecodePointersAndHandles(&handles);
 
   HandleUnionPtr handle2(HandleUnion::New());
   Deserialize_(data, handle2.get());
 
   auto small_cache =
@@ skipping 24 matching lines @@
   PodUnionPtr pod(PodUnion::New());
   pod->set_f_int16(16);
 
   ptr->Echo(pod.Pass(),
             [](PodUnionPtr out) { EXPECT_EQ(16, out->get_f_int16()); });
   run_loop.RunUntilIdle();
 }
 
 }  // namespace test
 }  // namespace mojo