exo: Remove TextureLayer implementation of Surface.

components/exo/sub_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 "components/exo/sub_surface.h"
 
 #include "base/memory/ptr_util.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"
 
 namespace exo {
 namespace {
 
-class SubSurfaceTest : public test::ExoTestBase,
-                       public ::testing::WithParamInterface<bool> {
-  void SetUp() override {
-    Surface::SetUseSurfaceLayer(GetParam());
-    test::ExoTestBase::SetUp();
-  }
-};
+using SubSurfaceTest = test::ExoTestBase;
 
-TEST_P(SubSurfaceTest, SetPosition) {
+TEST_F(SubSurfaceTest, SetPosition) {
   std::unique_ptr<Surface> parent(new Surface);
   std::unique_ptr<Surface> surface(new Surface);
   std::unique_ptr<SubSurface> sub_surface(
       new SubSurface(surface.get(), parent.get()));
 
   // Initial position is at the origin.
   EXPECT_EQ(gfx::Point().ToString(),
             surface->window()->bounds().origin().ToString());
 
   // Set position to 10, 10.
@@ skipping 12 matching lines @@
   // Create and commit a new sub-surface using the same surface.
   sub_surface.reset();
   sub_surface = base::WrapUnique(new SubSurface(surface.get(), parent.get()));
   parent->Commit();
 
   // Initial position should be reset to origin.
   EXPECT_EQ(gfx::Point().ToString(),
             surface->window()->bounds().origin().ToString());
 }
 
-TEST_P(SubSurfaceTest, PlaceAbove) {
+TEST_F(SubSurfaceTest, PlaceAbove) {
   std::unique_ptr<Surface> parent(new Surface);
   std::unique_ptr<Surface> surface1(new Surface);
   std::unique_ptr<Surface> surface2(new Surface);
   std::unique_ptr<Surface> non_sibling_surface(new Surface);
   std::unique_ptr<SubSurface> sub_surface1(
       new SubSurface(surface1.get(), parent.get()));
   std::unique_ptr<SubSurface> sub_surface2(
       new SubSurface(surface2.get(), parent.get()));
 
   ASSERT_EQ(2u, parent->window()->children().size());
@@ skipping 10 matching lines @@
   EXPECT_EQ(surface1->window(), parent->window()->children()[0]);
   EXPECT_EQ(surface2->window(), parent->window()->children()[1]);
 
   parent->Commit();
 
   // surface1 should now be stacked above surface2.
   EXPECT_EQ(surface2->window(), parent->window()->children()[0]);
   EXPECT_EQ(surface1->window(), parent->window()->children()[1]);
 }
 
-TEST_P(SubSurfaceTest, PlaceBelow) {
+TEST_F(SubSurfaceTest, PlaceBelow) {
   std::unique_ptr<Surface> parent(new Surface);
   std::unique_ptr<Surface> surface1(new Surface);
   std::unique_ptr<Surface> surface2(new Surface);
   std::unique_ptr<Surface> non_sibling_surface(new Surface);
   std::unique_ptr<SubSurface> sub_surface1(
       new SubSurface(surface1.get(), parent.get()));
   std::unique_ptr<SubSurface> sub_surface2(
       new SubSurface(surface2.get(), parent.get()));
 
   ASSERT_EQ(2u, parent->window()->children().size());
@@ skipping 10 matching lines @@
   EXPECT_EQ(surface1->window(), parent->window()->children()[0]);
   EXPECT_EQ(surface2->window(), parent->window()->children()[1]);
 
   parent->Commit();
 
   // surface1 should now be stacked above surface2.
   EXPECT_EQ(surface2->window(), parent->window()->children()[0]);
   EXPECT_EQ(surface1->window(), parent->window()->children()[1]);
 }
 
-TEST_P(SubSurfaceTest, SetCommitBehavior) {
+TEST_F(SubSurfaceTest, SetCommitBehavior) {
   std::unique_ptr<Surface> parent(new Surface);
   std::unique_ptr<Surface> child(new Surface);
   std::unique_ptr<Surface> grandchild(new Surface);
   std::unique_ptr<SubSurface> child_sub_surface(
       new SubSurface(child.get(), parent.get()));
   std::unique_ptr<SubSurface> grandchild_sub_surface(
       new SubSurface(grandchild.get(), child.get()));
 
   // Initial position is at the origin.
   EXPECT_EQ(gfx::Point().ToString(),
@@ skipping 25 matching lines @@
   gfx::Point position2(20, 20);
   grandchild_sub_surface->SetPosition(position2);
   child->Commit();
 
   // A Commit() call on child should be sufficient for the position of
   // grandchild to take effect when synchronous is disabled.
   EXPECT_EQ(position2.ToString(),
             grandchild->window()->bounds().origin().ToString());
 }
 
-INSTANTIATE_TEST_CASE_P(, SubSurfaceTest, ::testing::Bool());
-
 }  // namespace
 }  // namespace exo