3 files changed, 6 insertions, 12 deletions
diff --git a/xfa/fxfa/cxfa_ffapp_unittest.cpp b/xfa/fxfa/cxfa_ffapp_unittest.cpp
index fc1d038bac..bd35956c39 100644
--- a/xfa/fxfa/cxfa_ffapp_unittest.cpp
+++ b/xfa/fxfa/cxfa_ffapp_unittest.cpp
@@ -15,9 +15,7 @@
 #include "third_party/base/ptr_util.h"
 #include "xfa/fxfa/cxfa_fileread.h"
 
-class CXFAFileReadTest : public pdfium::FPDF_Test {};
-
-TEST_F(CXFAFileReadTest, NoStreams) {
+TEST(CXFAFileReadTest, NoStreams) {
   std::vector<CPDF_Stream*> streams;
   auto fileread = pdfium::MakeRetain<CXFA_FileRead>(streams);
 
@@ -27,7 +25,7 @@ TEST_F(CXFAFileReadTest, NoStreams) {
   EXPECT_EQ(0xbd, output_buffer[0]);
 }
 
-TEST_F(CXFAFileReadTest, EmptyStreams) {
+TEST(CXFAFileReadTest, EmptyStreams) {
   std::vector<CPDF_Stream*> streams;
   auto stream1 = pdfium::MakeUnique<CPDF_Stream>();
   streams.push_back(stream1.get());
@@ -39,7 +37,7 @@ TEST_F(CXFAFileReadTest, EmptyStreams) {
   EXPECT_EQ(0xbd, output_buffer[0]);
 }
 
-TEST_F(CXFAFileReadTest, NormalStreams) {
+TEST(CXFAFileReadTest, NormalStreams) {
   std::vector<CPDF_Stream*> streams;
   auto stream1 = pdfium::MakeUnique<CPDF_Stream>();
   auto stream2 = pdfium::MakeUnique<CPDF_Stream>();
diff --git a/xfa/fxfa/fm2js/xfa_simpleexpression_unittest.cpp b/xfa/fxfa/fm2js/xfa_simpleexpression_unittest.cpp
index a2c7f1b878..160c4a12c4 100644
--- a/xfa/fxfa/fm2js/xfa_simpleexpression_unittest.cpp
+++ b/xfa/fxfa/fm2js/xfa_simpleexpression_unittest.cpp
@@ -12,9 +12,7 @@
 #include "third_party/base/ptr_util.h"
 #include "xfa/fxfa/fm2js/xfa_lexer.h"
 
-class FMCallExpressionTest : public pdfium::FPDF_Test {};
-
-TEST_F(FMCallExpressionTest, more_than_32_arguments) {
+TEST(FMCallExpressionTest, more_than_32_arguments) {
   // Use sign as it has 3 object parameters at positions 0, 5, and 6.
   auto exp = pdfium::MakeUnique<CXFA_FMIdentifierExpression>(0, L"sign");
 
diff --git a/xfa/fxfa/parser/xfa_utils_unittest.cpp b/xfa/fxfa/parser/xfa_utils_unittest.cpp
index 6a1de85624..aa468136dc 100644
--- a/xfa/fxfa/parser/xfa_utils_unittest.cpp
+++ b/xfa/fxfa/parser/xfa_utils_unittest.cpp
@@ -11,9 +11,7 @@
 #include "testing/test_support.h"
 #include "third_party/base/ptr_util.h"
 
-class XfaUtilsImpTest : public pdfium::FPDF_Test {};
-
-TEST_F(XfaUtilsImpTest, XFA_MapRotation) {
+TEST(XfaUtilsImpTest, XFA_MapRotation) {
   struct TestCase {
     int input;
     int expected_output;
@@ -29,7 +27,7 @@ TEST_F(XfaUtilsImpTest, XFA_MapRotation) {
   }
 }
 
-class XFANodeIteratorTest : public pdfium::FPDF_Test {
+class XFANodeIteratorTest : public testing::Test {
  public:
   class Node {
    public: