Revert "Getting rid of DelegatedFrameData"

cc/trees/layer_tree_host_unittest.cc

 // Copyright 2011 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/trees/layer_tree_host.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 6923 matching lines @@
     EXPECT_EQ(DRAW_SUCCESS, draw_result);
     EXPECT_EQ(0, num_swaps_);
     drawn_viewport_ = host_impl->DeviceViewport();
     return draw_result;
   }
 
   void DisplayReceivedCompositorFrameOnThread(
       const CompositorFrame& frame) override {
     EXPECT_EQ(1, ++num_swaps_);
 
-    EXPECT_EQ(drawn_viewport_, frame.render_pass_list.back()->output_rect);
+    DelegatedFrameData* last_frame_data = frame.delegated_frame_data.get();
+    ASSERT_TRUE(frame.delegated_frame_data);
+    EXPECT_EQ(drawn_viewport_,
+              last_frame_data->render_pass_list.back()->output_rect);
     EXPECT_EQ(0.5f, frame.metadata.min_page_scale_factor);
     EXPECT_EQ(4.f, frame.metadata.max_page_scale_factor);
 
-    EXPECT_EQ(0u, frame.resource_list.size());
-    EXPECT_EQ(1u, frame.render_pass_list.size());
+    EXPECT_EQ(0u, frame.delegated_frame_data->resource_list.size());
+    EXPECT_EQ(1u, frame.delegated_frame_data->render_pass_list.size());
 
     EndTest();
   }
 
   void AfterTest() override {}
 
   int num_swaps_ = 0;
   gfx::Rect drawn_viewport_;
 };
 
@@ skipping 17 matching lines @@
 
     RenderPass* pass = AddRenderPass(&frame->render_passes, RenderPassId(1, 1),
                                      gfx::Rect(3, 3, 10, 10), gfx::Transform());
     AddOneOfEveryQuadType(pass, host_impl->resource_provider(), child_pass->id,
                           &mailbox_sync_token);
     return draw_result;
   }
 
   void DisplayReceivedCompositorFrameOnThread(
       const CompositorFrame& frame) override {
-    EXPECT_EQ(2u, frame.render_pass_list.size());
+    ASSERT_TRUE(frame.delegated_frame_data);
+
+    EXPECT_EQ(2u, frame.delegated_frame_data->render_pass_list.size());
     // Each render pass has 10 resources in it. And the root render pass has a
     // mask resource used when drawing the child render pass. The number 10 may
     // change if AppendOneOfEveryQuadType() is updated, and the value here
     // should be updated accordingly.
-    EXPECT_EQ(21u, frame.resource_list.size());
+    EXPECT_EQ(21u, frame.delegated_frame_data->resource_list.size());
 
     EndTest();
   }
 
   void AfterTest() override {}
 };
 
 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestSubmitFrameResources);
 
 }  // namespace
 }  // namespace cc