Revert "Getting rid of DelegatedFrameData"

components/exo/surface_unittest.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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"
 #include "components/exo/buffer.h"
 #include "components/exo/surface.h"
 #include "components/exo/test/exo_test_base.h"
 #include "components/exo/test/exo_test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/env.h"
 #include "ui/compositor/layer_tree_owner.h"
@@ skipping 163 matching lines @@
 
   surface->Attach(buffer.get());
   gfx::Size crop_size(12, 12);
   surface->SetCrop(gfx::RectF(gfx::PointF(2.0, 2.0), gfx::SizeF(crop_size)));
   surface->Commit();
   EXPECT_EQ(crop_size.ToString(),
             surface->window()->bounds().size().ToString());
   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) {
   gfx::Size buffer_size(1, 1);
   std::unique_ptr<Buffer> buffer(
       new Buffer(exo_test_helper()->CreateGpuMemoryBuffer(buffer_size)));
   std::unique_ptr<Surface> surface(new Surface);
 
   surface->Attach(buffer.get());
   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());
 }
 
 TEST_F(SurfaceTest, OverlayCandidate) {
   gfx::Size buffer_size(1, 1);
   std::unique_ptr<Buffer> buffer(new Buffer(
       exo_test_helper()->CreateGpuMemoryBuffer(buffer_size), 0, 0, true, true));
   std::unique_ptr<Surface> surface(new Surface);
 
   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 =
       cc::TextureDrawQuad::MaterialCast(draw_quad);
   EXPECT_FALSE(texture_quad->resource_size_in_pixels().IsEmpty());
 }
 
 TEST_F(SurfaceTest, SetAlpha) {
   gfx::Size buffer_size(1, 1);
   std::unique_ptr<Buffer> buffer(
       new Buffer(exo_test_helper()->CreateGpuMemoryBuffer(buffer_size)));
   std::unique_ptr<Surface> surface(new Surface);
 
   surface->Attach(buffer.get());
   surface->SetAlpha(0.5f);
   surface->Commit();
 }
 
 TEST_F(SurfaceTest, Commit) {
   std::unique_ptr<Surface> surface(new Surface);
 
   // Calling commit without a buffer should succeed.
   surface->Commit();
 }
 
 }  // namespace
 }  // namespace exo