| Index: components/exo/sub_surface_unittest.cc
|
| diff --git a/components/exo/sub_surface_unittest.cc b/components/exo/sub_surface_unittest.cc
|
| index 4e54e0501180ce10fa50766ee24c2732fafd5c38..2cd92ffb6401c537a6bdd007b8b9d069a9905deb 100644
|
| --- a/components/exo/sub_surface_unittest.cc
|
| +++ b/components/exo/sub_surface_unittest.cc
|
| @@ -13,15 +13,9 @@
|
| namespace exo {
|
| namespace {
|
|
|
| -class SubSurfaceTest : public test::ExoTestBase,
|
| - public ::testing::WithParamInterface<bool> {
|
| - void SetUp() override {
|
| - Surface::SetUseSurfaceLayer(GetParam());
|
| - test::ExoTestBase::SetUp();
|
| - }
|
| -};
|
| -
|
| -TEST_P(SubSurfaceTest, SetPosition) {
|
| +using SubSurfaceTest = test::ExoTestBase;
|
| +
|
| +TEST_F(SubSurfaceTest, SetPosition) {
|
| std::unique_ptr<Surface> parent(new Surface);
|
| std::unique_ptr<Surface> surface(new Surface);
|
| std::unique_ptr<SubSurface> sub_surface(
|
| @@ -54,7 +48,7 @@ TEST_P(SubSurfaceTest, SetPosition) {
|
| 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);
|
| @@ -85,7 +79,7 @@ TEST_P(SubSurfaceTest, PlaceAbove) {
|
| 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);
|
| @@ -116,7 +110,7 @@ TEST_P(SubSurfaceTest, PlaceBelow) {
|
| 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);
|
| @@ -162,7 +156,5 @@ TEST_P(SubSurfaceTest, SetCommitBehavior) {
|
| grandchild->window()->bounds().origin().ToString());
|
| }
|
|
|
| -INSTANTIATE_TEST_CASE_P(, SubSurfaceTest, ::testing::Bool());
|
| -
|
| } // namespace
|
| } // namespace exo
|
|
|