Merge cherrypicks of ['googleplex-android-review.googlesource.com/23916086'] into udc-platform-release.android-platform-14.0.0_r8android-platform-14.0.0_r7android-platform-14.0.0_r6android-platform-14.0.0_r5android-platform-14.0.0_r4android14-platform-release

Change-Id: If925f85c6a039b56ff549fd5327795f57b9cd12c

1 files changed, 33 insertions, 25 deletions

diff --git a/xfa/fxfa/cxfa_textparser_unittest.cpp b/xfa/fxfa/cxfa_textparser_unittest.cpp
index 5198638f0..298362e97 100644
--- a/xfa/fxfa/cxfa_textparser_unittest.cpp
+++ b/xfa/fxfa/cxfa_textparser_unittest.cpp
@@ -1,40 +1,48 @@
-// Copyright 2016 PDFium Authors. All rights reserved.
+// Copyright 2016 The PDFium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "xfa/fxfa/cxfa_textparser.h"
 
+#include "fxjs/gc/heap.h"
+#include "testing/fxgc_unittest.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "v8/include/cppgc/heap.h"
 
 class CXFA_TestTextParser final : public CXFA_TextParser {
  public:
-  CXFA_TestTextParser() : CXFA_TextParser() {}
+  CONSTRUCT_VIA_MAKE_GARBAGE_COLLECTED;
 
  private:
+  CXFA_TestTextParser() = default;
+
   // Add test cases as friends to access protected member functions.
-  FRIEND_TEST(CXFA_TextParser, TagValidate);
+  FRIEND_TEST(CXFATextParserTest, TagValidate);
 };
 
-TEST(CXFA_TextParser, TagValidate) {
-  CXFA_TestTextParser parser;
-  EXPECT_TRUE(parser.TagValidate(L"br"));
-  EXPECT_TRUE(parser.TagValidate(L"Br"));
-  EXPECT_TRUE(parser.TagValidate(L"BR"));
-  EXPECT_TRUE(parser.TagValidate(L"a"));
-  EXPECT_TRUE(parser.TagValidate(L"b"));
-  EXPECT_TRUE(parser.TagValidate(L"i"));
-  EXPECT_TRUE(parser.TagValidate(L"p"));
-  EXPECT_TRUE(parser.TagValidate(L"li"));
-  EXPECT_TRUE(parser.TagValidate(L"ol"));
-  EXPECT_TRUE(parser.TagValidate(L"ul"));
-  EXPECT_TRUE(parser.TagValidate(L"sub"));
-  EXPECT_TRUE(parser.TagValidate(L"sup"));
-  EXPECT_TRUE(parser.TagValidate(L"span"));
-  EXPECT_TRUE(parser.TagValidate(L"body"));
-  EXPECT_TRUE(parser.TagValidate(L"html"));
-
-  EXPECT_FALSE(parser.TagValidate(L""));
-  EXPECT_FALSE(parser.TagValidate(L"tml"));
-  EXPECT_FALSE(parser.TagValidate(L"xhtml"));
-  EXPECT_FALSE(parser.TagValidate(L"htmlx"));
+class CXFATextParserTest : public FXGCUnitTest {};
+
+TEST_F(CXFATextParserTest, TagValidate) {
+  auto* parser = cppgc::MakeGarbageCollected<CXFA_TestTextParser>(
+      heap()->GetAllocationHandle());
+  EXPECT_TRUE(parser->TagValidate(L"br"));
+  EXPECT_TRUE(parser->TagValidate(L"Br"));
+  EXPECT_TRUE(parser->TagValidate(L"BR"));
+  EXPECT_TRUE(parser->TagValidate(L"a"));
+  EXPECT_TRUE(parser->TagValidate(L"b"));
+  EXPECT_TRUE(parser->TagValidate(L"i"));
+  EXPECT_TRUE(parser->TagValidate(L"p"));
+  EXPECT_TRUE(parser->TagValidate(L"li"));
+  EXPECT_TRUE(parser->TagValidate(L"ol"));
+  EXPECT_TRUE(parser->TagValidate(L"ul"));
+  EXPECT_TRUE(parser->TagValidate(L"sub"));
+  EXPECT_TRUE(parser->TagValidate(L"sup"));
+  EXPECT_TRUE(parser->TagValidate(L"span"));
+  EXPECT_TRUE(parser->TagValidate(L"body"));
+  EXPECT_TRUE(parser->TagValidate(L"html"));
+
+  EXPECT_FALSE(parser->TagValidate(L""));
+  EXPECT_FALSE(parser->TagValidate(L"tml"));
+  EXPECT_FALSE(parser->TagValidate(L"xhtml"));
+  EXPECT_FALSE(parser->TagValidate(L"htmlx"));
 }