Clean up remaining DumpRenderTree references and flags.

Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py

Index: Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py
diff --git a/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py b/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py
index 5df7f6d1c4a7c0b7683a31c3e4997b01822c16b4..addabcc280b57f6e08e3f14e69e24e8c71925682 100644
--- a/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py
+++ b/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py
@@ -147,14 +147,10 @@ def parse_args(args):
                  "Note: When using this option, you might miss new crashes "
                  "in these tests."),
         optparse.make_option("--additional-drt-flag", action="append",
-            default=[], help="Additional command line flag to pass to DumpRenderTree "
+            default=[], help="Additional command line flag to pass to the driver "
                  "Specify multiple times to add multiple flags."),
         optparse.make_option("--driver-name", type="string",
-            help="Alternative DumpRenderTree binary to use"),
-        optparse.make_option("--content-shell", action="store_true",
-            help="Use Content Shell instead of DumpRenderTree"),
-        optparse.make_option("--dump-render-tree", action="store_true",
-            help="Use DumpRenderTree instead of Content Shell"),
+            help="Alternative driver binary to use"),
         optparse.make_option("--additional-platform-directory", action="append",
             default=[], help="Additional directory where to look for test "
                  "baselines (will take precendence over platform baselines). "
@@ -178,17 +174,15 @@ def parse_args(args):
     option_group_definitions.append(("Testing Options", [
         optparse.make_option("--build", dest="build",
             action="store_true", default=True,
-            help="Check to ensure the DumpRenderTree build is up-to-date "
-                 "(default)."),
+            help="Check to ensure the build is up-to-date (default)."),
         optparse.make_option("--no-build", dest="build",
-            action="store_false", help="Don't check to see if the "
-                                       "DumpRenderTree build is up-to-date."),
+            action="store_false", help="Don't check to see if the build is up-to-date."),
         optparse.make_option("-n", "--dry-run", action="store_true",
             default=False,
             help="Do everything but actually run the tests or upload results."),
         optparse.make_option("--wrapper",
             help="wrapper command to insert before invocations of "
-                 "DumpRenderTree; option is split on whitespace before "
+                 "the driver; option is split on whitespace before "
                  "running. (Example: --wrapper='valgrind --smc-check=all')"),
         optparse.make_option("-i", "--ignore-tests", action="append", default=[],
             help="directories or test to ignore (may specify multiple times)"),
@@ -222,11 +216,11 @@ def parse_args(args):
                   "the nth of m parts, of the layout tests")),
         optparse.make_option("--batch-size",
             help=("Run a the tests in batches (n), after every n tests, "
-                  "DumpRenderTree is relaunched."), type="int", default=None),
+                  "the driver is relaunched."), type="int", default=None),
         optparse.make_option("--run-singly", action="store_true",
-            default=False, help="run a separate DumpRenderTree for each test (implies --verbose)"),
+            default=False, help="run a separate driver for each test (implies --verbose)"),
         optparse.make_option("--child-processes",
-            help="Number of DumpRenderTrees to run in parallel."),
+            help="Number of drivers to run in parallel."),
         # FIXME: Display default number of child processes that will run.
         optparse.make_option("-f", "--fully-parallel", action="store_true",
             help="run all tests in parallel"),