Commit fc8412e6 authored by qyearsley's avatar qyearsley Committed by Commit bot

Remove the "chromium" port name and --chromium platform option.

Review-Url: https://codereview.chromium.org/2398823002
Cr-Commit-Position: refs/heads/master@{#423677}
parent f7941c45
......@@ -271,7 +271,7 @@ class AndroidPort(base.Port):
self._operating_system = 'android'
self._version = 'icecreamsandwich'
self._host_port = factory.PortFactory(host).get('chromium', **kwargs)
self._host_port = factory.PortFactory(host).get(**kwargs)
self._server_process_constructor = self._android_server_process_constructor
if not self.get_option('disable_breakpad'):
......
......@@ -41,11 +41,6 @@ def platform_options(use_globs=False):
const=('android*' if use_globs else 'android'),
help=('Alias for --platform=android*' if use_globs else 'Alias for --platform=android')),
# 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('--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")')),
......@@ -137,7 +132,7 @@ class PortFactory(object):
def __init__(self, host):
self._host = host
def _default_port(self, options):
def _default_port(self):
platform = self._host.platform
if platform.is_linux() or platform.is_freebsd():
return 'linux'
......@@ -152,15 +147,10 @@ class PortFactory(object):
port_name is None, this routine attempts to guess at the most
appropriate port on this platform.
"""
port_name = port_name or self._default_port(options)
port_name = port_name or self._default_port()
_check_configuration_and_target(self._host.filesystem, options)
# FIXME(steveblock): There's no longer any need to pass '--platform
# chromium' on the command line so we can remove this logic.
if port_name == 'chromium':
port_name = self._host.platform.os_name
if 'browser_test' in port_name:
module_name, class_name = port_name.rsplit('.', 1)
module = __import__(module_name, globals(), locals(), [], -1)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment