Rename chromium-android port to android

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

 # Copyright (C) 2012 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 # copyright notice, this list of conditions and the following disclaimer
@@ skipping 338 matching lines @@
     # Private methods
     def _battery_level_for_device(self, commands):
         battery_status = commands.run(['shell', 'dumpsys', 'battery'])
         if 'Error' in battery_status:
             _log.warning('Unable to read the battery level from device with serial "%s".' % commands.get_serial())
             return 100
 
         return int(re.findall('level: (\d+)', battery_status)[0])
 
 
-class ChromiumAndroidPort(chromium.ChromiumPort):
-    port_name = 'chromium-android'
+class AndroidPort(chromium.ChromiumPort):
+    port_name = 'android'
 
     # Avoid initializing the adb path [worker count]+1 times by storing it as a static member.
     _adb_path = None
 
     SUPPORTED_VERSIONS = ('android')
 
     FALLBACK_PATHS = { 'android': [ 'chromium-android' ] + linux.LinuxPort.latest_platform_fallback_path() }
 
     def __init__(self, host, port_name, **kwargs):
-        super(ChromiumAndroidPort, self).__init__(host, port_name, **kwargs)
+        super(AndroidPort, self).__init__(host, port_name, **kwargs)
 
         self._operating_system = 'android'
         self._version = 'icecreamsandwich'
 
         self._host_port = factory.PortFactory(host).get('chromium', **kwargs)
         self._server_process_constructor = self._android_server_process_constructor
 
         if self.driver_name() != self.CONTENT_SHELL_NAME:
             raise AssertionError('Layout tests on Android only support content_shell as the driver.')
 
@@ skipping 44 matching lines @@
 
         return usable_device_count
 
     def default_baseline_search_path(self):
         return map(self._webkit_baseline_path, self.FALLBACK_PATHS['android'])
 
     def check_wdiff(self, logging=True):
         return self._host_port.check_wdiff(logging)
 
     def check_build(self, needs_http):
-        result = super(ChromiumAndroidPort, self).check_build(needs_http)
+        result = super(AndroidPort, self).check_build(needs_http)
         result = self._check_file_exists(self.path_to_md5sum(), 'md5sum utility') and result
         result = self._check_file_exists(self.path_to_md5sum_host(), 'md5sum host utility') and result
         result = self._check_file_exists(self.path_to_forwarder(), 'forwarder utility') and result
         if not result:
             _log.error('For complete Android build requirements, please see:')
             _log.error('')
             _log.error('    http://code.google.com/p/chromium/wiki/AndroidBuildInstructions')
 
         return result
 
@@ skipping 13 matching lines @@
     def requires_http_server(self):
         """Chromium Android runs tests on devices, and uses the HTTP server to
         serve the actual layout tests to the test driver."""
         return True
 
     def start_http_server(self, additional_dirs=None, number_of_servers=0):
         if not additional_dirs:
             additional_dirs = {}
         additional_dirs[PERF_TEST_PATH_PREFIX] = self.perf_tests_dir()
         additional_dirs[LAYOUT_TEST_PATH_PREFIX] = self.layout_tests_dir()
-        super(ChromiumAndroidPort, self).start_http_server(additional_dirs, number_of_servers)
+        super(AndroidPort, self).start_http_server(additional_dirs, number_of_servers)
 
     def create_driver(self, worker_number, no_timeout=False):
         return ChromiumAndroidDriver(self, worker_number, pixel_tests=self.get_option('pixel_tests'),
                                      driver_details=self._driver_details,
                                      android_devices=self._devices,
                                      # Force no timeout to avoid test driver timeouts before NRWT.
                                      no_timeout=True)
 
     def driver_cmd_line(self):
         # Override to return the actual test driver's command line.
@@ skipping 581 matching lines @@
         line = server_process.read_stdout_line(deadline)
         while not server_process.timed_out and not server_process.has_crashed() and not text in line.rstrip():
             output += line
             line = server_process.read_stdout_line(deadline)
 
         if server_process.timed_out or server_process.has_crashed():
             _log.error('Failed to start the %s process: \n%s' % (server_process.name(), output))
             return False
 
         return True