Revert "Getting rid of DelegatedFrameData"

cc/surfaces/surface_hittest_unittest.cc

Index: cc/surfaces/surface_hittest_unittest.cc
diff --git a/cc/surfaces/surface_hittest_unittest.cc b/cc/surfaces/surface_hittest_unittest.cc
index 2c04b2a731c695e3ea1bb05edcb5599d1115d62b..5038188e4ac56a1a724f1d57a28fe23ce18f4293 100644
--- a/cc/surfaces/surface_hittest_unittest.cc
+++ b/cc/surfaces/surface_hittest_unittest.cc
@@ -398,8 +398,7 @@ TEST(SurfaceHittestTest, Hittest_RenderPassDrawQuad) {
 
   // Create a CompostiorFrame with two RenderPasses.
   gfx::Rect root_rect(300, 300);
-  CompositorFrame root_frame;
-  RenderPassList& render_pass_list = root_frame.render_pass_list;
+  RenderPassList render_pass_list;
 
   // Create a child RenderPass.
   RenderPassId child_render_pass_id(1, 3);
@@ -418,7 +417,9 @@ TEST(SurfaceHittestTest, Hittest_RenderPassDrawQuad) {
                    &render_pass_list);
 
   RenderPass* root_pass = nullptr;
-  root_pass = root_frame.render_pass_list.back().get();
+  CompositorFrame root_frame =
+      CreateCompositorFrameWithRenderPassList(&render_pass_list);
+  root_pass = root_frame.delegated_frame_data->render_pass_list.back().get();
 
   // Create a RenderPassDrawQuad.
   gfx::Rect render_pass_quad_rect(100, 100);
@@ -429,7 +430,8 @@ TEST(SurfaceHittestTest, Hittest_RenderPassDrawQuad) {
                            child_render_pass_id);
 
   // Add a solid quad in the child render pass.
-  RenderPass* child_render_pass = root_frame.render_pass_list.front().get();
+  RenderPass* child_render_pass =
+      root_frame.delegated_frame_data->render_pass_list.front().get();
   gfx::Rect child_solid_quad_rect(100, 100);
   CreateSolidColorDrawQuad(child_render_pass,
                            gfx::Transform(),