Revert "Getting rid of DelegatedFrameData"

cc/surfaces/surface_hittest_unittest.cc

 // Copyright 2015 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 <stddef.h>
 
 #include "cc/output/compositor_frame.h"
 #include "cc/surfaces/surface.h"
 #include "cc/surfaces/surface_factory.h"
 #include "cc/surfaces/surface_factory_client.h"
@@ skipping 380 matching lines @@
 }
 
 TEST(SurfaceHittestTest, Hittest_RenderPassDrawQuad) {
   SurfaceManager manager;
   EmptySurfaceFactoryClient client;
   FrameSinkId root_frame_sink_id(kArbitraryFrameSinkId);
   SurfaceFactory factory(root_frame_sink_id, &manager, &client);
 
   // 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);
   gfx::Transform transform_to_root_target(1.0f, 0.0f, 0.0f, 50.0f,
                                           0.0f, 1.0f, 0.0f, 50.0f,
                                           0.0f, 0.0f, 1.0f, 0.0f,
                                           0.0f, 0.0f, 0.0f, 1.0f);
   CreateRenderPass(child_render_pass_id,
                    gfx::Rect(100, 100),
                    transform_to_root_target,
                    &render_pass_list);
 
   // Create the root RenderPass.
   RenderPassId root_render_pass_id(1, 2);
   CreateRenderPass(root_render_pass_id, root_rect, gfx::Transform(),
                    &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);
   CreateRenderPassDrawQuad(root_pass,
                            transform_to_root_target,
                            root_rect,
                            render_pass_quad_rect,
                            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(),
                            gfx::Rect(100, 100),
                            child_solid_quad_rect);
 
   // Submit the root frame.
   SurfaceIdAllocator root_allocator;
   LocalFrameId root_local_frame_id = root_allocator.GenerateId();
   SurfaceId root_surface_id(root_frame_sink_id, root_local_frame_id);
@@ skipping 182 matching lines @@
 
   // Verify that insets have affected hit targeting.
   EXPECT_EQ(0, accept_delegate.reject_target_overrides());
   EXPECT_EQ(2, accept_delegate.accept_target_overrides());
 
   root_factory.Destroy(root_local_frame_id);
   child_factory.Destroy(child_local_frame_id);
 }
 
 }  // namespace cc