exo: Remove TextureLayer implementation of Surface.

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 94f3f1f4fd5e6c32f4048d1abb8ed5c0719e99bf..a0e9589785f57ba3e0a09d4343500a21d06add18 100644
--- a/components/exo/surface_unittest.cc
+++ b/components/exo/surface_unittest.cc
@@ -15,19 +15,13 @@
 namespace exo {
 namespace {
 
-class SurfaceTest : public test::ExoTestBase,
-                    public ::testing::WithParamInterface<bool> {
-  void SetUp() override {
-    Surface::SetUseSurfaceLayer(GetParam());
-    test::ExoTestBase::SetUp();
-  }
-};
+using SurfaceTest = test::ExoTestBase;
 
 void ReleaseBuffer(int* release_buffer_call_count) {
   (*release_buffer_call_count)++;
 }
 
-TEST_P(SurfaceTest, Attach) {
+TEST_F(SurfaceTest, Attach) {
   gfx::Size buffer_size(256, 256);
   std::unique_ptr<Buffer> buffer(
       new Buffer(exo_test_helper()->CreateGpuMemoryBuffer(buffer_size)));
@@ -54,7 +48,7 @@ TEST_P(SurfaceTest, Attach) {
   ASSERT_EQ(1, release_buffer_call_count);
 }
 
-TEST_P(SurfaceTest, Damage) {
+TEST_F(SurfaceTest, Damage) {
   gfx::Size buffer_size(256, 256);
   std::unique_ptr<Buffer> buffer(
       new Buffer(exo_test_helper()->CreateGpuMemoryBuffer(buffer_size)));
@@ -77,7 +71,7 @@ void SetFrameTime(base::TimeTicks* result, base::TimeTicks frame_time) {
   *result = frame_time;
 }
 
-TEST_P(SurfaceTest, RequestFrameCallback) {
+TEST_F(SurfaceTest, RequestFrameCallback) {
   std::unique_ptr<Surface> surface(new Surface);
 
   base::TimeTicks frame_time;
@@ -89,7 +83,7 @@ TEST_P(SurfaceTest, RequestFrameCallback) {
   EXPECT_TRUE(frame_time.is_null());
 }
 
-TEST_P(SurfaceTest, SetOpaqueRegion) {
+TEST_F(SurfaceTest, SetOpaqueRegion) {
   std::unique_ptr<Surface> surface(new Surface);
 
   // Setting a non-empty opaque region should succeed.
@@ -99,7 +93,7 @@ TEST_P(SurfaceTest, SetOpaqueRegion) {
   surface->SetOpaqueRegion(SkRegion(SkIRect::MakeEmpty()));
 }
 
-TEST_P(SurfaceTest, SetInputRegion) {
+TEST_F(SurfaceTest, SetInputRegion) {
   std::unique_ptr<Surface> surface(new Surface);
 
   // Setting a non-empty input region should succeed.
@@ -109,7 +103,7 @@ TEST_P(SurfaceTest, SetInputRegion) {
   surface->SetInputRegion(SkRegion(SkIRect::MakeEmpty()));
 }
 
-TEST_P(SurfaceTest, SetBufferScale) {
+TEST_F(SurfaceTest, SetBufferScale) {
   gfx::Size buffer_size(512, 512);
   std::unique_ptr<Buffer> buffer(
       new Buffer(exo_test_helper()->CreateGpuMemoryBuffer(buffer_size)));
@@ -126,7 +120,7 @@ TEST_P(SurfaceTest, SetBufferScale) {
       surface->window()->bounds().size().ToString());
 }
 
-TEST_P(SurfaceTest, RecreateLayer) {
+TEST_F(SurfaceTest, RecreateLayer) {
   gfx::Size buffer_size(512, 512);
   std::unique_ptr<Buffer> buffer(
       new Buffer(exo_test_helper()->CreateGpuMemoryBuffer(buffer_size)));
@@ -146,7 +140,7 @@ TEST_P(SurfaceTest, RecreateLayer) {
   EXPECT_TRUE(old_layer_owner->root()->has_external_content());
 }
 
-TEST_P(SurfaceTest, SetViewport) {
+TEST_F(SurfaceTest, SetViewport) {
   gfx::Size buffer_size(1, 1);
   std::unique_ptr<Buffer> buffer(
       new Buffer(exo_test_helper()->CreateGpuMemoryBuffer(buffer_size)));
@@ -169,7 +163,7 @@ TEST_P(SurfaceTest, SetViewport) {
             surface->window()->bounds().size().ToString());
 }
 
-TEST_P(SurfaceTest, SetCrop) {
+TEST_F(SurfaceTest, SetCrop) {
   gfx::Size buffer_size(16, 16);
   std::unique_ptr<Buffer> buffer(
       new Buffer(exo_test_helper()->CreateGpuMemoryBuffer(buffer_size)));
@@ -183,31 +177,7 @@ TEST_P(SurfaceTest, SetCrop) {
             surface->window()->bounds().size().ToString());
 }
 
-TEST_P(SurfaceTest, SetOnlyVisibleOnSecureOutput) {
-  // SurfaceLayer doesn't have texture mailbox, so it can't be tested this
-  // way.
-  if (GetParam())
-    return;
-  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->SetOnlyVisibleOnSecureOutput(true);
-  surface->Commit();
-
-  cc::TextureMailbox mailbox;
-  std::unique_ptr<cc::SingleReleaseCallback> release_callback;
-  bool rv = surface->window()->layer()->PrepareTextureMailbox(
-      &mailbox, &release_callback, false);
-  ASSERT_TRUE(rv);
-
-  EXPECT_TRUE(mailbox.secure_output_only());
-  release_callback->Run(gpu::SyncToken(), false);
-}
-
-TEST_P(SurfaceTest, SetBlendMode) {
+TEST_F(SurfaceTest, SetBlendMode) {
   gfx::Size buffer_size(1, 1);
   std::unique_ptr<Buffer> buffer(
       new Buffer(exo_test_helper()->CreateGpuMemoryBuffer(buffer_size)));
@@ -220,7 +190,7 @@ TEST_P(SurfaceTest, SetBlendMode) {
   EXPECT_TRUE(surface->window()->layer()->fills_bounds_opaquely());
 }
 
-TEST_P(SurfaceTest, SetAlpha) {
+TEST_F(SurfaceTest, SetAlpha) {
   gfx::Size buffer_size(1, 1);
   std::unique_ptr<Buffer> buffer(
       new Buffer(exo_test_helper()->CreateGpuMemoryBuffer(buffer_size)));
@@ -231,14 +201,12 @@ TEST_P(SurfaceTest, SetAlpha) {
   surface->Commit();
 }
 
-TEST_P(SurfaceTest, Commit) {
+TEST_F(SurfaceTest, Commit) {
   std::unique_ptr<Surface> surface(new Surface);
 
   // Calling commit without a buffer should succeed.
   surface->Commit();
 }
 
-INSTANTIATE_TEST_CASE_P(, SurfaceTest, ::testing::Bool());
-
 }  // namespace
 }  // namespace exo