Chromium-side patch to rename "--dump-render-tree" to "--run-layout-test".

At this point, "--run-layout-test" is the flag that is actually functional, and using "--dump-render-tree" simply causes the "--run-layout-test" to be appended to the command line.

A subsequent Blink patch will change the scripts in Blink to use "--run-layout-test" instead of "--dump-render-tree".

This patch was originally uploaded here and then reverted: https://codereview.chromium.org/899103002/ . This patch introduces fixes for the issues that led to the original being reverted.

BUG=453252

Review URL: https://codereview.chromium.org/891903006

Cr-Commit-Position: refs/heads/master@{#315840}

1 files changed, 2 insertions, 2 deletions

diff --git a/content/public/test/content_browser_test.cc b/content/public/test/content_browser_test.cc
index 0408c8a..a6802124 100644
--- a/content/public/test/content_browser_test.cc
+++ b/content/public/test/content_browser_test.cc
@@ -74,7 +74,7 @@ void ContentBrowserTest::SetUp() {
     // setting a global that may be used after ContentBrowserTest is
     // destroyed.
     ContentRendererClient* old_client =
-        command_line->HasSwitch(switches::kDumpRenderTree)
+        command_line->HasSwitch(switches::kRunLayoutTest)
             ? SetRendererClientForTesting(new LayoutTestContentRendererClient)
             : SetRendererClientForTesting(new ShellContentRendererClient);
     // No-one should have set this value before we did.
@@ -117,7 +117,7 @@ void ContentBrowserTest::TearDown() {
 
 void ContentBrowserTest::RunTestOnMainThreadLoop() {
   if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kDumpRenderTree)) {
+          switches::kRunLayoutTest)) {
     CHECK_EQ(Shell::windows().size(), 1u);
     shell_ = Shell::windows()[0];
   }