Change exo::SurfaceFactoryOwner to exo::ExoCompositorFrameSink

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/quads/texture_draw_quad.h"
 #include "cc/surfaces/surface.h"
 #include "cc/surfaces/surface_manager.h"
 #include "components/exo/buffer.h"
@@ skipping 32 matching lines @@
   surface->Commit();
 
   // Commit without calling Attach() should have no effect.
   surface->Commit();
   EXPECT_EQ(0, release_buffer_call_count);
 
   // Attach a null buffer to surface, this should release the previously
   // attached buffer.
   surface->Attach(nullptr);
   surface->Commit();
+  // CompositorFrameSinkHolder::ReclaimResources() gets called via
+  // MojoCompositorFrameSinkClient interface. We need to wait here for the mojo
+  // call to finish so that the release callback finishes running before
+  // the assertion below

[reveman, 2016/12/07 00:46:58]

nit: s/below/below./

[Alex Z., 2016/12/07 20:09:36]

Done.

+  RunAllPendingInMessageLoop();
   ASSERT_EQ(1, release_buffer_call_count);
 }
 
 TEST_F(SurfaceTest, Damage) {
   gfx::Size buffer_size(256, 256);
   std::unique_ptr<Buffer> buffer(
       new Buffer(exo_test_helper()->CreateGpuMemoryBuffer(buffer_size)));
   std::unique_ptr<Surface> surface(new Surface);
 
   // Attach the buffer to the surface. This will update the pending bounds of
@@ skipping 121 matching lines @@
   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) {
   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();
+  cc::Surface* another_surface = surface_manager->GetSurfaceForId(surface_id);

[reveman, 2016/12/07 00:46:58]

s/another_surface/cc_surface/

[Alex Z., 2016/12/07 20:09:36]

This cc::Surface was added for debugging. I have reverted to the previous state.

+  DCHECK(another_surface);
+  const cc::CompositorFrame& frame = another_surface->GetEligibleFrame();
   return frame;
 }
 
 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(SkBlendMode::kSrc);
   surface->Commit();
+  RunAllPendingInMessageLoop();
 
   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()
                    ->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();
+  RunAllPendingInMessageLoop();
 
   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();
   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);
-

[reveman, 2016/12/07 00:46:58]

was this intentionally removed?

[Alex Z., 2016/12/07 20:09:36]

No. I guess it was removed along with the printf's I added/removed while
debugging.

   // Calling commit without a buffer should succeed.
   surface->Commit();
 }
 
 }  // namespace
 }  // namespace exo