Revert "Getting rid of DelegatedFrameData"

android_webview/browser/test/rendering_test.cc

Index: android_webview/browser/test/rendering_test.cc
diff --git a/android_webview/browser/test/rendering_test.cc b/android_webview/browser/test/rendering_test.cc
index 1157c8aff4ee464589eb3313899b8ad506f2cbc5..605ac052381c73961795c936ac651c9dca28c1d1 100644
--- a/android_webview/browser/test/rendering_test.cc
+++ b/android_webview/browser/test/rendering_test.cc
@@ -117,11 +117,13 @@ content::SynchronousCompositor* RenderingTest::ActiveCompositor() const {
 std::unique_ptr<cc::CompositorFrame> RenderingTest::ConstructEmptyFrame() {
   std::unique_ptr<cc::CompositorFrame> compositor_frame(
       new cc::CompositorFrame);
+  std::unique_ptr<cc::DelegatedFrameData> frame(new cc::DelegatedFrameData);
   std::unique_ptr<cc::RenderPass> root_pass(cc::RenderPass::Create());
   gfx::Rect viewport(browser_view_renderer_->size());
   root_pass->SetNew(cc::RenderPassId(1, 1), viewport, viewport,
                     gfx::Transform());
-  compositor_frame->render_pass_list.push_back(std::move(root_pass));
+  frame->render_pass_list.push_back(std::move(root_pass));
+  compositor_frame->delegated_frame_data = std::move(frame);
   return compositor_frame;
 }
 
@@ -130,7 +132,7 @@ std::unique_ptr<cc::CompositorFrame> RenderingTest::ConstructFrame(
   std::unique_ptr<cc::CompositorFrame> compositor_frame(ConstructEmptyFrame());
   cc::TransferableResource resource;
   resource.id = resource_id;
-  compositor_frame->resource_list.push_back(resource);
+  compositor_frame->delegated_frame_data->resource_list.push_back(resource);
   return compositor_frame;
 }