Windows changes for DomSerializerTests
Remove --disable-gpu flag that was added on Windows. It was added 11
years ago and whatever reason it was needed then isn't relevant anymore.
Also reenable Windows + ASAN tests that were disabled in
https://crrev.com/c/5547784 due to NOTREACHED() when GrContextType was
kNone. This condition can only happen when running with --disable-gpu so
it shouldn't be a problem without the flag.
Bug: 341569383
Change-Id: Iba2f3ecbd7e94723e047c686cad0d232588ec59f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5555233
Commit-Queue: Arthur Sonzogni <arthursonzogni@chromium.org>
Reviewed-by: Arthur Sonzogni <arthursonzogni@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1304348}
diff --git a/content/renderer/dom_serializer_browsertest.cc b/content/renderer/dom_serializer_browsertest.cc
index 5a01b23..5af6ace 100644
--- a/content/renderer/dom_serializer_browsertest.cc
+++ b/content/renderer/dom_serializer_browsertest.cc
@@ -83,10 +83,6 @@
void SetUpCommandLine(base::CommandLine* command_line) override {
command_line->AppendSwitch(switches::kSingleProcess);
-#if BUILDFLAG(IS_WIN)
- // Don't want to try to create a GPU process.
- command_line->AppendSwitch(switches::kDisableGpu);
-#endif
}
void SetUpOnMainThread() override {
@@ -267,15 +263,8 @@
// Serialize XML document which has all 5 built-in entities. After
// finishing serialization, the serialized contents should be same
// with original XML document.
-#if BUILDFLAG(IS_WIN) && defined(ADDRESS_SANITIZER)
-#define MAYBE_SerializeXMLDocWithBuiltInEntities \
- DISABLED_SerializeXMLDocWithBuiltInEntities
-#else
-#define MAYBE_SerializeXMLDocWithBuiltInEntities \
- SerializeXMLDocWithBuiltInEntities
-#endif
IN_PROC_BROWSER_TEST_F(MAYBE_DomSerializerTests,
- MAYBE_SerializeXMLDocWithBuiltInEntities) {
+ SerializeXMLDocWithBuiltInEntities) {
base::FilePath page_file_path =
GetTestFilePath("dom_serializer", "note.html");
base::FilePath xml_file_path = GetTestFilePath("dom_serializer", "note.xml");
@@ -305,14 +294,8 @@
}
// When serializing DOM, we add MOTW declaration before html tag.
-#if defined(ADDRESS_SANITIZER) && BUILDFLAG(IS_WIN)
-#define MAYBE_SerializeHTMLDOMWithAddingMOTW \
- DISABLED_SerializeHTMLDOMWithAddingMOTW
-#else
-#define MAYBE_SerializeHTMLDOMWithAddingMOTW SerializeHTMLDOMWithAddingMOTW
-#endif
IN_PROC_BROWSER_TEST_F(MAYBE_DomSerializerTests,
- MAYBE_SerializeHTMLDOMWithAddingMOTW) {
+ SerializeHTMLDOMWithAddingMOTW) {
base::FilePath page_file_path =
GetTestFilePath("dom_serializer", "youtube_2.htm");
@@ -527,14 +510,13 @@
}
// TODO(crbug.com/40681859): Flaky on linux-lacros-tester-rel.
-#if BUILDFLAG(IS_CHROMEOS_LACROS) || \
- (BUILDFLAG(IS_WIN) && defined(ADDRESS_SANITIZER))
+#if BUILDFLAG(IS_CHROMEOS_LACROS)
#define MAYBE_SerializeHTMLDOMWithEntitiesInText \
DISABLED_SerializeHTMLDOMWithEntitiesInText
#else
#define MAYBE_SerializeHTMLDOMWithEntitiesInText \
SerializeHTMLDOMWithEntitiesInText
-#endif
+#endif // BUILDFLAG(IS_CHROMEOS_LACROS)
// Test situation of html entities in text when serializing HTML DOM.
IN_PROC_BROWSER_TEST_F(MAYBE_DomSerializerTests,
MAYBE_SerializeHTMLDOMWithEntitiesInText) {
@@ -601,15 +583,8 @@
// Test situation of html entities in attribute value when serializing
// HTML DOM.
// This test started to fail at WebKit r65388. See http://crbug.com/52279.
-#if BUILDFLAG(IS_WIN) && defined(ADDRESS_SANITIZER)
-#define MAYBE_SerializeHTMLDOMWithEntitiesInAttributeValue \
- DISABLED_SerializeHTMLDOMWithEntitiesInAttributeValue
-#else
-#define MAYBE_SerializeHTMLDOMWithEntitiesInAttributeValue \
- SerializeHTMLDOMWithEntitiesInAttributeValue
-#endif
IN_PROC_BROWSER_TEST_F(MAYBE_DomSerializerTests,
- MAYBE_SerializeHTMLDOMWithEntitiesInAttributeValue) {
+ SerializeHTMLDOMWithEntitiesInAttributeValue) {
// Need to spin up the renderer and also navigate to a file url so that the
// renderer code doesn't attempt a fork when it sees a load to file scheme
// from non-file scheme.
@@ -714,7 +689,7 @@
// to absolute URLs.
// Disabled due to test failure. http://crbug.com/1349583
-#if BUILDFLAG(IS_LINUX) || (BUILDFLAG(IS_WIN) && defined(ADDRESS_SANITIZER))
+#if BUILDFLAG(IS_LINUX)
#define MAYBE_SerializeHTMLDOMWithBaseTag DISABLED_SerializeHTMLDOMWithBaseTag
#else
#define MAYBE_SerializeHTMLDOMWithBaseTag SerializeHTMLDOMWithBaseTag
@@ -825,14 +800,8 @@
}
// Serializing page which has an empty HEAD tag.
-#if BUILDFLAG(IS_WIN) && defined(ADDRESS_SANITIZER)
-#define MAYBE_SerializeHTMLDOMWithEmptyHead \
- DISABLED_SerializeHTMLDOMWithEmptyHead
-#else
-#define MAYBE_SerializeHTMLDOMWithEmptyHead SerializeHTMLDOMWithEmptyHead
-#endif
IN_PROC_BROWSER_TEST_F(MAYBE_DomSerializerTests,
- MAYBE_SerializeHTMLDOMWithEmptyHead) {
+ SerializeHTMLDOMWithEmptyHead) {
// Need to spin up the renderer and also navigate to a file url so that the
// renderer code doesn't attempt a fork when it sees a load to file scheme
// from non-file scheme.
