reland r151588 (remove unsupported run-webkit-tests flags)

Tools/Scripts/webkitpy/layout_tests/port/factory.py

Index: Tools/Scripts/webkitpy/layout_tests/port/factory.py
diff --git a/Tools/Scripts/webkitpy/layout_tests/port/factory.py b/Tools/Scripts/webkitpy/layout_tests/port/factory.py
index e83cdd3b817186901a144655806c995ae5ee4769..e23f6e8b2a9769c9aaafcc1b6fc90a320b38a4eb 100644
--- a/Tools/Scripts/webkitpy/layout_tests/port/factory.py
+++ b/Tools/Scripts/webkitpy/layout_tests/port/factory.py
@@ -39,9 +39,12 @@ def platform_options(use_globs=False):
     return [
         optparse.make_option('--platform', action='store',
             help=('Glob-style list of platform/ports to use (e.g., "mac*")' if use_globs else 'Platform to use (e.g., "mac-lion")')),
+
+        # FIXME: Update run_webkit_tests.sh, any other callers to no longer pass --chromium, then remove this flag.
         optparse.make_option('--chromium', action='store_const', dest='platform',
             const=('chromium*' if use_globs else 'chromium'),
             help=('Alias for --platform=chromium*' if use_globs else 'Alias for --platform=chromium')),
+
         optparse.make_option('--chromium-android', action='store_const', dest='platform',
             const=('chromium-android*' if use_globs else 'chromium-android'),
             help=('Alias for --platform=chromium-android*' if use_globs else 'Alias for --platform=chromium')),
@@ -50,14 +53,12 @@ def platform_options(use_globs=False):
 
 def configuration_options():
     return [
-        optparse.make_option("-t", "--target", dest="configuration", help="(DEPRECATED)"),
-        # FIXME: --help should display which configuration is default.
+        optparse.make_option("-t", "--target", dest="configuration",
+                             help="specify the target configuration to use (Debug/Release)"),
         optparse.make_option('--debug', action='store_const', const='Debug', dest="configuration",
             help='Set the configuration to Debug'),
         optparse.make_option('--release', action='store_const', const='Release', dest="configuration",
             help='Set the configuration to Release'),
-        optparse.make_option('--32-bit', action='store_const', const='x86', default=None, dest="architecture",
-            help='use 32-bit binaries by default (x86 instead of x86_64)'),
         ]