Revert "Getting rid of DelegatedFrameData"

components/exo/surface_unittest.cc

Index: components/exo/surface_unittest.cc
diff --git a/components/exo/surface_unittest.cc b/components/exo/surface_unittest.cc
index 95309a39fddce194f7aa5770da6ab51b75d89538..01bbff2a7cfe918c32fbada31a4a3ecddd063f9e 100644
--- a/components/exo/surface_unittest.cc
+++ b/components/exo/surface_unittest.cc
@@ -4,6 +4,7 @@
 
 #include "base/bind.h"
 #include "cc/output/compositor_frame.h"
+#include "cc/output/delegated_frame_data.h"
 #include "cc/quads/texture_draw_quad.h"
 #include "cc/surfaces/surface.h"
 #include "cc/surfaces/surface_manager.h"
@@ -187,13 +188,13 @@ TEST_F(SurfaceTest, SetCrop) {
   EXPECT_EQ(crop_size.ToString(), surface->content_size().ToString());
 }
 
-const cc::CompositorFrame& GetFrameFromSurface(Surface* surface) {
+const cc::DelegatedFrameData* GetFrameFromSurface(Surface* surface) {
   cc::SurfaceId surface_id = surface->GetSurfaceId();
   cc::SurfaceManager* surface_manager =
       aura::Env::GetInstance()->context_factory()->GetSurfaceManager();
   const cc::CompositorFrame& frame =
       surface_manager->GetSurfaceForId(surface_id)->GetEligibleFrame();
-  return frame;
+  return frame.delegated_frame_data.get();
 }
 
 TEST_F(SurfaceTest, SetBlendMode) {
@@ -206,10 +207,10 @@ TEST_F(SurfaceTest, SetBlendMode) {
   surface->SetBlendMode(SkXfermode::kSrc_Mode);
   surface->Commit();
 
-  const cc::CompositorFrame& frame = GetFrameFromSurface(surface.get());
-  ASSERT_EQ(1u, frame.render_pass_list.size());
-  ASSERT_EQ(1u, frame.render_pass_list.back()->quad_list.size());
-  EXPECT_FALSE(frame.render_pass_list.back()
+  const cc::DelegatedFrameData* frame_data = GetFrameFromSurface(surface.get());
+  ASSERT_EQ(1u, frame_data->render_pass_list.size());
+  ASSERT_EQ(1u, frame_data->render_pass_list.back()->quad_list.size());
+  EXPECT_FALSE(frame_data->render_pass_list.back()
                    ->quad_list.back()
                    ->ShouldDrawWithBlending());
 }
@@ -223,10 +224,11 @@ TEST_F(SurfaceTest, OverlayCandidate) {
   surface->Attach(buffer.get());
   surface->Commit();
 
-  const cc::CompositorFrame& frame = GetFrameFromSurface(surface.get());
-  ASSERT_EQ(1u, frame.render_pass_list.size());
-  ASSERT_EQ(1u, frame.render_pass_list.back()->quad_list.size());
-  cc::DrawQuad* draw_quad = frame.render_pass_list.back()->quad_list.back();
+  const cc::DelegatedFrameData* frame_data = GetFrameFromSurface(surface.get());
+  ASSERT_EQ(1u, frame_data->render_pass_list.size());
+  ASSERT_EQ(1u, frame_data->render_pass_list.back()->quad_list.size());
+  cc::DrawQuad* draw_quad =
+      frame_data->render_pass_list.back()->quad_list.back();
   ASSERT_EQ(cc::DrawQuad::TEXTURE_CONTENT, draw_quad->material);
 
   const cc::TextureDrawQuad* texture_quad =