Revert "Getting rid of DelegatedFrameData"

cc/ipc/cc_serialization_perftest.cc

 // Copyright 2013 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 <utility>
 
 #include "base/test/launcher/unit_test_launcher.h"
 #include "base/test/test_suite.h"
 #include "cc/ipc/cc_param_traits.h"
 #include "cc/ipc/compositor_frame.mojom.h"
@@ skipping 180 matching lines @@
         true);
     perf_test::PrintResult("StructTraits serialization: num runs in 2 seconds",
                            "", test_name, count, "", true);
   }
 
   static void RunCompositorFrameTest(const std::string& test_name,
                                      uint32_t num_quads,
                                      uint32_t num_passes,
                                      UseSingleSharedQuadState single_sqs) {
     CompositorFrame frame;
+    frame.delegated_frame_data.reset(new DelegatedFrameData);
 
     for (uint32_t i = 0; i < num_passes; ++i) {
       std::unique_ptr<RenderPass> render_pass = RenderPass::Create();
       render_pass->SetNew(RenderPassId(1, 1), gfx::Rect(), gfx::Rect(),
                           gfx::Transform());
       for (uint32_t j = 0; j < num_quads; ++j) {
         if (j == 0 || single_sqs == UseSingleSharedQuadState::NO)
           render_pass->CreateAndAppendSharedQuadState();
         const gfx::Rect bounds(100, 100, 100, 100);
         const bool kForceAntiAliasingOff = true;
         SolidColorDrawQuad* quad =
             render_pass->CreateAndAppendDrawQuad<SolidColorDrawQuad>();
         quad->SetNew(render_pass->shared_quad_state_list.back(), bounds, bounds,
                      SK_ColorRED, kForceAntiAliasingOff);
       }
-      frame.render_pass_list.push_back(std::move(render_pass));
+      frame.delegated_frame_data->render_pass_list.push_back(
+          std::move(render_pass));
     }
     RunTest(test_name, std::move(frame));
   }
 
   static void RunTest(const std::string& test_name, CompositorFrame frame) {
     RunSerializationTestStructTraits(test_name, frame);
     RunDeserializationTestStructTraits(test_name, frame);
     RunSerializationTestParamTraits(test_name, frame);
     RunDeserializationTestParamTraits(test_name, frame);
   }
@@ skipping 29 matching lines @@
                          UseSingleSharedQuadState::NO);
 }
 
 TEST_F(CCSerializationPerfTest, DelegatedFrame_ManyRenderPasses_1000_100) {
   RunCompositorFrameTest("DelegatedFrame_ManyRenderPasses_10000_100", 100, 1000,
                          UseSingleSharedQuadState::NO);
 }
 
 }  // namespace
 }  // namespace cc