Revert "Getting rid of DelegatedFrameData"

cc/trees/layer_tree_host_unittest.cc

Index: cc/trees/layer_tree_host_unittest.cc
diff --git a/cc/trees/layer_tree_host_unittest.cc b/cc/trees/layer_tree_host_unittest.cc
index 3a7caa666ee348755b6c2b3edf7afdd139b90238..ae40cad1835e227e1ca51bee61361310f723e295 100644
--- a/cc/trees/layer_tree_host_unittest.cc
+++ b/cc/trees/layer_tree_host_unittest.cc
@@ -6941,12 +6941,15 @@ class LayerTreeHostTestSubmitFrameMetadata : public LayerTreeHostTest {
       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();
   }
@@ -6984,12 +6987,14 @@ class LayerTreeHostTestSubmitFrameResources : public LayerTreeHostTest {
 
   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();
   }