Getting rid of DelegatedFrameData

services/ui/demo/bitmap_uploader.cc

Index: services/ui/demo/bitmap_uploader.cc
diff --git a/services/ui/demo/bitmap_uploader.cc b/services/ui/demo/bitmap_uploader.cc
index a0c7b3f775d1f230ff0fe6af6d8c2d7e478cb7a9..94fe9b73700fa9d53bf6c56b15b9f3fd24c16473 100644
--- a/services/ui/demo/bitmap_uploader.cc
+++ b/services/ui/demo/bitmap_uploader.cc
@@ -78,8 +78,7 @@ void BitmapUploader::Upload() {
   cc::CompositorFrame frame;
   // TODO(rjkroege): Support device scale factors other than 1.
   frame.metadata.device_scale_factor = 1.0f;
-  frame.delegated_frame_data.reset(new cc::DelegatedFrameData());
-  frame.delegated_frame_data->resource_list.resize(0u);
+  frame.resource_list.resize(0u);
 
   const cc::RenderPassId render_pass_id(1, 1);
   std::unique_ptr<cc::RenderPass> pass = cc::RenderPass::Create();
@@ -123,7 +122,7 @@ void BitmapUploader::Upload() {
     resource.read_lock_fences_enabled = false;
     resource.is_software = false;
     resource.is_overlay_candidate = false;
-    frame.delegated_frame_data->resource_list.push_back(std::move(resource));
+    frame.resource_list.push_back(std::move(resource));
 
     cc::TextureDrawQuad* quad =
         pass->CreateAndAppendDrawQuad<cc::TextureDrawQuad>();
@@ -166,7 +165,7 @@ void BitmapUploader::Upload() {
                  force_antialiasing_off);
   }
 
-  frame.delegated_frame_data->render_pass_list.push_back(std::move(pass));
+  frame.render_pass_list.push_back(std::move(pass));
 
   // TODO(rjkroege, fsamuel): We should throttle frames.
   compositor_frame_sink_->SubmitCompositorFrame(std::move(frame));