Getting rid of DelegatedFrameData

services/ui/ws/frame_generator.cc

Index: services/ui/ws/frame_generator.cc
diff --git a/services/ui/ws/frame_generator.cc b/services/ui/ws/frame_generator.cc
index feedf2bd28a0cf5366a92b1afb203f3c13f7aa9f..5c363fb56ccc7646f99573e9fca80c83b79d87dc 100644
--- a/services/ui/ws/frame_generator.cc
+++ b/services/ui/ws/frame_generator.cc
@@ -123,9 +123,8 @@ cc::CompositorFrame FrameGenerator::GenerateCompositorFrame(
   DrawWindowTree(render_pass.get(), delegate_->GetRootWindow(), gfx::Vector2d(),
                  1.0f, &may_contain_video);
 
-  std::unique_ptr<cc::DelegatedFrameData> frame_data(
-      new cc::DelegatedFrameData);
-  frame_data->render_pass_list.push_back(std::move(render_pass));
+  cc::CompositorFrame frame;
+  frame.render_pass_list.push_back(std::move(render_pass));
   if (delegate_->IsInHighContrastMode()) {
     std::unique_ptr<cc::RenderPass> invert_pass = cc::RenderPass::Create();
     invert_pass->SetNew(cc::RenderPassId(2, 0), output_rect, dirty_rect_,
@@ -143,11 +142,9 @@ cc::CompositorFrame FrameGenerator::GenerateCompositorFrame(
                  gfx::Vector2dF() /* filters_scale */,
                  gfx::PointF() /* filters_origin */,
                  cc::FilterOperations() /* background_filters */);
-    frame_data->render_pass_list.push_back(std::move(invert_pass));
+    frame.render_pass_list.push_back(std::move(invert_pass));
   }
 
-  cc::CompositorFrame frame;
-  frame.delegated_frame_data = std::move(frame_data);
   frame.metadata.may_contain_video = may_contain_video;
   return frame;
 }