[cleanup] Remove underscores from test names in pdfium

Tests written with the GoogleTest framework should
not use underscores in test names.

After this CL, there should be no underscores in
the test names.

Fixed: 42270790
Change-Id: I8a1656a69f3a4bf05b90b69bf9ba6260455b6435
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/125310
Reviewed-by: Lei Zhang <thestig@chromium.org>
Reviewed-by: Thomas Sepez <tsepez@google.com>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Ho Cheung <hocheung@chromium.org>
diff --git a/fxbarcode/cbc_pdf417i_unittest.cpp b/fxbarcode/cbc_pdf417i_unittest.cpp
index bc6bbfb..2dec85d 100644
--- a/fxbarcode/cbc_pdf417i_unittest.cpp
+++ b/fxbarcode/cbc_pdf417i_unittest.cpp
@@ -8,12 +8,12 @@
 
 #include "testing/gtest/include/gtest/gtest.h"
 
-TEST(CBC_PDF417ITest, Normal) {
+TEST(CBCPDF417ITest, Normal) {
   CBC_PDF417I encoder;
   EXPECT_TRUE(encoder.Encode(L"Foo"));
 }
 
-TEST(CBC_PDF417ITest, MaxLength) {
+TEST(CBCPDF417ITest, MaxLength) {
   std::vector<wchar_t> input(2711, L'1');
   CBC_PDF417I encoder;
   EXPECT_FALSE(encoder.Encode(WideStringView(input)));
diff --git a/fxbarcode/datamatrix/BC_DataMatrixWriter_unittest.cpp b/fxbarcode/datamatrix/BC_DataMatrixWriter_unittest.cpp
index 6e87aab..5f7e8bb 100644
--- a/fxbarcode/datamatrix/BC_DataMatrixWriter_unittest.cpp
+++ b/fxbarcode/datamatrix/BC_DataMatrixWriter_unittest.cpp
@@ -12,17 +12,17 @@
 
 using testing::ElementsAreArray;
 
-class CBC_DataMatrixWriterTest : public testing::Test {
+class CBCDataMatrixWriterTest : public testing::Test {
  public:
-  CBC_DataMatrixWriterTest() = default;
-  ~CBC_DataMatrixWriterTest() override = default;
+  CBCDataMatrixWriterTest() = default;
+  ~CBCDataMatrixWriterTest() override = default;
 
   // testing::Test:
   void SetUp() override { BC_Library_Init(); }
   void TearDown() override { BC_Library_Destroy(); }
 };
 
-TEST_F(CBC_DataMatrixWriterTest, Encode) {
+TEST_F(CBCDataMatrixWriterTest, Encode) {
   CBC_DataMatrixWriter writer;
   int32_t width = -1;
   int32_t height = -1;
@@ -134,7 +134,7 @@
   }
 }
 
-TEST_F(CBC_DataMatrixWriterTest, EncodeLimitAlphaNumeric) {
+TEST_F(CBCDataMatrixWriterTest, EncodeLimitAlphaNumeric) {
   CBC_DataMatrixWriter writer;
   int32_t width = -1;
   int32_t height = -1;
@@ -164,7 +164,7 @@
   }
 }
 
-TEST_F(CBC_DataMatrixWriterTest, EncodeLimitNumbers) {
+TEST_F(CBCDataMatrixWriterTest, EncodeLimitNumbers) {
   CBC_DataMatrixWriter writer;
   int32_t width = -1;
   int32_t height = -1;
diff --git a/fxbarcode/pdf417/BC_PDF417Writer_unittest.cpp b/fxbarcode/pdf417/BC_PDF417Writer_unittest.cpp
index b26f51a..2eb126b 100644
--- a/fxbarcode/pdf417/BC_PDF417Writer_unittest.cpp
+++ b/fxbarcode/pdf417/BC_PDF417Writer_unittest.cpp
@@ -12,17 +12,17 @@
 
 using ::testing::ElementsAreArray;
 
-class CBC_PDF417WriterTest : public testing::Test {
+class CBCPDF417WriterTest : public testing::Test {
  public:
-  CBC_PDF417WriterTest() = default;
-  ~CBC_PDF417WriterTest() override = default;
+  CBCPDF417WriterTest() = default;
+  ~CBCPDF417WriterTest() override = default;
 
   // testing::Test:
   void SetUp() override { BC_Library_Init(); }
   void TearDown() override { BC_Library_Destroy(); }
 };
 
-TEST_F(CBC_PDF417WriterTest, Encode) {
+TEST_F(CBCPDF417WriterTest, Encode) {
   CBC_PDF417Writer writer;
 
   {
diff --git a/fxbarcode/qrcode/BC_QRCodeWriter_unittest.cpp b/fxbarcode/qrcode/BC_QRCodeWriter_unittest.cpp
index d16b624..b4feb68 100644
--- a/fxbarcode/qrcode/BC_QRCodeWriter_unittest.cpp
+++ b/fxbarcode/qrcode/BC_QRCodeWriter_unittest.cpp
@@ -12,17 +12,17 @@
 
 using ::testing::ElementsAreArray;
 
-class CBC_QRCodeWriterTest : public testing::Test {
+class CBCQRCodeWriterTest : public testing::Test {
  public:
-  CBC_QRCodeWriterTest() = default;
-  ~CBC_QRCodeWriterTest() override = default;
+  CBCQRCodeWriterTest() = default;
+  ~CBCQRCodeWriterTest() override = default;
 
   // testing::Test:
   void SetUp() override { BC_Library_Init(); }
   void TearDown() override { BC_Library_Destroy(); }
 };
 
-TEST_F(CBC_QRCodeWriterTest, Encode) {
+TEST_F(CBCQRCodeWriterTest, Encode) {
   CBC_QRCodeWriter writer;
   int32_t width;
   int32_t height;
diff --git a/xfa/fde/cfde_texteditengine_unittest.cpp b/xfa/fde/cfde_texteditengine_unittest.cpp
index 8416bae..568e5d1 100644
--- a/xfa/fde/cfde_texteditengine_unittest.cpp
+++ b/xfa/fde/cfde_texteditengine_unittest.cpp
@@ -13,7 +13,7 @@
 
 namespace pdfium {
 
-class CFDE_TextEditEngineTest : public testing::Test {
+class CFDETextEditEngineTest : public testing::Test {
  public:
   class Delegate final : public CFDE_TextEditEngine::Delegate {
    public:
@@ -37,8 +37,8 @@
     bool text_is_full = false;
   };
 
-  CFDE_TextEditEngineTest() = default;
-  ~CFDE_TextEditEngineTest() override = default;
+  CFDETextEditEngineTest() = default;
+  ~CFDETextEditEngineTest() override = default;
 
   void SetUp() override {
     const wchar_t kFontFamily[] = L"Arimo Bold";
@@ -62,7 +62,7 @@
   std::unique_ptr<CFDE_TextEditEngine> engine_;
 };
 
-TEST_F(CFDE_TextEditEngineTest, Insert) {
+TEST_F(CFDETextEditEngineTest, Insert) {
   EXPECT_EQ(L"", engine()->GetText());
 
   engine()->Insert(0, L"");
@@ -100,7 +100,7 @@
   engine()->Clear();
 
   // With Delegate
-  auto delegate = std::make_unique<CFDE_TextEditEngineTest::Delegate>();
+  auto delegate = std::make_unique<CFDETextEditEngineTest::Delegate>();
   engine()->SetDelegate(delegate.get());
 
   engine()->SetCharacterLimit(5);
@@ -167,7 +167,7 @@
   engine()->SetDelegate(nullptr);
 }
 
-TEST_F(CFDE_TextEditEngineTest, InsertToggleLimit) {
+TEST_F(CFDETextEditEngineTest, InsertToggleLimit) {
   engine()->SetHasCharacterLimit(true);
   engine()->Insert(0, L"Hello World");
   engine()->SetCharacterLimit(5);
@@ -181,7 +181,7 @@
   EXPECT_EQ(L"Inserted before Hello World", engine()->GetText());
 }
 
-TEST_F(CFDE_TextEditEngineTest, InsertSkipNotify) {
+TEST_F(CFDETextEditEngineTest, InsertSkipNotify) {
   engine()->SetHasCharacterLimit(true);
   engine()->SetCharacterLimit(8);
   engine()->Insert(0, L"Hello");
@@ -199,7 +199,7 @@
   EXPECT_EQ(L"*HelloWorld", engine()->GetText());
 }
 
-TEST_F(CFDE_TextEditEngineTest, InsertGrowGap) {
+TEST_F(CFDETextEditEngineTest, InsertGrowGap) {
   engine()->Insert(0, L"||");
   for (size_t i = 1; i < 1023; ++i) {
     engine()->Insert(i, L"a");
@@ -214,7 +214,7 @@
   EXPECT_EQ(result[1023], L'|');
 }
 
-TEST_F(CFDE_TextEditEngineTest, Delete) {
+TEST_F(CFDETextEditEngineTest, Delete) {
   EXPECT_EQ(L"", engine()->Delete(0, 50));
   EXPECT_EQ(L"", engine()->GetText());
 
@@ -231,7 +231,7 @@
   EXPECT_EQ(L"H", engine()->GetText());
 }
 
-TEST_F(CFDE_TextEditEngineTest, Clear) {
+TEST_F(CFDETextEditEngineTest, Clear) {
   EXPECT_EQ(L"", engine()->GetText());
 
   engine()->Clear();
@@ -245,7 +245,7 @@
   EXPECT_EQ(0U, engine()->GetLength());
 }
 
-TEST_F(CFDE_TextEditEngineTest, GetChar) {
+TEST_F(CFDETextEditEngineTest, GetChar) {
   // Out of bounds.
   EXPECT_EQ(L'\0', engine()->GetChar(0));
 
@@ -265,7 +265,7 @@
   EXPECT_EQ(L'+', engine()->GetChar(8));
 }
 
-TEST_F(CFDE_TextEditEngineTest, GetWidthOfChar) {
+TEST_F(CFDETextEditEngineTest, GetWidthOfChar) {
   // Out of Bounds.
   EXPECT_EQ(0, engine()->GetWidthOfChar(0));
 
@@ -277,11 +277,11 @@
   EXPECT_EQ(0, engine()->GetWidthOfChar(0));
 }
 
-TEST_F(CFDE_TextEditEngineTest, GetDisplayPos) {
+TEST_F(CFDETextEditEngineTest, GetDisplayPos) {
   EXPECT_EQ(0U, engine()->GetDisplayPos(FDE_TEXTEDITPIECE()).size());
 }
 
-TEST_F(CFDE_TextEditEngineTest, Selection) {
+TEST_F(CFDETextEditEngineTest, Selection) {
   EXPECT_FALSE(engine()->HasSelection());
   engine()->SelectAll();
   EXPECT_FALSE(engine()->HasSelection());
@@ -359,7 +359,7 @@
   EXPECT_EQ(L"Hello World", engine()->GetText());
 }
 
-TEST_F(CFDE_TextEditEngineTest, UndoRedo) {
+TEST_F(CFDETextEditEngineTest, UndoRedo) {
   EXPECT_FALSE(engine()->CanUndo());
   EXPECT_FALSE(engine()->CanRedo());
   EXPECT_FALSE(engine()->Undo());
@@ -463,7 +463,7 @@
   EXPECT_EQ(L"Hell", engine()->GetText());
 }
 
-TEST_F(CFDE_TextEditEngineTest, GetIndexForPoint) {
+TEST_F(CFDETextEditEngineTest, GetIndexForPoint) {
   engine()->SetFontSize(10.0f);
   engine()->Insert(0, L"Hello World");
   EXPECT_EQ(0U, engine()->GetIndexForPoint({0.0f, 0.0f}));
@@ -473,7 +473,7 @@
   EXPECT_EQ(2U, engine()->GetIndexForPoint({10.0f, 5.0f}));
 }
 
-TEST_F(CFDE_TextEditEngineTest, GetIndexForPointLineWrap) {
+TEST_F(CFDETextEditEngineTest, GetIndexForPointLineWrap) {
   engine()->SetFontSize(10.0f);
   engine()->Insert(0,
                    L"A text long enough to span multiple lines and test "
@@ -486,7 +486,7 @@
   EXPECT_EQ(2U, engine()->GetIndexForPoint({10.0f, 5.0f}));
 }
 
-TEST_F(CFDE_TextEditEngineTest, GetIndexForPointSpaceAtEnd) {
+TEST_F(CFDETextEditEngineTest, GetIndexForPointSpaceAtEnd) {
   engine()->SetFontSize(10.0f);
   engine()->Insert(0, L"Hello World ");
   EXPECT_EQ(0U, engine()->GetIndexForPoint({0.0f, 0.0f}));
@@ -494,7 +494,7 @@
   EXPECT_EQ(12U, engine()->GetIndexForPoint({999999.0f, 0.0f}));
 }
 
-TEST_F(CFDE_TextEditEngineTest, GetIndexForPointLineBreaks) {
+TEST_F(CFDETextEditEngineTest, GetIndexForPointLineBreaks) {
   engine()->SetFontSize(10.0f);
   engine()->Insert(0, L"Hello\nWorld");
   EXPECT_EQ(0U, engine()->GetIndexForPoint({0.0f, 0.0f}));
@@ -503,7 +503,7 @@
   EXPECT_EQ(11U, engine()->GetIndexForPoint({999999.0f, 9999999.0f}));
 }
 
-TEST_F(CFDE_TextEditEngineTest, CanGenerateCharacterInfo) {
+TEST_F(CFDETextEditEngineTest, CanGenerateCharacterInfo) {
   RetainPtr<CFGAS_GEFont> font = engine()->GetFont();
   ASSERT_TRUE(font);
 
@@ -523,7 +523,7 @@
   EXPECT_FALSE(engine()->CanGenerateCharacterInfo());
 }
 
-TEST_F(CFDE_TextEditEngineTest, GetCharacterInfo) {
+TEST_F(CFDETextEditEngineTest, GetCharacterInfo) {
   std::pair<int32_t, CFX_RectF> char_info;
 
   engine()->Insert(0, L"Hi!");
@@ -561,7 +561,7 @@
   EXPECT_FLOAT_EQ(12.0f, char_info.second.Height());
 }
 
-TEST_F(CFDE_TextEditEngineTest, BoundsForWordAt) {
+TEST_F(CFDETextEditEngineTest, BoundsForWordAt) {
   auto [start_idx, count] = engine()->BoundsForWordAt(100);
   EXPECT_EQ(0U, start_idx);
   EXPECT_EQ(0U, count);
@@ -712,7 +712,7 @@
   }
 }
 
-TEST_F(CFDE_TextEditEngineTest, CursorMovement) {
+TEST_F(CFDETextEditEngineTest, CursorMovement) {
   engine()->Clear();
   engine()->Insert(0, L"Hello");
 
diff --git a/xfa/fgas/crt/cfgas_decimal_unittest.cpp b/xfa/fgas/crt/cfgas_decimal_unittest.cpp
index 711cb23..e31a5e0 100644
--- a/xfa/fgas/crt/cfgas_decimal_unittest.cpp
+++ b/xfa/fgas/crt/cfgas_decimal_unittest.cpp
@@ -10,35 +10,35 @@
 
 #include "testing/gtest/include/gtest/gtest.h"
 
-TEST(CFGAS_Decimal, Empty) {
+TEST(CFGASDecimalTest, Empty) {
   CFGAS_Decimal empty;
   EXPECT_EQ(L"0", empty.ToWideString());
   EXPECT_EQ(0.0f, empty.ToFloat());
   EXPECT_EQ(0.0, empty.ToDouble());
 }
 
-TEST(CFGAS_Decimal, FromInt32) {
+TEST(CFGASDecimalTest, FromInt32) {
   CFGAS_Decimal big(std::numeric_limits<int32_t>::max());
   CFGAS_Decimal small(std::numeric_limits<int32_t>::min());
   EXPECT_EQ(L"2147483647", big.ToWideString());
   EXPECT_EQ(L"-2147483648", small.ToWideString());
 }
 
-TEST(CFGAS_Decimal, FromUint32) {
+TEST(CFGASDecimalTest, FromUint32) {
   CFGAS_Decimal big(std::numeric_limits<uint32_t>::max());
   CFGAS_Decimal small(std::numeric_limits<uint32_t>::min());
   EXPECT_EQ(L"4294967295", big.ToWideString());
   EXPECT_EQ(L"0", small.ToWideString());
 }
 
-TEST(CFGAS_Decimal, FromUint64) {
+TEST(CFGASDecimalTest, FromUint64) {
   CFGAS_Decimal big(std::numeric_limits<uint64_t>::max());
   CFGAS_Decimal small(std::numeric_limits<uint64_t>::min());
   EXPECT_EQ(L"18446744073709551615", big.ToWideString());
   EXPECT_EQ(L"0", small.ToWideString());
 }
 
-TEST(CFGAS_Decimal, FromFloat) {
+TEST(CFGASDecimalTest, FromFloat) {
   WideString big = CFGAS_Decimal(powf(2.0f, 95.0f), 0).ToWideString();
   WideString big_expected = L"39614081257132168796771975168";
 
@@ -57,7 +57,7 @@
   EXPECT_EQ(teeny_expected.First(8).c_str(), teeny.First(8));
 }
 
-TEST(CFGAS_Decimal, FromFloatFractional) {
+TEST(CFGASDecimalTest, FromFloatFractional) {
   WideString case1 = CFGAS_Decimal(123.456f, 10).ToWideString();
   WideString case1_expected = L"123.4560000000";
 
@@ -66,14 +66,14 @@
   EXPECT_EQ(case1_expected.First(8).c_str(), case1.First(8));
 }
 
-TEST(CFGAS_Decimal, FromString) {
+TEST(CFGASDecimalTest, FromString) {
   CFGAS_Decimal big(L"100000000000000000000000000");
   CFGAS_Decimal small(L"-1000000000000000000000000");
   EXPECT_EQ(L"100000000000000000000000000", big.ToWideString());
   EXPECT_EQ(L"-1000000000000000000000000", small.ToWideString());
 }
 
-TEST(CFGAS_Decimal, FromString28Digits) {
+TEST(CFGASDecimalTest, FromString28Digits) {
   CFGAS_Decimal frac(L"32109876543210.0123456890123");
   EXPECT_EQ(L"32109876543210.0123456890123", frac.ToWideString());
 }
diff --git a/xfa/fgas/crt/cfgas_stringformatter_unittest.cpp b/xfa/fgas/crt/cfgas_stringformatter_unittest.cpp
index ba2db0d..75fe732 100644
--- a/xfa/fgas/crt/cfgas_stringformatter_unittest.cpp
+++ b/xfa/fgas/crt/cfgas_stringformatter_unittest.cpp
@@ -21,11 +21,11 @@
 
 using ::testing::ElementsAre;
 
-class CFGAS_StringFormatterTest : public FXGCUnitTest {
+class CFGASStringFormatterTest : public FXGCUnitTest {
  public:
-  CFGAS_StringFormatterTest() : scoped_tz_("UTC") { CPDF_PageModule::Create(); }
+  CFGASStringFormatterTest() : scoped_tz_("UTC") { CPDF_PageModule::Create(); }
 
-  ~CFGAS_StringFormatterTest() override { CPDF_PageModule::Destroy(); }
+  ~CFGASStringFormatterTest() override { CPDF_PageModule::Destroy(); }
 
   CXFA_LocaleMgr* Mgr(const WideString& locale) {
     return cppgc::MakeGarbageCollected<CXFA_LocaleMgr>(
@@ -38,7 +38,7 @@
 
 // TODO(dsinclair): Looks like the formatter/parser does not handle the various
 // 'g' flags.
-TEST_F(CFGAS_StringFormatterTest, DateFormat) {
+TEST_F(CFGASStringFormatterTest, DateFormat) {
   struct {
     const wchar_t* locale;
     const wchar_t* input;
@@ -105,7 +105,7 @@
   }
 }
 
-TEST_F(CFGAS_StringFormatterTest, TimeFormat) {
+TEST_F(CFGASStringFormatterTest, TimeFormat) {
   static const struct {
     const wchar_t* locale;
     const wchar_t* input;
@@ -159,7 +159,7 @@
   }
 }
 
-TEST_F(CFGAS_StringFormatterTest, DateTimeFormat) {
+TEST_F(CFGASStringFormatterTest, DateTimeFormat) {
   static const struct {
     const wchar_t* locale;
     const wchar_t* input;
@@ -192,7 +192,7 @@
   }
 }
 
-TEST_F(CFGAS_StringFormatterTest, TimeDateFormat) {
+TEST_F(CFGASStringFormatterTest, TimeDateFormat) {
   static const struct {
     const wchar_t* locale;
     const wchar_t* input;
@@ -223,7 +223,7 @@
   }
 }
 
-TEST_F(CFGAS_StringFormatterTest, DateParse) {
+TEST_F(CFGASStringFormatterTest, DateParse) {
   static const struct {
     const wchar_t* locale;
     const wchar_t* input;
@@ -289,7 +289,7 @@
 
 // TODO(dsinclair): GetDateTimeFormat is broken and doesn't allow just returning
 // a parsed Time. It will assume it's a Date. The method needs to be re-written.
-// TEST_F(CFGAS_StringFormatterTest, TimeParse) {
+// TEST_F(CFGASStringFormatterTest, TimeParse) {
 //   struct {
 //     const wchar_t* locale;
 //     const wchar_t* input;
@@ -315,7 +315,7 @@
 //   }
 // }
 
-TEST_F(CFGAS_StringFormatterTest, SplitFormatString) {
+TEST_F(CFGASStringFormatterTest, SplitFormatString) {
   std::vector<WideString> results = CFGAS_StringFormatter::SplitOnBars(L"");
   EXPECT_EQ(1UL, results.size());
   EXPECT_TRUE(results[0].IsEmpty());
@@ -332,7 +332,7 @@
                           L" text{999*999*9999}"));
 }
 
-TEST_F(CFGAS_StringFormatterTest, NumParse) {
+TEST_F(CFGASStringFormatterTest, NumParse) {
   struct TestCase {
     const wchar_t* locale;
     const wchar_t* input;
@@ -480,7 +480,7 @@
   }
 }
 
-TEST_F(CFGAS_StringFormatterTest, NumFormat) {
+TEST_F(CFGASStringFormatterTest, NumFormat) {
   struct TestCase {
     const wchar_t* locale;
     const wchar_t* input;
@@ -611,7 +611,7 @@
   }
 }
 
-TEST_F(CFGAS_StringFormatterTest, TextParse) {
+TEST_F(CFGASStringFormatterTest, TextParse) {
   static const struct {
     const wchar_t* input;
     const wchar_t* pattern;
@@ -636,14 +636,14 @@
   }
 }
 
-TEST_F(CFGAS_StringFormatterTest, InvalidTextParse) {
+TEST_F(CFGASStringFormatterTest, InvalidTextParse) {
   // Input does not match mask.
   WideString result;
   CFGAS_StringFormatter fmt(L"AAA-9999-X");
   EXPECT_FALSE(fmt.ParseText(L"123-4567-8", &result));
 }
 
-TEST_F(CFGAS_StringFormatterTest, TextFormat) {
+TEST_F(CFGASStringFormatterTest, TextFormat) {
   static const struct {
     const wchar_t* locale;
     const wchar_t* input;
@@ -669,7 +669,7 @@
   }
 }
 
-TEST_F(CFGAS_StringFormatterTest, NullParse) {
+TEST_F(CFGASStringFormatterTest, NullParse) {
   static const struct {
     const wchar_t* input;
     const wchar_t* pattern;
@@ -685,7 +685,7 @@
   }
 }
 
-TEST_F(CFGAS_StringFormatterTest, NullFormat) {
+TEST_F(CFGASStringFormatterTest, NullFormat) {
   static const struct {
     const wchar_t* pattern;
     const wchar_t* output;
@@ -701,7 +701,7 @@
   }
 }
 
-TEST_F(CFGAS_StringFormatterTest, ZeroParse) {
+TEST_F(CFGASStringFormatterTest, ZeroParse) {
   static const struct {
     const wchar_t* input;
     const wchar_t* pattern;
@@ -715,7 +715,7 @@
   }
 }
 
-TEST_F(CFGAS_StringFormatterTest, ZeroFormat) {
+TEST_F(CFGASStringFormatterTest, ZeroFormat) {
   static const struct {
     const wchar_t* input;
     const wchar_t* pattern;
@@ -737,7 +737,7 @@
   }
 }
 
-TEST_F(CFGAS_StringFormatterTest, GetCategory) {
+TEST_F(CFGASStringFormatterTest, GetCategory) {
   EXPECT_EQ(CFGAS_StringFormatter::Category::kUnknown,
             CFGAS_StringFormatter(L"'just text'").GetCategory());
   EXPECT_EQ(CFGAS_StringFormatter::Category::kNull,
diff --git a/xfa/fgas/layout/cfgas_rtfbreak_unittest.cpp b/xfa/fgas/layout/cfgas_rtfbreak_unittest.cpp
index 225fe18..ec2e8c8 100644
--- a/xfa/fgas/layout/cfgas_rtfbreak_unittest.cpp
+++ b/xfa/fgas/layout/cfgas_rtfbreak_unittest.cpp
@@ -17,7 +17,7 @@
 #include "xfa/fgas/font/cfgas_gefont.h"
 #include "xfa/fgas/layout/cfgas_char.h"
 
-class CFGAS_RTFBreakTest : public testing::Test {
+class CFGASRTFBreakTest : public testing::Test {
  public:
   void SetUp() override {
     const wchar_t kFontFamily[] = L"Arimo Bold";
@@ -39,7 +39,7 @@
 // As soon as you get one of the control characters the break is complete
 // and must be consumed before you get any more characters ....
 
-TEST_F(CFGAS_RTFBreakTest, AddChars) {
+TEST_F(CFGASRTFBreakTest, AddChars) {
   auto rtf_break = CreateBreak(CFGAS_Break::LayoutStyle::kExpandTab);
   WideString str(L"Input String.");
   for (wchar_t ch : str)
@@ -63,7 +63,7 @@
   EXPECT_EQ(str, rtf_break->GetBreakPieceUnstable(0)->GetString());
 }
 
-TEST_F(CFGAS_RTFBreakTest, ControlCharacters) {
+TEST_F(CFGASRTFBreakTest, ControlCharacters) {
   auto rtf_break = CreateBreak(CFGAS_Break::LayoutStyle::kExpandTab);
   EXPECT_EQ(CFGAS_Char::BreakType::kLine, rtf_break->AppendChar(L'\v'));
   EXPECT_EQ(CFGAS_Char::BreakType::kPage, rtf_break->AppendChar(L'\f'));
@@ -75,7 +75,7 @@
   EXPECT_EQ(L"\v", rtf_break->GetBreakPieceUnstable(0)->GetString());
 }
 
-TEST_F(CFGAS_RTFBreakTest, BidiLine) {
+TEST_F(CFGASRTFBreakTest, BidiLine) {
   auto rtf_break = CreateBreak(CFGAS_Break::LayoutStyle::kExpandTab);
   rtf_break->SetLineBreakTolerance(1);
   rtf_break->SetFontSize(12);
diff --git a/xfa/fgas/layout/cfgas_txtbreak_unittest.cpp b/xfa/fgas/layout/cfgas_txtbreak_unittest.cpp
index d0e39dd..a8b108d 100644
--- a/xfa/fgas/layout/cfgas_txtbreak_unittest.cpp
+++ b/xfa/fgas/layout/cfgas_txtbreak_unittest.cpp
@@ -14,7 +14,7 @@
 #include "xfa/fgas/font/cfgas_gefont.h"
 #include "xfa/fgas/layout/cfgas_char.h"
 
-class CFGAS_TxtBreakTest : public testing::Test {
+class CFGASTxtBreakTest : public testing::Test {
  public:
   void SetUp() override {
     const wchar_t kFontFamily[] = L"Arimo Bold";
@@ -32,7 +32,7 @@
   RetainPtr<CFGAS_GEFont> font_;
 };
 
-TEST_F(CFGAS_TxtBreakTest, BidiLine) {
+TEST_F(CFGASTxtBreakTest, BidiLine) {
   auto txt_break = CreateBreak();
   txt_break->SetLineBreakTolerance(1);
   txt_break->SetFontSize(12);
diff --git a/xfa/fxfa/cxfa_ffbarcode_unittest.cpp b/xfa/fxfa/cxfa_ffbarcode_unittest.cpp
index ac6df65..d2b60be 100644
--- a/xfa/fxfa/cxfa_ffbarcode_unittest.cpp
+++ b/xfa/fxfa/cxfa_ffbarcode_unittest.cpp
@@ -6,7 +6,7 @@
 
 #include "testing/gtest/include/gtest/gtest.h"
 
-TEST(CXFA_FFBarcode, GetBarcodeTypeByName) {
+TEST(CXFAFFBarcodeTest, GetBarcodeTypeByName) {
   EXPECT_EQ(BC_TYPE::kUnknown, CXFA_FFBarcode::GetBarcodeTypeByName(L""));
   EXPECT_EQ(BC_TYPE::kUnknown,
             CXFA_FFBarcode::GetBarcodeTypeByName(L"not_found"));
diff --git a/xfa/fxfa/formcalc/cxfa_fmlexer_unittest.cpp b/xfa/fxfa/formcalc/cxfa_fmlexer_unittest.cpp
index 68e8832..6464e09 100644
--- a/xfa/fxfa/formcalc/cxfa_fmlexer_unittest.cpp
+++ b/xfa/fxfa/formcalc/cxfa_fmlexer_unittest.cpp
@@ -9,7 +9,7 @@
 
 #include "testing/gtest/include/gtest/gtest.h"
 
-TEST(CXFA_FMLexerTest, NullString) {
+TEST(CXFAFMLexerTest, NullString) {
   WideStringView null_string;
   CXFA_FMLexer lexer(null_string);
   CXFA_FMLexer::Token token = lexer.NextToken();
@@ -17,14 +17,14 @@
   EXPECT_TRUE(lexer.IsComplete());
 }
 
-TEST(CXFA_FMLexerTest, EmptyString) {
+TEST(CXFAFMLexerTest, EmptyString) {
   CXFA_FMLexer lexer(L"");
   CXFA_FMLexer::Token token = lexer.NextToken();
   EXPECT_EQ(TOKeof, token.GetType());
   EXPECT_TRUE(lexer.IsComplete());
 }
 
-TEST(CXFA_FMLexerTest, Numbers) {
+TEST(CXFAFMLexerTest, Numbers) {
   {
     CXFA_FMLexer lexer(L"-12");
     CXFA_FMLexer::Token token = lexer.NextToken();
@@ -80,7 +80,7 @@
 }
 
 // The quotes are stripped in CXFA_FMStringExpression::ToJavaScript.
-TEST(CXFA_FMLexerTest, Strings) {
+TEST(CXFAFMLexerTest, Strings) {
   {
     CXFA_FMLexer lexer(L"\"The cat jumped over the fence.\"");
     CXFA_FMLexer::Token token = lexer.NextToken();
@@ -117,7 +117,7 @@
 }
 
 // Note, 'this' is a keyword but is not matched by the lexer.
-TEST(CXFA_FMLexerTest, OperatorsAndKeywords) {
+TEST(CXFAFMLexerTest, OperatorsAndKeywords) {
   static const struct {
     const wchar_t* op;
     XFA_FM_TOKEN token;
@@ -189,7 +189,7 @@
   }
 }
 
-TEST(CXFA_FMLexerTest, Comments) {
+TEST(CXFAFMLexerTest, Comments) {
   {
     CXFA_FMLexer lexer(L"// Empty.");
     CXFA_FMLexer::Token token = lexer.NextToken();
@@ -239,7 +239,7 @@
   }
 }
 
-TEST(CXFA_FMLexerTest, ValidIdentifiers) {
+TEST(CXFAFMLexerTest, ValidIdentifiers) {
   std::vector<const wchar_t*> identifiers = {
       L"a", L"an_identifier", L"_ident", L"$ident", L"!ident", L"GetAddr"};
   for (const auto* ident : identifiers) {
@@ -251,7 +251,7 @@
   }
 }
 
-TEST(CXFA_FMLexerTest, InvalidIdentifiers) {
+TEST(CXFAFMLexerTest, InvalidIdentifiers) {
   {
     CXFA_FMLexer lexer(L"#a");
     CXFA_FMLexer::Token token = lexer.NextToken();
@@ -281,7 +281,7 @@
   }
 }
 
-TEST(CXFA_FMLexerTest, Whitespace) {
+TEST(CXFAFMLexerTest, Whitespace) {
   {
     CXFA_FMLexer lexer(L" \t\xc\x9\xb");
     CXFA_FMLexer::Token token = lexer.NextToken();
@@ -303,7 +303,7 @@
   }
 }
 
-TEST(CXFA_FMLexerTest, NullData) {
+TEST(CXFAFMLexerTest, NullData) {
   CXFA_FMLexer lexer(
       // SAFETY: required for test, manual length computation for fixed string.
       UNSAFE_BUFFERS(WideStringView(L"\x2d\x32\x00\x2d\x32", 5)));
diff --git a/xfa/fxfa/formcalc/cxfa_fmparser_unittest.cpp b/xfa/fxfa/formcalc/cxfa_fmparser_unittest.cpp
index 3e7ac41..53dc9aa 100644
--- a/xfa/fxfa/formcalc/cxfa_fmparser_unittest.cpp
+++ b/xfa/fxfa/formcalc/cxfa_fmparser_unittest.cpp
@@ -9,9 +9,9 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "xfa/fxfa/formcalc/cxfa_fmtojavascriptdepth.h"
 
-class CXFA_FMParserTest : public FXGCUnitTest {};
+class CXFAFMParserTest : public FXGCUnitTest {};
 
-TEST_F(CXFA_FMParserTest, Empty) {
+TEST_F(CXFAFMParserTest, Empty) {
   CXFA_FMLexer lexer(L"");
   CXFA_FMParser parser(heap(), &lexer);
   CXFA_FMAST* ast = parser.Parse();
@@ -25,7 +25,7 @@
   EXPECT_EQ(L"// comments only", buf.value().MakeString());
 }
 
-TEST_F(CXFA_FMParserTest, CommentOnlyIsError) {
+TEST_F(CXFAFMParserTest, CommentOnlyIsError) {
   CXFA_FMLexer lexer(L"; Just comment");
   CXFA_FMParser parser(heap(), &lexer);
   CXFA_FMAST* ast = parser.Parse();
@@ -40,7 +40,7 @@
   EXPECT_EQ(L"// comments only", buf.value().MakeString());
 }
 
-TEST_F(CXFA_FMParserTest, CommentThenValue) {
+TEST_F(CXFAFMParserTest, CommentThenValue) {
   const wchar_t ret[] =
       LR"***((function() {
 let pfm_method_runner = function(obj, cb) {
@@ -70,7 +70,7 @@
   EXPECT_EQ(ret, buf.value().MakeString());
 }
 
-TEST_F(CXFA_FMParserTest, Parse) {
+TEST_F(CXFAFMParserTest, Parse) {
   const wchar_t input[] =
       LR"***($ = Avg (-3, 5, -6, 12, -13);
 $ = Avg (Table2..Row[*].Cell1);
@@ -140,7 +140,7 @@
   EXPECT_EQ(ret, buf.value().AsStringView());
 }
 
-TEST_F(CXFA_FMParserTest, MaxParseDepth) {
+TEST_F(CXFAFMParserTest, MaxParseDepth) {
   CXFA_FMLexer lexer(L"foo(bar[baz(fizz[0])])");
   CXFA_FMParser parser(heap(), &lexer);
   parser.SetMaxParseDepthForTest(5);
@@ -148,7 +148,7 @@
   EXPECT_TRUE(parser.HasError());
 }
 
-TEST_F(CXFA_FMParserTest, chromium752201) {
+TEST_F(CXFAFMParserTest, chromium752201) {
   CXFA_FMLexer lexer(
       LR"***(fTep a
 .#
@@ -159,7 +159,7 @@
   EXPECT_TRUE(parser.HasError());
 }
 
-TEST_F(CXFA_FMParserTest, MultipleAssignmentIsNotAllowed) {
+TEST_F(CXFAFMParserTest, MultipleAssignmentIsNotAllowed) {
   CXFA_FMLexer lexer(L"(a=(b=t))=u");
   CXFA_FMParser parser(heap(), &lexer);
   CXFA_FMAST* ast = parser.Parse();
@@ -167,7 +167,7 @@
   EXPECT_TRUE(parser.HasError());
 }
 
-TEST_F(CXFA_FMParserTest, ParseFuncWithParams) {
+TEST_F(CXFAFMParserTest, ParseFuncWithParams) {
   const wchar_t input[] =
       LR"***(func MyFunction(param1, param2) do
   param1 * param2
@@ -206,7 +206,7 @@
   EXPECT_EQ(ret, buf.value().MakeString());
 }
 
-TEST_F(CXFA_FMParserTest, ParseFuncWithoutParams) {
+TEST_F(CXFAFMParserTest, ParseFuncWithoutParams) {
   const wchar_t input[] =
       LR"***(func MyFunction() do
   42
@@ -245,7 +245,7 @@
   EXPECT_EQ(ret, buf.value().MakeString());
 }
 
-TEST_F(CXFA_FMParserTest, ParseFuncWithBadParamsList) {
+TEST_F(CXFAFMParserTest, ParseFuncWithBadParamsList) {
   const wchar_t input[] =
       LR"***(func MyFunction(param1,) do
   param1 * param2
@@ -258,7 +258,7 @@
   EXPECT_TRUE(parser.HasError());
 }
 
-TEST_F(CXFA_FMParserTest, ParseBadIfExpression) {
+TEST_F(CXFAFMParserTest, ParseBadIfExpression) {
   const wchar_t input[] = L"if ( then";
   CXFA_FMLexer lexer(input);
   CXFA_FMParser parser(heap(), &lexer);
@@ -267,7 +267,7 @@
   EXPECT_TRUE(parser.HasError());
 }
 
-TEST_F(CXFA_FMParserTest, ParseBadElseIfExpression) {
+TEST_F(CXFAFMParserTest, ParseBadElseIfExpression) {
   const wchar_t input[] =
       LR"***(if ($ ne -1) then"
 elseif( then)***";
@@ -279,7 +279,7 @@
   EXPECT_TRUE(parser.HasError());
 }
 
-TEST_F(CXFA_FMParserTest, ParseDepthWithWideTree) {
+TEST_F(CXFAFMParserTest, ParseDepthWithWideTree) {
   const wchar_t input[] = L"a <> b <> c <> d <> e <> f <> g <> h <> i <> j";
 
   {
@@ -300,7 +300,7 @@
   }
 }
 
-TEST_F(CXFA_FMParserTest, ParseCallSmall) {
+TEST_F(CXFAFMParserTest, ParseCallSmall) {
   const wchar_t input[] = L"i.f(O)";
   const wchar_t ret[] =
       LR"***((function() {
@@ -334,7 +334,7 @@
   EXPECT_EQ(ret, buf.value().MakeString());
 }
 
-TEST_F(CXFA_FMParserTest, ParseCallBig) {
+TEST_F(CXFAFMParserTest, ParseCallBig) {
   const wchar_t input[] = L"i.f(O.e(O.e(O)))";
   const wchar_t ret[] =
       LR"***((function() {
@@ -376,7 +376,7 @@
   EXPECT_EQ(ret, buf.value().MakeString());
 }
 
-TEST_F(CXFA_FMParserTest, ParseVar) {
+TEST_F(CXFAFMParserTest, ParseVar) {
   const wchar_t input[] = LR"(var s = "")";
   const wchar_t ret[] =
       LR"***((function() {
@@ -408,7 +408,7 @@
   EXPECT_EQ(ret, buf.value().MakeString());
 }
 
-TEST_F(CXFA_FMParserTest, ParseFunctionCallNoArguments) {
+TEST_F(CXFAFMParserTest, ParseFunctionCallNoArguments) {
   const wchar_t input[] = L"P.x()";
   const wchar_t ret[] =
       LR"***((function() {
@@ -442,7 +442,7 @@
   EXPECT_EQ(ret, buf.value().MakeString());
 }
 
-TEST_F(CXFA_FMParserTest, ParseFunctionCallSingleArgument) {
+TEST_F(CXFAFMParserTest, ParseFunctionCallSingleArgument) {
   const wchar_t input[] = L"P.x(foo)";
   const wchar_t ret[] =
       LR"***((function() {
@@ -476,7 +476,7 @@
   EXPECT_EQ(ret, buf.value().MakeString());
 }
 
-TEST_F(CXFA_FMParserTest, ParseFunctionCallMultipleArguments) {
+TEST_F(CXFAFMParserTest, ParseFunctionCallMultipleArguments) {
   const wchar_t input[] = L"P.x(foo, bar, baz)";
   const wchar_t ret[] =
       LR"***((function() {
@@ -510,7 +510,7 @@
   EXPECT_EQ(ret, buf.value().MakeString());
 }
 
-TEST_F(CXFA_FMParserTest, ParseFunctionCallMissingCommas) {
+TEST_F(CXFAFMParserTest, ParseFunctionCallMissingCommas) {
   const wchar_t input[] = L"P.x(!foo!bar!baz)";
   CXFA_FMLexer lexer(input);
   CXFA_FMParser parser(heap(), &lexer);
@@ -519,7 +519,7 @@
   EXPECT_TRUE(parser.HasError());
 }
 
-TEST_F(CXFA_FMParserTest, ParseFunctionCallTrailingComma) {
+TEST_F(CXFAFMParserTest, ParseFunctionCallTrailingComma) {
   const wchar_t input[] = L"P.x(foo,bar,baz,)";
   CXFA_FMLexer lexer(input);
   CXFA_FMParser parser(heap(), &lexer);
@@ -528,7 +528,7 @@
   EXPECT_TRUE(parser.HasError());
 }
 
-TEST_F(CXFA_FMParserTest, ParseFunctionCallExtraComma) {
+TEST_F(CXFAFMParserTest, ParseFunctionCallExtraComma) {
   const wchar_t input[] = L"P.x(foo,bar,,baz)";
   CXFA_FMLexer lexer(input);
   CXFA_FMParser parser(heap(), &lexer);
diff --git a/xfa/fxfa/parser/cxfa_document.h b/xfa/fxfa/parser/cxfa_document.h
index cb749f5..9be9b24 100644
--- a/xfa/fxfa/parser/cxfa_document.h
+++ b/xfa/fxfa/parser/cxfa_document.h
@@ -146,9 +146,9 @@
   void SetPendingNodesUnusedAndUnbound();
 
  private:
-  friend class CXFA_DocumentTest_ParseXFAVersion_Test;
-  friend class CXFA_DocumentTest_ParseUseHref_Test;
-  friend class CXFA_DocumentTest_ParseUse_Test;
+  friend class CXFADocumentTest_ParseXFAVersion_Test;
+  friend class CXFADocumentTest_ParseUseHref_Test;
+  friend class CXFADocumentTest_ParseUse_Test;
 
   static XFA_VERSION ParseXFAVersion(const WideString& wsTemplateNS);
   static void ParseUseHref(const WideString& wsUseVal,
diff --git a/xfa/fxfa/parser/cxfa_document_builder_unittest.cpp b/xfa/fxfa/parser/cxfa_document_builder_unittest.cpp
index 5e75ac7..f541629 100644
--- a/xfa/fxfa/parser/cxfa_document_builder_unittest.cpp
+++ b/xfa/fxfa/parser/cxfa_document_builder_unittest.cpp
@@ -15,7 +15,7 @@
 #include "v8/include/cppgc/persistent.h"
 #include "xfa/fxfa/parser/cxfa_document.h"
 
-class CXFA_DocumentBuilderTest : public FXGCUnitTest {
+class CXFADocumentBuilderTest : public FXGCUnitTest {
  public:
   void SetUp() override {
     FXGCUnitTest::SetUp();
@@ -46,21 +46,21 @@
   cppgc::Persistent<CXFA_Document> doc_;
 };
 
-TEST_F(CXFA_DocumentBuilderTest, EmptyInput) {
+TEST_F(CXFADocumentBuilderTest, EmptyInput) {
   static const char kInput[] = "";
   auto stream =
       pdfium::MakeRetain<CFX_ReadOnlySpanStream>(pdfium::as_byte_span(kInput));
   EXPECT_FALSE(ParseAndBuild(stream));
 }
 
-TEST_F(CXFA_DocumentBuilderTest, BadInput) {
+TEST_F(CXFADocumentBuilderTest, BadInput) {
   static const char kInput[] = "<<<>bar?>>>>>>>";
   auto stream =
       pdfium::MakeRetain<CFX_ReadOnlySpanStream>(pdfium::as_byte_span(kInput));
   EXPECT_FALSE(ParseAndBuild(stream));
 }
 
-TEST_F(CXFA_DocumentBuilderTest, XMLInstructionsScriptOff) {
+TEST_F(CXFADocumentBuilderTest, XMLInstructionsScriptOff) {
   static const char kInput[] =
       "<config>\n"
       "<?originalXFAVersion http://www.xfa.org/schema/xfa-template/2.7 "
@@ -76,7 +76,7 @@
   EXPECT_FALSE(GetDoc()->is_scripting());
 }
 
-TEST_F(CXFA_DocumentBuilderTest, XMLInstructionsScriptOn) {
+TEST_F(CXFADocumentBuilderTest, XMLInstructionsScriptOn) {
   static const char kInput[] =
       "<config>\n"
       "<?originalXFAVersion http://www.xfa.org/schema/xfa-template/2.7 "
@@ -93,7 +93,7 @@
   EXPECT_TRUE(GetDoc()->is_scripting());
 }
 
-TEST_F(CXFA_DocumentBuilderTest, XMLInstructionsStrictScope) {
+TEST_F(CXFADocumentBuilderTest, XMLInstructionsStrictScope) {
   static const char kInput[] =
       "<config>"
       "<?acrobat JavaScript strictScoping ?>\n"
@@ -109,7 +109,7 @@
   EXPECT_TRUE(GetDoc()->is_strict_scoping());
 }
 
-TEST_F(CXFA_DocumentBuilderTest, XMLInstructionsStrictScopeBad) {
+TEST_F(CXFADocumentBuilderTest, XMLInstructionsStrictScopeBad) {
   static const char kInput[] =
       "<config>"
       "<?acrobat JavaScript otherScoping ?>\n"
@@ -125,7 +125,7 @@
   EXPECT_FALSE(GetDoc()->is_strict_scoping());
 }
 
-TEST_F(CXFA_DocumentBuilderTest, MultipleXMLInstructions) {
+TEST_F(CXFADocumentBuilderTest, MultipleXMLInstructions) {
   static const char kInput[] =
       "<config>"
       "<?originalXFAVersion http://www.xfa.org/schema/xfa-template/2.7 "
diff --git a/xfa/fxfa/parser/cxfa_document_unittest.cpp b/xfa/fxfa/parser/cxfa_document_unittest.cpp
index f1863b6..67f9947 100644
--- a/xfa/fxfa/parser/cxfa_document_unittest.cpp
+++ b/xfa/fxfa/parser/cxfa_document_unittest.cpp
@@ -7,7 +7,7 @@
 #include "core/fxcrt/fx_string.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-TEST(CXFA_DocumentTest, ParseXFAVersion) {
+TEST(CXFADocumentTest, ParseXFAVersion) {
   // Malformed
   EXPECT_EQ(XFA_VERSION_UNKNOWN, CXFA_Document::ParseXFAVersion(L""));
   EXPECT_EQ(XFA_VERSION_UNKNOWN,
@@ -82,7 +82,7 @@
                      L"http://www.xfa.org/schema/xfa-template/3.17"));
 }
 
-TEST(CXFA_DocumentTest, ParseUseHref) {
+TEST(CXFADocumentTest, ParseUseHref) {
   {
     WideString wsEmpty;  // Must outlive views.
     WideStringView wsURI;
@@ -146,7 +146,7 @@
   }
 }
 
-TEST(CXFA_DocumentTest, ParseUse) {
+TEST(CXFADocumentTest, ParseUse) {
   {
     WideString wsUseVal(L"");  // Must outlive views.
     WideStringView wsID;
diff --git a/xfa/fxfa/parser/cxfa_nodeiteratortemplate_unittest.cpp b/xfa/fxfa/parser/cxfa_nodeiteratortemplate_unittest.cpp
index 4692ade..807c772 100644
--- a/xfa/fxfa/parser/cxfa_nodeiteratortemplate_unittest.cpp
+++ b/xfa/fxfa/parser/cxfa_nodeiteratortemplate_unittest.cpp
@@ -9,7 +9,7 @@
 
 #include "testing/gtest/include/gtest/gtest.h"
 
-class CXFA_NodeIteratorTemplateTest : public testing::Test {
+class CXFANodeIteratorTemplateTest : public testing::Test {
  public:
   class Node {
    public:
@@ -92,7 +92,7 @@
   std::unique_ptr<Node> child9_;
 };
 
-TEST_F(CXFA_NodeIteratorTemplateTest, Empty) {
+TEST_F(CXFANodeIteratorTemplateTest, Empty) {
   Iterator iter(nullptr);
   EXPECT_FALSE(iter.GetRoot());
   EXPECT_FALSE(iter.GetCurrent());
@@ -101,27 +101,27 @@
   EXPECT_FALSE(iter.SkipChildrenAndMoveToNext());
 }
 
-TEST_F(CXFA_NodeIteratorTemplateTest, Root) {
+TEST_F(CXFANodeIteratorTemplateTest, Root) {
   Iterator iter(root());
   EXPECT_EQ(root(), iter.GetRoot());
   EXPECT_EQ(root(), iter.GetCurrent());
 }
 
-TEST_F(CXFA_NodeIteratorTemplateTest, Current) {
+TEST_F(CXFANodeIteratorTemplateTest, Current) {
   Iterator iter(root());
   iter.SetCurrent(child1());
   EXPECT_EQ(root(), iter.GetRoot());
   EXPECT_EQ(child1(), iter.GetCurrent());
 }
 
-TEST_F(CXFA_NodeIteratorTemplateTest, CurrentOutsideRootDisallowed) {
+TEST_F(CXFANodeIteratorTemplateTest, CurrentOutsideRootDisallowed) {
   Iterator iter(child1());
   iter.SetCurrent(root());
   EXPECT_EQ(child1(), iter.GetRoot());
   EXPECT_FALSE(iter.GetCurrent());
 }
 
-TEST_F(CXFA_NodeIteratorTemplateTest, CurrentNull) {
+TEST_F(CXFANodeIteratorTemplateTest, CurrentNull) {
   Iterator iter(root());
   EXPECT_EQ(child1(), iter.MoveToNext());
 
@@ -132,7 +132,7 @@
   EXPECT_FALSE(iter.GetCurrent());
 }
 
-TEST_F(CXFA_NodeIteratorTemplateTest, MoveToPrev) {
+TEST_F(CXFANodeIteratorTemplateTest, MoveToPrev) {
   Iterator iter(root());
   iter.SetCurrent(child9());
 
@@ -170,7 +170,7 @@
   EXPECT_EQ(root(), iter.GetCurrent());
 }
 
-TEST_F(CXFA_NodeIteratorTemplateTest, MoveToNext) {
+TEST_F(CXFANodeIteratorTemplateTest, MoveToNext) {
   Iterator iter(root());
   iter.SetCurrent(child2());
 
@@ -202,7 +202,7 @@
   EXPECT_FALSE(iter.GetCurrent());
 }
 
-TEST_F(CXFA_NodeIteratorTemplateTest, SkipChildrenAndMoveToNext) {
+TEST_F(CXFANodeIteratorTemplateTest, SkipChildrenAndMoveToNext) {
   Iterator iter(root());
   iter.SetCurrent(child3());
   EXPECT_EQ(child7(), iter.SkipChildrenAndMoveToNext());
@@ -210,7 +210,7 @@
   EXPECT_FALSE(iter.SkipChildrenAndMoveToNext());
 }
 
-TEST_F(CXFA_NodeIteratorTemplateTest, BackAndForth) {
+TEST_F(CXFANodeIteratorTemplateTest, BackAndForth) {
   Iterator iter(root());
   EXPECT_EQ(child1(), iter.MoveToNext());
   EXPECT_EQ(child2(), iter.MoveToNext());
@@ -223,21 +223,21 @@
   EXPECT_EQ(child1(), iter.MoveToPrev());
 }
 
-TEST_F(CXFA_NodeIteratorTemplateTest, NextFromBeforeTheBeginning) {
+TEST_F(CXFANodeIteratorTemplateTest, NextFromBeforeTheBeginning) {
   Iterator iter(root());
   EXPECT_FALSE(iter.MoveToPrev());
   EXPECT_EQ(root(), iter.GetCurrent());
   EXPECT_EQ(child1(), iter.MoveToNext());
 }
 
-TEST_F(CXFA_NodeIteratorTemplateTest, PrevFromAfterTheEnd) {
+TEST_F(CXFANodeIteratorTemplateTest, PrevFromAfterTheEnd) {
   Iterator iter(root());
   iter.SetCurrent(child9());
   EXPECT_FALSE(iter.MoveToNext());
   EXPECT_EQ(child9(), iter.MoveToPrev());
 }
 
-TEST_F(CXFA_NodeIteratorTemplateTest, ChildAsRootPrev) {
+TEST_F(CXFANodeIteratorTemplateTest, ChildAsRootPrev) {
   Iterator iter(child3());
   EXPECT_FALSE(iter.MoveToPrev());
 
@@ -246,7 +246,7 @@
   EXPECT_FALSE(iter.MoveToPrev());
 }
 
-TEST_F(CXFA_NodeIteratorTemplateTest, ChildAsRootNext) {
+TEST_F(CXFANodeIteratorTemplateTest, ChildAsRootNext) {
   Iterator iter(child3());
   iter.SetCurrent(child4());
   EXPECT_EQ(child5(), iter.MoveToNext());
diff --git a/xfa/fxfa/parser/cxfa_timezoneprovider_unittest.cpp b/xfa/fxfa/parser/cxfa_timezoneprovider_unittest.cpp
index 74fcc2a..c2b2807 100644
--- a/xfa/fxfa/parser/cxfa_timezoneprovider_unittest.cpp
+++ b/xfa/fxfa/parser/cxfa_timezoneprovider_unittest.cpp
@@ -7,7 +7,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/scoped_set_tz.h"
 
-TEST(CXFA_TimeZoneProviderTest, HourOffsets) {
+TEST(CXFATimeZoneProviderTest, HourOffsets) {
   {
     ScopedSetTZ scoped_set_tz("UTC");
     EXPECT_EQ(0, CXFA_TimeZoneProvider().GetTimeZoneInMinutes());
@@ -30,7 +30,7 @@
   }
 }
 
-TEST(CXFA_TimeZoneProviderTest, HalfHourOffsets) {
+TEST(CXFATimeZoneProviderTest, HalfHourOffsets) {
   {
     ScopedSetTZ scoped_set_tz("UTC+0:30");
     EXPECT_EQ(-30, CXFA_TimeZoneProvider().GetTimeZoneInMinutes());
diff --git a/xfa/fxfa/parser/cxfa_xmllocale_unittest.cpp b/xfa/fxfa/parser/cxfa_xmllocale_unittest.cpp
index 79a739e..c6f7631 100644
--- a/xfa/fxfa/parser/cxfa_xmllocale_unittest.cpp
+++ b/xfa/fxfa/parser/cxfa_xmllocale_unittest.cpp
@@ -93,26 +93,26 @@
 
 }  // namespace
 
-class CXFA_XMLLocaleTest : public FXGCUnitTest {};
+class CXFAXMLLocaleTest : public FXGCUnitTest {};
 
-TEST_F(CXFA_XMLLocaleTest, Create) {
+TEST_F(CXFAXMLLocaleTest, Create) {
   auto* locale = CreateLocaleHelper(heap());
   EXPECT_TRUE(locale != nullptr);
 }
 
-TEST_F(CXFA_XMLLocaleTest, CreateBadXML) {
+TEST_F(CXFAXMLLocaleTest, CreateBadXML) {
   auto* locale = CXFA_XMLLocale::Create(heap(), pdfium::span<uint8_t>());
   EXPECT_TRUE(locale == nullptr);
 }
 
-TEST_F(CXFA_XMLLocaleTest, GetName) {
+TEST_F(CXFAXMLLocaleTest, GetName) {
   auto* locale = CreateLocaleHelper(heap());
   ASSERT_TRUE(locale != nullptr);
 
   EXPECT_EQ(L"en_US", locale->GetName());
 }
 
-TEST_F(CXFA_XMLLocaleTest, GetNumericSymbols) {
+TEST_F(CXFAXMLLocaleTest, GetNumericSymbols) {
   auto* locale = CreateLocaleHelper(heap());
   ASSERT_TRUE(locale != nullptr);
 
@@ -123,14 +123,14 @@
   EXPECT_EQ(L"$", locale->GetCurrencySymbol());
 }
 
-TEST_F(CXFA_XMLLocaleTest, GetDateTimeSymbols) {
+TEST_F(CXFAXMLLocaleTest, GetDateTimeSymbols) {
   auto* locale = CreateLocaleHelper(heap());
   ASSERT_TRUE(locale != nullptr);
 
   EXPECT_EQ(L"GyMdkHmsSEDFwWahKzZ", locale->GetDateTimeSymbols());
 }
 
-TEST_F(CXFA_XMLLocaleTest, GetMonthName) {
+TEST_F(CXFAXMLLocaleTest, GetMonthName) {
   auto* locale = CreateLocaleHelper(heap());
   ASSERT_TRUE(locale != nullptr);
 
@@ -140,7 +140,7 @@
   EXPECT_EQ(L"February", locale->GetMonthName(1, false));
 }
 
-TEST_F(CXFA_XMLLocaleTest, GetDayName) {
+TEST_F(CXFAXMLLocaleTest, GetDayName) {
   auto* locale = CreateLocaleHelper(heap());
   ASSERT_TRUE(locale != nullptr);
 
@@ -150,7 +150,7 @@
   EXPECT_EQ(L"Monday", locale->GetDayName(1, false));
 }
 
-TEST_F(CXFA_XMLLocaleTest, GetMeridiemName) {
+TEST_F(CXFAXMLLocaleTest, GetMeridiemName) {
   auto* locale = CreateLocaleHelper(heap());
   ASSERT_TRUE(locale != nullptr);
 
@@ -158,7 +158,7 @@
   EXPECT_EQ(L"PM", locale->GetMeridiemName(false));
 }
 
-TEST_F(CXFA_XMLLocaleTest, GetEraName) {
+TEST_F(CXFAXMLLocaleTest, GetEraName) {
   auto* locale = CreateLocaleHelper(heap());
   ASSERT_TRUE(locale != nullptr);
 
@@ -166,7 +166,7 @@
   EXPECT_EQ(L"BC", locale->GetEraName(false));
 }
 
-TEST_F(CXFA_XMLLocaleTest, GetDatePattern) {
+TEST_F(CXFAXMLLocaleTest, GetDatePattern) {
   auto* locale = CreateLocaleHelper(heap());
   ASSERT_TRUE(locale != nullptr);
 
@@ -182,7 +182,7 @@
             locale->GetDatePattern(LocaleIface::DateTimeSubcategory::kLong));
 }
 
-TEST_F(CXFA_XMLLocaleTest, GetTimePattern) {
+TEST_F(CXFAXMLLocaleTest, GetTimePattern) {
   auto* locale = CreateLocaleHelper(heap());
   ASSERT_TRUE(locale != nullptr);
 
@@ -198,7 +198,7 @@
             locale->GetTimePattern(LocaleIface::DateTimeSubcategory::kLong));
 }
 
-TEST_F(CXFA_XMLLocaleTest, GetNumPattern) {
+TEST_F(CXFAXMLLocaleTest, GetNumPattern) {
   auto* locale = CreateLocaleHelper(heap());
   ASSERT_TRUE(locale != nullptr);