Mojom structs for copy requests / results should map to unique_ptr

cc/ipc/copy_output_result_struct_traits.cc

Index: cc/ipc/copy_output_result_struct_traits.cc
diff --git a/cc/ipc/copy_output_result_struct_traits.cc b/cc/ipc/copy_output_result_struct_traits.cc
index 772e3000625dc08f9f1babc9c32975f051dd57f9..0398fe115cd52463b56fbf2a1a1540d3d96b2935 100644
--- a/cc/ipc/copy_output_result_struct_traits.cc
+++ b/cc/ipc/copy_output_result_struct_traits.cc
@@ -7,21 +7,35 @@
 namespace mojo {
 
 // static
-bool StructTraits<cc::mojom::CopyOutputResultDataView, cc::CopyOutputResult>::
-    Read(cc::mojom::CopyOutputResultDataView data, cc::CopyOutputResult* out) {
-  out->bitmap_ = base::MakeUnique<SkBitmap>();
-  return data.ReadSize(&out->size_) && data.ReadBitmap(out->bitmap_.get()) &&
-         data.ReadTextureMailbox(&out->texture_mailbox_);
+bool StructTraits<cc::mojom::CopyOutputResultDataView,
+                  std::unique_ptr<cc::CopyOutputResult>>::
+    Read(cc::mojom::CopyOutputResultDataView data,
+         std::unique_ptr<cc::CopyOutputResult>* out_p) {
+  auto result = cc::CopyOutputResult::CreateEmptyResult();
+
+  if (!data.ReadSize(&result->size_))
+    return false;
+
+  result->bitmap_ = base::MakeUnique<SkBitmap>();
+  if (!data.ReadBitmap(result->bitmap_.get()))
+    return false;
+
+  if (!data.ReadTextureMailbox(&result->texture_mailbox_))
+    return false;
+
+  *out_p = std::move(result);
+
+  return true;
 }
 
 // static
-const SkBitmap&
-StructTraits<cc::mojom::CopyOutputResultDataView, cc::CopyOutputResult>::bitmap(
-    const cc::CopyOutputResult& result) {
+const SkBitmap& StructTraits<cc::mojom::CopyOutputResultDataView,
+                             std::unique_ptr<cc::CopyOutputResult>>::
+    bitmap(const std::unique_ptr<cc::CopyOutputResult>& result) {
   static SkBitmap* null_bitmap = new SkBitmap();
-  if (!result.bitmap_)
+  if (!result->bitmap_)
     return *null_bitmap;
-  return *result.bitmap_;
+  return *result->bitmap_;
 }
 
 }  // namespace mojo