Revert "Getting rid of DelegatedFrameData"

cc/surfaces/surface_aggregator_perftest.cc

Index: cc/surfaces/surface_aggregator_perftest.cc
diff --git a/cc/surfaces/surface_aggregator_perftest.cc b/cc/surfaces/surface_aggregator_perftest.cc
index 0d990f0ac9263272a20140c2120c0be62acc9a01..60f636aefc04091f360863d9e1d5aa92be878659 100644
--- a/cc/surfaces/surface_aggregator_perftest.cc
+++ b/cc/surfaces/surface_aggregator_perftest.cc
@@ -5,6 +5,7 @@
 #include "base/memory/ptr_util.h"
 #include "cc/debug/lap_timer.h"
 #include "cc/output/compositor_frame.h"
+#include "cc/output/delegated_frame_data.h"
 #include "cc/quads/surface_draw_quad.h"
 #include "cc/quads/texture_draw_quad.h"
 #include "cc/surfaces/surface_aggregator.h"
@@ -55,14 +56,14 @@ class SurfaceAggregatorPerfTest : public testing::Test {
       LocalFrameId local_frame_id(i, kArbitraryToken);
       factory_.Create(local_frame_id);
       std::unique_ptr<RenderPass> pass(RenderPass::Create());
-      CompositorFrame frame;
+      std::unique_ptr<DelegatedFrameData> frame_data(new DelegatedFrameData);
 
       SharedQuadState* sqs = pass->CreateAndAppendSharedQuadState();
       for (int j = 0; j < num_textures; j++) {
         TransferableResource resource;
         resource.id = j;
         resource.is_software = true;
-        frame.resource_list.push_back(resource);
+        frame_data->resource_list.push_back(resource);
 
         TextureDrawQuad* quad =
             pass->CreateAndAppendDrawQuad<TextureDrawQuad>();
@@ -94,7 +95,9 @@ class SurfaceAggregatorPerfTest : public testing::Test {
                                        LocalFrameId(i - 1, kArbitraryToken)));
       }
 
-      frame.render_pass_list.push_back(std::move(pass));
+      frame_data->render_pass_list.push_back(std::move(pass));
+      CompositorFrame frame;
+      frame.delegated_frame_data = std::move(frame_data);
       factory_.SubmitCompositorFrame(local_frame_id, std::move(frame),
                                      SurfaceFactory::DrawCallback());
     }
@@ -103,7 +106,7 @@ class SurfaceAggregatorPerfTest : public testing::Test {
     timer_.Reset();
     do {
       std::unique_ptr<RenderPass> pass(RenderPass::Create());
-      CompositorFrame frame;
+      std::unique_ptr<DelegatedFrameData> frame_data(new DelegatedFrameData);
 
       SharedQuadState* sqs = pass->CreateAndAppendSharedQuadState();
       SurfaceDrawQuad* surface_quad =
@@ -118,7 +121,9 @@ class SurfaceAggregatorPerfTest : public testing::Test {
       else
         pass->damage_rect = gfx::Rect(0, 0, 1, 1);
 
-      frame.render_pass_list.push_back(std::move(pass));
+      frame_data->render_pass_list.push_back(std::move(pass));
+      CompositorFrame frame;
+      frame.delegated_frame_data = std::move(frame_data);
       factory_.SubmitCompositorFrame(
           LocalFrameId(num_surfaces + 1, kArbitraryToken), std::move(frame),
           SurfaceFactory::DrawCallback());