Revert "Getting rid of DelegatedFrameData"

cc/surfaces/direct_compositor_frame_sink_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 "cc/surfaces/direct_compositor_frame_sink.h"
 
 #include <memory>
 
 #include "cc/output/renderer_settings.h"
 #include "cc/output/texture_mailbox_deleter.h"
@@ skipping 59 matching lines @@
 
   ~DirectCompositorFrameSinkTest() override {
     compositor_frame_sink_->DetachFromClient();
   }
 
   void SwapBuffersWithDamage(const gfx::Rect& damage_rect) {
     std::unique_ptr<RenderPass> render_pass(RenderPass::Create());
     render_pass->SetNew(RenderPassId(1, 1), display_rect_, damage_rect,
                         gfx::Transform());
 
+    auto frame_data = base::MakeUnique<DelegatedFrameData>();
+    frame_data->render_pass_list.push_back(std::move(render_pass));
+
     CompositorFrame frame;
-    frame.render_pass_list.push_back(std::move(render_pass));
+    frame.delegated_frame_data = std::move(frame_data);
 
     compositor_frame_sink_->SubmitCompositorFrame(std::move(frame));
   }
 
   void SetUp() override {
     // Draw the first frame to start in an "unlocked" state.
     SwapBuffersWithDamage(display_rect_);
 
     EXPECT_EQ(0u, display_output_surface_->num_sent_frames());
     task_runner_->RunUntilIdle();
@@ skipping 54 matching lines @@
   EXPECT_EQ(1u, display_output_surface_->num_sent_frames());
 
   SwapBuffersWithDamage(gfx::Rect());
   EXPECT_EQ(1u, display_output_surface_->num_sent_frames());
   task_runner_->RunUntilIdle();
   EXPECT_EQ(1u, display_output_surface_->num_sent_frames());
 }
 
 }  // namespace
 }  // namespace cc