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"
 #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"
 #include "ui/gfx/gpu_memory_buffer.h"
 #include "ui/wm/core/window_util.h"
 
 namespace exo {
 namespace {
 
 using SurfaceTest = test::ExoTestBase;
 
 void ReleaseBuffer(int* release_buffer_call_count) {
   (*release_buffer_call_count)++;
 }
 
+// SurafaceTest.Attach is failing
 TEST_F(SurfaceTest, Attach) {
   gfx::Size buffer_size(256, 256);
   std::unique_ptr<Buffer> buffer(
       new Buffer(exo_test_helper()->CreateGpuMemoryBuffer(buffer_size)));
 
   // Set the release callback that will be run when buffer is no longer in use.
   int release_buffer_call_count = 0;
   buffer->set_release_callback(
       base::Bind(&ReleaseBuffer, base::Unretained(&release_buffer_call_count)));
 
   std::unique_ptr<Surface> surface(new Surface);
 
   // Attach the buffer to surface1.
   surface->Attach(buffer.get());
   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();
+  RunAllPendingInMessageLoop();

[Fady Samuel, 2016/11/30 16:41:57]

Add a comment about why this is necessary.

[Alex Z., 2016/11/30 20:00:30]

Done.

   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 177 matching lines @@
       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