Getting rid of DelegatedFrameData

cc/test/test_compositor_frame_sink.cc

Index: cc/test/test_compositor_frame_sink.cc
diff --git a/cc/test/test_compositor_frame_sink.cc b/cc/test/test_compositor_frame_sink.cc
index 06e276b1209519074775b4abe0f85bc0d776375d..e15d8a6e5df30edae158586de10a98784a3436d9 100644
--- a/cc/test/test_compositor_frame_sink.cc
+++ b/cc/test/test_compositor_frame_sink.cc
@@ -135,8 +135,7 @@ void TestCompositorFrameSink::SubmitCompositorFrame(CompositorFrame frame) {
   display_->SetLocalFrameId(delegated_local_frame_id_,
                             frame.metadata.device_scale_factor);
 
-  gfx::Size frame_size =
-      frame.delegated_frame_data->render_pass_list.back()->output_rect.size();
+  gfx::Size frame_size = frame.render_pass_list.back()->output_rect.size();
   display_->Resize(frame_size);
 
   bool synchronous = !display_->has_scheduler();
@@ -179,9 +178,7 @@ void TestCompositorFrameSink::DidDrawCallback() {
 void TestCompositorFrameSink::ForceReclaimResources() {
   if (capabilities_.can_force_reclaim_resources &&
       delegated_local_frame_id_.is_valid()) {
-    surface_factory_->SubmitCompositorFrame(delegated_local_frame_id_,
-                                            CompositorFrame(),
-                                            SurfaceFactory::DrawCallback());
+    surface_factory_->ClearSurface(delegated_local_frame_id_);
   }
 }