Revert "Getting rid of DelegatedFrameData"

cc/ipc/struct_traits_unittest.cc

Index: cc/ipc/struct_traits_unittest.cc
diff --git a/cc/ipc/struct_traits_unittest.cc b/cc/ipc/struct_traits_unittest.cc
index 2a74584e13b52851f1b44013fdfb09866fbcf488..b4af777af596bf5437c8e42f5dbee825e62fb464 100644
--- a/cc/ipc/struct_traits_unittest.cc
+++ b/cc/ipc/struct_traits_unittest.cc
@@ -195,8 +195,10 @@ TEST_F(StructTraitsTest, CompositorFrame) {
   input.metadata.root_scroll_offset = root_scroll_offset;
   input.metadata.page_scale_factor = page_scale_factor;
   input.metadata.scrollable_viewport_size = scrollable_viewport_size;
-  input.render_pass_list.push_back(std::move(render_pass));
-  input.resource_list.push_back(resource);
+  input.delegated_frame_data.reset(new DelegatedFrameData);
+  input.delegated_frame_data->render_pass_list.push_back(
+      std::move(render_pass));
+  input.delegated_frame_data->resource_list.push_back(resource);
 
   mojom::TraitsTestServicePtr proxy = GetTraitsTestProxy();
   CompositorFrame output;
@@ -207,15 +209,18 @@ TEST_F(StructTraitsTest, CompositorFrame) {
   EXPECT_EQ(page_scale_factor, output.metadata.page_scale_factor);
   EXPECT_EQ(scrollable_viewport_size, output.metadata.scrollable_viewport_size);
 
-  ASSERT_EQ(1u, output.resource_list.size());
-  TransferableResource out_resource = output.resource_list[0];
+  EXPECT_NE(nullptr, output.delegated_frame_data);
+  ASSERT_EQ(1u, output.delegated_frame_data->resource_list.size());
+  TransferableResource out_resource =
+      output.delegated_frame_data->resource_list[0];
   EXPECT_EQ(tr_id, out_resource.id);
   EXPECT_EQ(tr_format, out_resource.format);
   EXPECT_EQ(tr_filter, out_resource.filter);
   EXPECT_EQ(tr_size, out_resource.size);
 
-  EXPECT_EQ(1u, output.render_pass_list.size());
-  const RenderPass* out_render_pass = output.render_pass_list[0].get();
+  EXPECT_EQ(1u, output.delegated_frame_data->render_pass_list.size());
+  const RenderPass* out_render_pass =
+      output.delegated_frame_data->render_pass_list[0].get();
   ASSERT_EQ(2u, out_render_pass->quad_list.size());
   ASSERT_EQ(1u, out_render_pass->shared_quad_state_list.size());