Separating ARIA, HTML & event AX test.

content/browser/accessibility/dump_accessibility_tree_browsertest.cc

Index: content/browser/accessibility/dump_accessibility_tree_browsertest.cc
diff --git a/content/browser/accessibility/dump_accessibility_tree_browsertest.cc b/content/browser/accessibility/dump_accessibility_tree_browsertest.cc
index ccbe71819fbd061d1e38256252a0952aff019a1a..94758dd240221363e47b1990fe2e34e774a952f3 100644
--- a/content/browser/accessibility/dump_accessibility_tree_browsertest.cc
+++ b/content/browser/accessibility/dump_accessibility_tree_browsertest.cc
@@ -7,6 +7,7 @@
 #include <vector>
 
 #include "base/command_line.h"
+#include "base/path_service.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ -62,6 +63,30 @@ class DumpAccessibilityTreeTest : public DumpAccessibilityTestBase {
         switches::kEnableExperimentalWebPlatformFeatures);
   }
 
+  void RunAriaTest(const base::FilePath::CharType* file_path) {
+    base::FilePath dir_test_data;
+    ASSERT_TRUE(PathService::Get(DIR_TEST_DATA, &dir_test_data));
+    base::FilePath test_path(
+        dir_test_data.AppendASCII("accessibility/aria"));
+    ASSERT_TRUE(base::PathExists(test_path))
+        << test_path.LossyDisplayName();
+
+    base::FilePath aria_file = test_path.Append(base::FilePath(file_path));
+    RunTest(aria_file, "accessibility/aria");
+  }
+
+  void RunHtmlTest(const base::FilePath::CharType* file_path) {
+    base::FilePath dir_test_data;
+    ASSERT_TRUE(PathService::Get(DIR_TEST_DATA, &dir_test_data));
+    base::FilePath test_path(
+        dir_test_data.AppendASCII("accessibility/html"));
+    ASSERT_TRUE(base::PathExists(test_path))
+        << test_path.LossyDisplayName();
+
+    base::FilePath html_file = test_path.Append(base::FilePath(file_path));
+    RunTest(html_file, "accessibility/html");
+  }
+
   std::vector<std::string> Dump() override {
     WebContentsImpl* web_contents = static_cast<WebContentsImpl*>(
         shell()->web_contents());
@@ -78,566 +103,566 @@ class DumpAccessibilityTreeTest : public DumpAccessibilityTestBase {
 };
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityA) {
-  RunTest(FILE_PATH_LITERAL("a.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("a.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityAbbr) {
-  RunTest(FILE_PATH_LITERAL("abbr.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("abbr.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityAddress) {
-  RunTest(FILE_PATH_LITERAL("address.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("address.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityArea) {
-  RunTest(FILE_PATH_LITERAL("area.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("area.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityAName) {
-  RunTest(FILE_PATH_LITERAL("a-name.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("a-name.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityANameCalc) {
-  RunTest(FILE_PATH_LITERAL("a-name-calc.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("a-name-calc.html"));
 }
 
 // crrev.com/481753002 will change the alt content used for the name value.
 // Re-baseline after the Blink change goes in
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest,
     DISABLED_AccessibilityANoText) {
-  RunTest(FILE_PATH_LITERAL("a-no-text.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("a-no-text.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityAOnclick) {
-  RunTest(FILE_PATH_LITERAL("a-onclick.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("a-onclick.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest,
                        AccessibilityAriaActivedescendant) {
-  RunTest(FILE_PATH_LITERAL("aria-activedescendant.html"));
+  RunAriaTest(FILE_PATH_LITERAL("aria-activedescendant.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityAriaAlert) {
-  RunTest(FILE_PATH_LITERAL("aria-alert.html"));
+  RunAriaTest(FILE_PATH_LITERAL("aria-alert.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest,
                        AccessibilityAriaApplication) {
-  RunTest(FILE_PATH_LITERAL("aria-application.html"));
+  RunAriaTest(FILE_PATH_LITERAL("aria-application.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityAriaArticle) {
-  RunTest(FILE_PATH_LITERAL("aria-article.html"));
+  RunAriaTest(FILE_PATH_LITERAL("aria-article.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityAriaAtomic) {
-  RunTest(FILE_PATH_LITERAL("aria-atomic.html"));
+  RunAriaTest(FILE_PATH_LITERAL("aria-atomic.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest,
                        AccessibilityAriaAutocomplete) {
-  RunTest(FILE_PATH_LITERAL("aria-autocomplete.html"));
+  RunAriaTest(FILE_PATH_LITERAL("aria-autocomplete.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityAriaBanner) {
-  RunTest(FILE_PATH_LITERAL("aria-banner.html"));
+  RunAriaTest(FILE_PATH_LITERAL("aria-banner.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityAriaBusy) {
-  RunTest(FILE_PATH_LITERAL("aria-busy.html"));
+  RunAriaTest(FILE_PATH_LITERAL("aria-busy.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityAriaButton) {
-  RunTest(FILE_PATH_LITERAL("aria-button.html"));
+  RunAriaTest(FILE_PATH_LITERAL("aria-button.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityAriaCheckBox) {
-  RunTest(FILE_PATH_LITERAL("aria-checkbox.html"));
+  RunAriaTest(FILE_PATH_LITERAL("aria-checkbox.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityAriaChecked) {
-  RunTest(FILE_PATH_LITERAL("aria-checked.html"));
+  RunAriaTest(FILE_PATH_LITERAL("aria-checked.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest,
                        AccessibilityAriaColumnHeader) {
-  RunTest(FILE_PATH_LITERAL("aria-columnheader.html"));
+  RunAriaTest(FILE_PATH_LITERAL("aria-columnheader.html"));
 }
 
 // crbug.com/98976 will cause new elements to be added to the Blink a11y tree
 // Re-baseline after the Blink change goes in
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest,
                        DISABLED_AccessibilityAriaCombobox) {
-  RunTest(FILE_PATH_LITERAL("aria-combobox.html"));
+  RunAriaTest(FILE_PATH_LITERAL("aria-combobox.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest,
                        AccessibilityAriaComplementary) {
-  RunTest(FILE_PATH_LITERAL("aria-complementary.html"));
+  RunAriaTest(FILE_PATH_LITERAL("aria-complementary.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest,
                        AccessibilityAriaContentInfo) {
-  RunTest(FILE_PATH_LITERAL("aria-contentinfo.html"));
+  RunAriaTest(FILE_PATH_LITERAL("aria-contentinfo.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityAriaDefinition) {
-  RunTest(FILE_PATH_LITERAL("aria-definition.html"));
+  RunAriaTest(FILE_PATH_LITERAL("aria-definition.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityAriaDialog) {
-  RunTest(FILE_PATH_LITERAL("aria-dialog.html"));
+  RunAriaTest(FILE_PATH_LITERAL("aria-dialog.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityAriaDirectory) {
-  RunTest(FILE_PATH_LITERAL("aria-directory.html"));
+  RunAriaTest(FILE_PATH_LITERAL("aria-directory.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityAriaExpanded) {
-  RunTest(FILE_PATH_LITERAL("aria-expanded.html"));
+  RunAriaTest(FILE_PATH_LITERAL("aria-expanded.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityAriaHasPopup) {
-  RunTest(FILE_PATH_LITERAL("aria-haspopup.html"));
+  RunAriaTest(FILE_PATH_LITERAL("aria-haspopup.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityAriaHeading) {
-  RunTest(FILE_PATH_LITERAL("aria-heading.html"));
+  RunAriaTest(FILE_PATH_LITERAL("aria-heading.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityAriaHidden) {
-  RunTest(FILE_PATH_LITERAL("aria-hidden.html"));
+  RunAriaTest(FILE_PATH_LITERAL("aria-hidden.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest,
                        MAYBE(AccessibilityAriaFlowto)) {
-  RunTest(FILE_PATH_LITERAL("aria-flowto.html"));
+  RunAriaTest(FILE_PATH_LITERAL("aria-flowto.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityAriaForm) {
-  RunTest(FILE_PATH_LITERAL("aria-form.html"));
+  RunAriaTest(FILE_PATH_LITERAL("aria-form.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityAriaImg) {
-  RunTest(FILE_PATH_LITERAL("aria-img.html"));
+  RunAriaTest(FILE_PATH_LITERAL("aria-img.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityAriaInvalid) {
-  RunTest(FILE_PATH_LITERAL("aria-invalid.html"));
+  RunAriaTest(FILE_PATH_LITERAL("aria-invalid.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest,
                        AccessibilityAriaLabelledByHeading) {
-  RunTest(FILE_PATH_LITERAL("aria-labelledby-heading.html"));
+  RunAriaTest(FILE_PATH_LITERAL("aria-labelledby-heading.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityAriaLevel) {
-  RunTest(FILE_PATH_LITERAL("aria-level.html"));
+  RunAriaTest(FILE_PATH_LITERAL("aria-level.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityAriaList) {
-  RunTest(FILE_PATH_LITERAL("aria-list.html"));
+  RunAriaTest(FILE_PATH_LITERAL("aria-list.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityAriaListBox) {
-  RunTest(FILE_PATH_LITERAL("aria-listbox.html"));
+  RunAriaTest(FILE_PATH_LITERAL("aria-listbox.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest,
                        AccessibilityAriaListBoxActiveDescendant) {
-  RunTest(FILE_PATH_LITERAL("aria-listbox-activedescendant.html"));
+  RunAriaTest(FILE_PATH_LITERAL("aria-listbox-activedescendant.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest,
                        AccessibilityAriaListBoxAriaSelected) {
-  RunTest(FILE_PATH_LITERAL("aria-listbox-aria-selected.html"));
+  RunAriaTest(FILE_PATH_LITERAL("aria-listbox-aria-selected.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest,
                        AccessibilityAriaListBoxChildFocus) {
-  RunTest(FILE_PATH_LITERAL("aria-listbox-childfocus.html"));
+  RunAriaTest(FILE_PATH_LITERAL("aria-listbox-childfocus.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityAriaLive) {
-  RunTest(FILE_PATH_LITERAL("aria-live.html"));
+  RunAriaTest(FILE_PATH_LITERAL("aria-live.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest,
                        AccessibilityAriaLiveWithContent) {
-  RunTest(FILE_PATH_LITERAL("aria-live-with-content.html"));
+  RunAriaTest(FILE_PATH_LITERAL("aria-live-with-content.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityAriaLog) {
-  RunTest(FILE_PATH_LITERAL("aria-log.html"));
+  RunAriaTest(FILE_PATH_LITERAL("aria-log.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityAriaMain) {
-  RunTest(FILE_PATH_LITERAL("aria-main.html"));
+  RunAriaTest(FILE_PATH_LITERAL("aria-main.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityAriaMarquee) {
-  RunTest(FILE_PATH_LITERAL("aria-marquee.html"));
+  RunAriaTest(FILE_PATH_LITERAL("aria-marquee.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityAriaMenu) {
-  RunTest(FILE_PATH_LITERAL("aria-menu.html"));
+  RunAriaTest(FILE_PATH_LITERAL("aria-menu.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityAriaMenuBar) {
-  RunTest(FILE_PATH_LITERAL("aria-menubar.html"));
+  RunAriaTest(FILE_PATH_LITERAL("aria-menubar.html"));
 }
 
 // crbug.com/442278 will stop creating new text elements representing title.
 // Re-baseline after the Blink change goes in
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest,
                        DISABLED_AccessibilityAriaMenuItemCheckBox) {
-  RunTest(FILE_PATH_LITERAL("aria-menuitemcheckbox.html"));
+  RunAriaTest(FILE_PATH_LITERAL("aria-menuitemcheckbox.html"));
 }
 
 // crbug.com/442278 will stop creating new text elements representing title.
 // Re-baseline after the Blink change goes in
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest,
                        DISABLED_AccessibilityAriaMenuItemRadio) {
-  RunTest(FILE_PATH_LITERAL("aria-menuitemradio.html"));
+  RunAriaTest(FILE_PATH_LITERAL("aria-menuitemradio.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest,
                        AccessibilityAriaMultiline) {
-  RunTest(FILE_PATH_LITERAL("aria-multiline.html"));
+  RunAriaTest(FILE_PATH_LITERAL("aria-multiline.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest,
                        AccessibilityAriaMultiselectable) {
-  RunTest(FILE_PATH_LITERAL("aria-multiselectable.html"));
+  RunAriaTest(FILE_PATH_LITERAL("aria-multiselectable.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityAriaNavigation) {
-  RunTest(FILE_PATH_LITERAL("aria-navigation.html"));
+  RunAriaTest(FILE_PATH_LITERAL("aria-navigation.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest,
                        AccessibilityAriaOrientation) {
-  RunTest(FILE_PATH_LITERAL("aria-orientation.html"));
+  RunAriaTest(FILE_PATH_LITERAL("aria-orientation.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityAriaMath) {
-  RunTest(FILE_PATH_LITERAL("aria-math.html"));
+  RunAriaTest(FILE_PATH_LITERAL("aria-math.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityAriaNone) {
-  RunTest(FILE_PATH_LITERAL("aria-none.html"));
+  RunAriaTest(FILE_PATH_LITERAL("aria-none.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest,
                        AccessibilityAriaPresentation) {
-  RunTest(FILE_PATH_LITERAL("aria-presentation.html"));
+  RunAriaTest(FILE_PATH_LITERAL("aria-presentation.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityAriaPressed) {
-  RunTest(FILE_PATH_LITERAL("aria-pressed.html"));
+  RunAriaTest(FILE_PATH_LITERAL("aria-pressed.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest,
                        AccessibilityAriaProgressbar) {
-  RunTest(FILE_PATH_LITERAL("aria-progressbar.html"));
+  RunAriaTest(FILE_PATH_LITERAL("aria-progressbar.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest,
                        AccessibilityAriaRadio) {
-  RunTest(FILE_PATH_LITERAL("aria-radio.html"));
+  RunAriaTest(FILE_PATH_LITERAL("aria-radio.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest,
                        AccessibilityAriaRadiogroup) {
-  RunTest(FILE_PATH_LITERAL("aria-radiogroup.html"));
+  RunAriaTest(FILE_PATH_LITERAL("aria-radiogroup.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityAriaRelevant) {
-  RunTest(FILE_PATH_LITERAL("aria-relevant.html"));
+  RunAriaTest(FILE_PATH_LITERAL("aria-relevant.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityAriaRequired) {
-  RunTest(FILE_PATH_LITERAL("aria-required.html"));
+  RunAriaTest(FILE_PATH_LITERAL("aria-required.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityAriaRow) {
-  RunTest(FILE_PATH_LITERAL("aria-row.html"));
+  RunAriaTest(FILE_PATH_LITERAL("aria-row.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityAriaRowGroup) {
-  RunTest(FILE_PATH_LITERAL("aria-rowgroup.html"));
+  RunAriaTest(FILE_PATH_LITERAL("aria-rowgroup.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityAriaReadonly) {
-  RunTest(FILE_PATH_LITERAL("aria-readonly.html"));
+  RunAriaTest(FILE_PATH_LITERAL("aria-readonly.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityAriaRegion) {
-  RunTest(FILE_PATH_LITERAL("aria-region.html"));
+  RunAriaTest(FILE_PATH_LITERAL("aria-region.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityAriaSearch) {
-  RunTest(FILE_PATH_LITERAL("aria-search.html"));
+  RunAriaTest(FILE_PATH_LITERAL("aria-search.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityAriaSeparator) {
-  RunTest(FILE_PATH_LITERAL("aria-separator.html"));
+  RunAriaTest(FILE_PATH_LITERAL("aria-separator.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityAriaSort) {
-  RunTest(FILE_PATH_LITERAL("aria-sort.html"));
+  RunAriaTest(FILE_PATH_LITERAL("aria-sort.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityAriaSlider) {
-  RunTest(FILE_PATH_LITERAL("aria-slider.html"));
+  RunAriaTest(FILE_PATH_LITERAL("aria-slider.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest,
                        AccessibilityAriaSpinButton) {
-  RunTest(FILE_PATH_LITERAL("aria-spinbutton.html"));
+  RunAriaTest(FILE_PATH_LITERAL("aria-spinbutton.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityAriaTextbox) {
-  RunTest(FILE_PATH_LITERAL("aria-textbox.html"));
+  RunAriaTest(FILE_PATH_LITERAL("aria-textbox.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityAriaTimer) {
-  RunTest(FILE_PATH_LITERAL("aria-timer.html"));
+  RunAriaTest(FILE_PATH_LITERAL("aria-timer.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest,
                        AccessibilityAriaToggleButton) {
-  RunTest(FILE_PATH_LITERAL("aria-togglebutton.html"));
+  RunAriaTest(FILE_PATH_LITERAL("aria-togglebutton.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityAriaToolbar) {
-  RunTest(FILE_PATH_LITERAL("aria-toolbar.html"));
+  RunAriaTest(FILE_PATH_LITERAL("aria-toolbar.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityAriaTooltip) {
-  RunTest(FILE_PATH_LITERAL("aria-tooltip.html"));
+  RunAriaTest(FILE_PATH_LITERAL("aria-tooltip.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityAriaTree) {
-  RunTest(FILE_PATH_LITERAL("aria-tree.html"));
+  RunAriaTest(FILE_PATH_LITERAL("aria-tree.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityAriaTreeGrid) {
-  RunTest(FILE_PATH_LITERAL("aria-treegrid.html"));
+  RunAriaTest(FILE_PATH_LITERAL("aria-treegrid.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityAriaValueMin) {
-  RunTest(FILE_PATH_LITERAL("aria-valuemin.html"));
+  RunAriaTest(FILE_PATH_LITERAL("aria-valuemin.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityAriaValueMax) {
-  RunTest(FILE_PATH_LITERAL("aria-valuemax.html"));
+  RunAriaTest(FILE_PATH_LITERAL("aria-valuemax.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityAriaValueNow) {
-  RunTest(FILE_PATH_LITERAL("aria-valuenow.html"));
+  RunAriaTest(FILE_PATH_LITERAL("aria-valuenow.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityArticle) {
-  RunTest(FILE_PATH_LITERAL("article.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("article.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityAside) {
-  RunTest(FILE_PATH_LITERAL("aside.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("aside.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityAudio) {
-  RunTest(FILE_PATH_LITERAL("audio.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("audio.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityAWithImg) {
-  RunTest(FILE_PATH_LITERAL("a-with-img.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("a-with-img.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityBdo) {
-  RunTest(FILE_PATH_LITERAL("bdo.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("bdo.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityBlockquote) {
-  RunTest(FILE_PATH_LITERAL("blockquote.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("blockquote.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityBody) {
-  RunTest(FILE_PATH_LITERAL("body.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("body.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, DISABLED_AccessibilityBR) {
-  RunTest(FILE_PATH_LITERAL("br.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("br.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityButton) {
-  RunTest(FILE_PATH_LITERAL("button.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("button.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityButtonNameCalc) {
-  RunTest(FILE_PATH_LITERAL("button-name-calc.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("button-name-calc.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityCanvas) {
-  RunTest(FILE_PATH_LITERAL("canvas.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("canvas.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityCaption) {
-  RunTest(FILE_PATH_LITERAL("caption.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("caption.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest,
                        AccessibilityCheckboxNameCalc) {
-  RunTest(FILE_PATH_LITERAL("checkbox-name-calc.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("checkbox-name-calc.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityCite) {
-  RunTest(FILE_PATH_LITERAL("cite.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("cite.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityCol) {
-  RunTest(FILE_PATH_LITERAL("col.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("col.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityColgroup) {
-  RunTest(FILE_PATH_LITERAL("colgroup.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("colgroup.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityDd) {
-  RunTest(FILE_PATH_LITERAL("dd.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("dd.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityDel) {
-  RunTest(FILE_PATH_LITERAL("del.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("del.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityDetails) {
-  RunTest(FILE_PATH_LITERAL("details.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("details.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityDfn) {
-  RunTest(FILE_PATH_LITERAL("dfn.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("dfn.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityDialog) {
-  RunTest(FILE_PATH_LITERAL("dialog.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("dialog.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityDiv) {
-  RunTest(FILE_PATH_LITERAL("div.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("div.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityDl) {
-  RunTest(FILE_PATH_LITERAL("dl.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("dl.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityDt) {
-  RunTest(FILE_PATH_LITERAL("dt.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("dt.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest,
                        AccessibilityContenteditableDescendants) {
-  RunTest(FILE_PATH_LITERAL("contenteditable-descendants.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("contenteditable-descendants.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityEm) {
-  RunTest(FILE_PATH_LITERAL("em.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("em.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityEmbed) {
-  RunTest(FILE_PATH_LITERAL("embed.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("embed.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityFieldset) {
-  RunTest(FILE_PATH_LITERAL("fieldset.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("fieldset.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityFigcaption) {
-  RunTest(FILE_PATH_LITERAL("figcaption.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("figcaption.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityFigure) {
-  RunTest(FILE_PATH_LITERAL("figure.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("figure.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityFooter) {
-  RunTest(FILE_PATH_LITERAL("footer.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("footer.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityForm) {
-  RunTest(FILE_PATH_LITERAL("form.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("form.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityFrameset) {
-  RunTest(FILE_PATH_LITERAL("frameset.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("frameset.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityHead) {
-  RunTest(FILE_PATH_LITERAL("head.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("head.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityHeader) {
-  RunTest(FILE_PATH_LITERAL("header.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("header.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityHeading) {
-  RunTest(FILE_PATH_LITERAL("heading.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("heading.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityHR) {
-  RunTest(FILE_PATH_LITERAL("hr.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("hr.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityI) {
-  RunTest(FILE_PATH_LITERAL("i.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("i.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityIframe) {
-  RunTest(FILE_PATH_LITERAL("iframe.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("iframe.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest,
                        AccessibilityIframeCoordinates) {
-  RunTest(FILE_PATH_LITERAL("iframe-coordinates.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("iframe-coordinates.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest,
                        AccessibilityIframePresentational) {
-  RunTest(FILE_PATH_LITERAL("iframe-presentational.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("iframe-presentational.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityImg) {
-  RunTest(FILE_PATH_LITERAL("img.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("img.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityInputButton) {
-  RunTest(FILE_PATH_LITERAL("input-button.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("input-button.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest,
                        AccessibilityInputButtonInMenu) {
-  RunTest(FILE_PATH_LITERAL("input-button-in-menu.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("input-button-in-menu.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityInputCheckBox) {
-  RunTest(FILE_PATH_LITERAL("input-checkbox.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("input-checkbox.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest,
                        AccessibilityInputCheckBoxInMenu) {
-  RunTest(FILE_PATH_LITERAL("input-checkbox-in-menu.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("input-checkbox-in-menu.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityInputColor) {
-  RunTest(FILE_PATH_LITERAL("input-color.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("input-color.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityInputDate) {
-  RunTest(FILE_PATH_LITERAL("input-date.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("input-date.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityInputDateTime) {
-  RunTest(FILE_PATH_LITERAL("input-datetime.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("input-datetime.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest,
@@ -647,312 +672,312 @@ IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest,
   if (base::mac::IsOSMavericks())
     return;
 #endif
-  RunTest(FILE_PATH_LITERAL("input-datetime-local.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("input-datetime-local.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityInputFile) {
-  RunTest(FILE_PATH_LITERAL("input-file.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("input-file.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest,
                        AccessibilityInputImageButtonInMenu) {
-  RunTest(FILE_PATH_LITERAL("input-image-button-in-menu.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("input-image-button-in-menu.html"));
 }
 
 // crbug.com/423675 - AX tree is different for Win7 and Win8.
 #if defined(OS_WIN)
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest,
                        DISABLED_AccessibilityInputMonth) {
-  RunTest(FILE_PATH_LITERAL("input-month.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("input-month.html"));
 }
 #else
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityInputMonth) {
-  RunTest(FILE_PATH_LITERAL("input-month.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("input-month.html"));
 }
 #endif
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityInputRadio) {
-  RunTest(FILE_PATH_LITERAL("input-radio.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("input-radio.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest,
                       AccessibilityInputRadioInMenu) {
-  RunTest(FILE_PATH_LITERAL("input-radio-in-menu.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("input-radio-in-menu.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityInputRange) {
-  RunTest(FILE_PATH_LITERAL("input-range.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("input-range.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityInputReset) {
-  RunTest(FILE_PATH_LITERAL("input-reset.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("input-reset.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityInputSearch) {
-  RunTest(FILE_PATH_LITERAL("input-search.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("input-search.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityInputSubmit) {
-  RunTest(FILE_PATH_LITERAL("input-submit.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("input-submit.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest,
                        AccessibilityInputSuggestionsSourceElement) {
-  RunTest(FILE_PATH_LITERAL("input-suggestions-source-element.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("input-suggestions-source-element.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityInputTel) {
-  RunTest(FILE_PATH_LITERAL("input-tel.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("input-tel.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityInputText) {
-  RunTest(FILE_PATH_LITERAL("input-text.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("input-text.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest,
                        AccessibilityInputTextNameCalc) {
-  RunTest(FILE_PATH_LITERAL("input-text-name-calc.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("input-text-name-calc.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityInputTextValue) {
-  RunTest(FILE_PATH_LITERAL("input-text-value.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("input-text-value.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityInputTime) {
-  RunTest(FILE_PATH_LITERAL("input-time.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("input-time.html"));
 }
 
 // crbug.com/98976 will cause new elements to be added to the Blink a11y tree
 // Re-baseline after the Blink change goes in
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest,
                        DISABLED_AccessibilityInputTypes) {
-  RunTest(FILE_PATH_LITERAL("input-types.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("input-types.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityInputUrl) {
-  RunTest(FILE_PATH_LITERAL("input-url.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("input-url.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityInputWeek) {
-  RunTest(FILE_PATH_LITERAL("input-week.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("input-week.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityIns) {
-  RunTest(FILE_PATH_LITERAL("ins.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("ins.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityLabel) {
-  RunTest(FILE_PATH_LITERAL("label.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("label.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityLandmark) {
-  RunTest(FILE_PATH_LITERAL("landmark.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("landmark.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityLegend) {
-  RunTest(FILE_PATH_LITERAL("legend.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("legend.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityLink) {
-  RunTest(FILE_PATH_LITERAL("link.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("link.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityList) {
-  RunTest(FILE_PATH_LITERAL("list.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("list.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityListMarkers) {
-  RunTest(FILE_PATH_LITERAL("list-markers.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("list-markers.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityMain) {
-  RunTest(FILE_PATH_LITERAL("main.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("main.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityMark) {
-  RunTest(FILE_PATH_LITERAL("mark.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("mark.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityMath) {
-  RunTest(FILE_PATH_LITERAL("math.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("math.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest,
                        AccessibilityMenutypecontext) {
-  RunTest(FILE_PATH_LITERAL("menu-type-context.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("menu-type-context.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityMeta) {
-  RunTest(FILE_PATH_LITERAL("meta.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("meta.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityMeter) {
-  RunTest(FILE_PATH_LITERAL("meter.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("meter.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest,
                        AccessibilityModalDialogClosed) {
-  RunTest(FILE_PATH_LITERAL("modal-dialog-closed.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("modal-dialog-closed.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest,
                        AccessibilityModalDialogOpened) {
-  RunTest(FILE_PATH_LITERAL("modal-dialog-opened.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("modal-dialog-opened.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest,
                        AccessibilityModalDialogInIframeClosed) {
-  RunTest(FILE_PATH_LITERAL("modal-dialog-in-iframe-closed.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("modal-dialog-in-iframe-closed.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest,
                        AccessibilityModalDialogInIframeOpened) {
-  RunTest(FILE_PATH_LITERAL("modal-dialog-in-iframe-opened.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("modal-dialog-in-iframe-opened.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest,
                        AccessibilityModalDialogStack) {
-  RunTest(FILE_PATH_LITERAL("modal-dialog-stack.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("modal-dialog-stack.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityNavigation) {
-  RunTest(FILE_PATH_LITERAL("navigation.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("navigation.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityNoscript) {
-  RunTest(FILE_PATH_LITERAL("noscript.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("noscript.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityOl) {
-  RunTest(FILE_PATH_LITERAL("ol.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("ol.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityObject) {
-  RunTest(FILE_PATH_LITERAL("object.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("object.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest,
                        AccessibilityOptionindatalist) {
-  RunTest(FILE_PATH_LITERAL("option-in-datalist.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("option-in-datalist.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest,
                        DISABLED_AccessibilityOutput) {
-  RunTest(FILE_PATH_LITERAL("output.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("output.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityP) {
-  RunTest(FILE_PATH_LITERAL("p.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("p.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityParam) {
-  RunTest(FILE_PATH_LITERAL("param.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("param.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityPre) {
-  RunTest(FILE_PATH_LITERAL("pre.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("pre.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityProgress) {
-  RunTest(FILE_PATH_LITERAL("progress.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("progress.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityQ) {
-  RunTest(FILE_PATH_LITERAL("q.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("q.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityRuby) {
-  RunTest(FILE_PATH_LITERAL("ruby.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("ruby.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityS) {
-  RunTest(FILE_PATH_LITERAL("s.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("s.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilitySamp) {
-  RunTest(FILE_PATH_LITERAL("samp.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("samp.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityScript) {
-  RunTest(FILE_PATH_LITERAL("script.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("script.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilitySection) {
-  RunTest(FILE_PATH_LITERAL("section.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("section.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilitySelect) {
-  RunTest(FILE_PATH_LITERAL("select.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("select.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilitySource) {
-  RunTest(FILE_PATH_LITERAL("source.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("source.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilitySpan) {
-  RunTest(FILE_PATH_LITERAL("span.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("span.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilitySub) {
-  RunTest(FILE_PATH_LITERAL("sub.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("sub.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilitySummary) {
-  RunTest(FILE_PATH_LITERAL("summary.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("summary.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilitySvg) {
-  RunTest(FILE_PATH_LITERAL("svg.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("svg.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityTab) {
-  RunTest(FILE_PATH_LITERAL("tab.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("tab.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityTableSimple) {
-  RunTest(FILE_PATH_LITERAL("table-simple.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("table-simple.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest,
                     AccessibilityTableThRowHeader) {
-  RunTest(FILE_PATH_LITERAL("table-th-rowheader.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("table-th-rowheader.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest,
                     AccessibilityTableTbodyTfoot) {
-  RunTest(FILE_PATH_LITERAL("table-thead-tbody-tfoot.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("table-thead-tbody-tfoot.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityTableSpans) {
-  RunTest(FILE_PATH_LITERAL("table-spans.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("table-spans.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityTextArea) {
-  RunTest(FILE_PATH_LITERAL("textarea.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("textarea.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityTime) {
-  RunTest(FILE_PATH_LITERAL("time.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("time.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityTitle) {
-  RunTest(FILE_PATH_LITERAL("title.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("title.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityTransition) {
-  RunTest(FILE_PATH_LITERAL("transition.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("transition.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityUl) {
-  RunTest(FILE_PATH_LITERAL("ul.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("ul.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityVar) {
-  RunTest(FILE_PATH_LITERAL("var.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("var.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityWbr) {
-  RunTest(FILE_PATH_LITERAL("wbr.html"));
+  RunHtmlTest(FILE_PATH_LITERAL("wbr.html"));
 }
 
 }  // namespace content