ozone: Remove empty test fixtures

It's possible to write a fixtureless test by using TEST() instead of
TEST_F(). Do this as it is slightly cleaner.

Bug: none
Test: events_unittests

Change-Id: I67f50d73d01595de29f6346ef977891d6ea7b1c2
Reviewed-on: https://chromium-review.googlesource.com/c/1294569Reviewed-by: Kevin Schoedel <kpschoedel@chromium.org>
Reviewed-by: Nasko Oskov <nasko@chromium.org>
Commit-Queue: Michael Spang <spang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#601732}

ui/events/ozone/evdev/event_device_info_unittest.cc

@@ -15,18 +15,7 @@
 
 namespace ui {
 
-class EventDeviceInfoTest : public testing::Test {
- public:
-  EventDeviceInfoTest();
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(EventDeviceInfoTest);
-};
-
-EventDeviceInfoTest::EventDeviceInfoTest() {
-}
-
-TEST_F(EventDeviceInfoTest, BasicUsbGamepad) {
+TEST(EventDeviceInfoTest, BasicUsbGamepad) {
   EventDeviceInfo devinfo;
   EXPECT_TRUE(CapabilitiesToDeviceInfo(kXboxGamepad, &devinfo));
 
@@ -40,7 +29,7 @@ TEST_F(EventDeviceInfoTest, BasicUsbGamepad) {
   EXPECT_EQ(ui::InputDeviceType::INPUT_DEVICE_USB, devinfo.device_type());
 }
 
-TEST_F(EventDeviceInfoTest, BasicCrosKeyboard) {
+TEST(EventDeviceInfoTest, BasicCrosKeyboard) {
   EventDeviceInfo devinfo;
   EXPECT_TRUE(CapabilitiesToDeviceInfo(kLinkKeyboard, &devinfo));
 
@@ -54,7 +43,7 @@ TEST_F(EventDeviceInfoTest, BasicCrosKeyboard) {
   EXPECT_EQ(ui::InputDeviceType::INPUT_DEVICE_INTERNAL, devinfo.device_type());
 }
 
-TEST_F(EventDeviceInfoTest, BasicCrosTouchscreen) {
+TEST(EventDeviceInfoTest, BasicCrosTouchscreen) {
   EventDeviceInfo devinfo;
   EXPECT_TRUE(CapabilitiesToDeviceInfo(kLinkTouchscreen, &devinfo));
 
@@ -68,7 +57,7 @@ TEST_F(EventDeviceInfoTest, BasicCrosTouchscreen) {
   EXPECT_EQ(ui::InputDeviceType::INPUT_DEVICE_INTERNAL, devinfo.device_type());
 }
 
-TEST_F(EventDeviceInfoTest, BasicCrosTouchpad) {
+TEST(EventDeviceInfoTest, BasicCrosTouchpad) {
   EventDeviceInfo devinfo;
   EXPECT_TRUE(CapabilitiesToDeviceInfo(kLinkTouchpad, &devinfo));
 
@@ -82,7 +71,7 @@ TEST_F(EventDeviceInfoTest, BasicCrosTouchpad) {
   EXPECT_EQ(ui::InputDeviceType::INPUT_DEVICE_INTERNAL, devinfo.device_type());
 }
 
-TEST_F(EventDeviceInfoTest, BasicUsbKeyboard) {
+TEST(EventDeviceInfoTest, BasicUsbKeyboard) {
   EventDeviceInfo devinfo;
   EXPECT_TRUE(CapabilitiesToDeviceInfo(kHpUsbKeyboard, &devinfo));
 
@@ -96,7 +85,7 @@ TEST_F(EventDeviceInfoTest, BasicUsbKeyboard) {
   EXPECT_EQ(ui::InputDeviceType::INPUT_DEVICE_USB, devinfo.device_type());
 }
 
-TEST_F(EventDeviceInfoTest, BasicUsbKeyboard_Extra) {
+TEST(EventDeviceInfoTest, BasicUsbKeyboard_Extra) {
   EventDeviceInfo devinfo;
   EXPECT_TRUE(CapabilitiesToDeviceInfo(kHpUsbKeyboard_Extra, &devinfo));
 
@@ -110,7 +99,7 @@ TEST_F(EventDeviceInfoTest, BasicUsbKeyboard_Extra) {
   EXPECT_EQ(ui::InputDeviceType::INPUT_DEVICE_USB, devinfo.device_type());
 }
 
-TEST_F(EventDeviceInfoTest, BasicUsbMouse) {
+TEST(EventDeviceInfoTest, BasicUsbMouse) {
   EventDeviceInfo devinfo;
   EXPECT_TRUE(CapabilitiesToDeviceInfo(kLogitechUsbMouse, &devinfo));
 
@@ -124,7 +113,7 @@ TEST_F(EventDeviceInfoTest, BasicUsbMouse) {
   EXPECT_EQ(ui::InputDeviceType::INPUT_DEVICE_USB, devinfo.device_type());
 }
 
-TEST_F(EventDeviceInfoTest, BasicUsbTouchscreen) {
+TEST(EventDeviceInfoTest, BasicUsbTouchscreen) {
   EventDeviceInfo devinfo;
   EXPECT_TRUE(CapabilitiesToDeviceInfo(kMimoTouch2Touchscreen, &devinfo));
 
@@ -138,7 +127,7 @@ TEST_F(EventDeviceInfoTest, BasicUsbTouchscreen) {
   EXPECT_EQ(ui::InputDeviceType::INPUT_DEVICE_USB, devinfo.device_type());
 }
 
-TEST_F(EventDeviceInfoTest, BasicUsbTablet) {
+TEST(EventDeviceInfoTest, BasicUsbTablet) {
   EventDeviceInfo devinfo;
   EXPECT_TRUE(CapabilitiesToDeviceInfo(kWacomIntuosPtS_Pen, &devinfo));
 
@@ -152,7 +141,7 @@ TEST_F(EventDeviceInfoTest, BasicUsbTablet) {
   EXPECT_EQ(ui::InputDeviceType::INPUT_DEVICE_USB, devinfo.device_type());
 }
 
-TEST_F(EventDeviceInfoTest, BasicUsbTouchpad) {
+TEST(EventDeviceInfoTest, BasicUsbTouchpad) {
   EventDeviceInfo devinfo;
   EXPECT_TRUE(CapabilitiesToDeviceInfo(kWacomIntuosPtS_Finger, &devinfo));
 
@@ -166,7 +155,7 @@ TEST_F(EventDeviceInfoTest, BasicUsbTouchpad) {
   EXPECT_EQ(ui::InputDeviceType::INPUT_DEVICE_USB, devinfo.device_type());
 }
 
-TEST_F(EventDeviceInfoTest, HybridKeyboardWithMouse) {
+TEST(EventDeviceInfoTest, HybridKeyboardWithMouse) {
   EventDeviceInfo devinfo;
   EXPECT_TRUE(CapabilitiesToDeviceInfo(kLogitechTouchKeyboardK400, &devinfo));
 
@@ -179,7 +168,7 @@ TEST_F(EventDeviceInfoTest, HybridKeyboardWithMouse) {
   EXPECT_FALSE(devinfo.HasGamepad());
 }
 
-TEST_F(EventDeviceInfoTest, AbsoluteMouseTouchscreen) {
+TEST(EventDeviceInfoTest, AbsoluteMouseTouchscreen) {
   EventDeviceInfo devinfo;
   EXPECT_TRUE(CapabilitiesToDeviceInfo(kElo_TouchSystems_2700, &devinfo));
 
@@ -194,7 +183,7 @@ TEST_F(EventDeviceInfoTest, AbsoluteMouseTouchscreen) {
   EXPECT_EQ(ui::InputDeviceType::INPUT_DEVICE_USB, devinfo.device_type());
 }
 
-TEST_F(EventDeviceInfoTest, OnScreenStylus) {
+TEST(EventDeviceInfoTest, OnScreenStylus) {
   EventDeviceInfo devinfo;
   EXPECT_TRUE(CapabilitiesToDeviceInfo(kWilsonBeachActiveStylus, &devinfo));
 
@@ -208,7 +197,7 @@ TEST_F(EventDeviceInfoTest, OnScreenStylus) {
   EXPECT_EQ(ui::InputDeviceType::INPUT_DEVICE_INTERNAL, devinfo.device_type());
 }
 
-TEST_F(EventDeviceInfoTest, HammerKeyboard) {
+TEST(EventDeviceInfoTest, HammerKeyboard) {
   EventDeviceInfo devinfo;
   EXPECT_TRUE(CapabilitiesToDeviceInfo(kHammerKeyboard, &devinfo));
 
@@ -222,7 +211,7 @@ TEST_F(EventDeviceInfoTest, HammerKeyboard) {
   EXPECT_EQ(ui::InputDeviceType::INPUT_DEVICE_INTERNAL, devinfo.device_type());
 }
 
-TEST_F(EventDeviceInfoTest, HammerTouchpad) {
+TEST(EventDeviceInfoTest, HammerTouchpad) {
   EventDeviceInfo devinfo;
   EXPECT_TRUE(CapabilitiesToDeviceInfo(kHammerTouchpad, &devinfo));
 

ui/ozone/public/interfaces/overlay_surface_candidate_struct_traits_unittest.cc

@@ -12,16 +12,7 @@
 
 namespace ui {
 
-namespace {
-
-class OverlaySurfaceCandidateStructTraitsTest : public testing::Test {
- public:
-  OverlaySurfaceCandidateStructTraitsTest() {}
-};
-
-}  // namespace
-
-TEST_F(OverlaySurfaceCandidateStructTraitsTest, FieldsEqual) {
+TEST(OverlaySurfaceCandidateStructTraitsTest, FieldsEqual) {
   ui::OverlaySurfaceCandidate input;
 
   input.transform = gfx::OVERLAY_TRANSFORM_FLIP_HORIZONTAL;
@@ -52,7 +43,7 @@ TEST_F(OverlaySurfaceCandidateStructTraitsTest, FieldsEqual) {
   EXPECT_EQ(input.overlay_handled, output.overlay_handled);
 }
 
-TEST_F(OverlaySurfaceCandidateStructTraitsTest, FalseBools) {
+TEST(OverlaySurfaceCandidateStructTraitsTest, FalseBools) {
   ui::OverlaySurfaceCandidate input;
 
   input.is_clipped = false;
@@ -68,7 +59,7 @@ TEST_F(OverlaySurfaceCandidateStructTraitsTest, FalseBools) {
   EXPECT_EQ(input.overlay_handled, output.overlay_handled);
 }
 
-TEST_F(OverlaySurfaceCandidateStructTraitsTest, OverlayStatus) {
+TEST(OverlaySurfaceCandidateStructTraitsTest, OverlayStatus) {
   using OverlayStatusTraits =
       mojo::EnumTraits<ui::ozone::mojom::OverlayStatus, ui::OverlayStatus>;