Use sky_shell instead of mojo_shell for testing.

sky/tools/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 408 matching lines @@
 
         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 not self.get_option('disable_breakpad'):
             self._dump_reader = DumpReaderAndroid(host, self._build_path())
 
-        if self.driver_name() != self.CONTENT_SHELL_NAME:
-            raise AssertionError('Layout tests on Android only support content_shell as the driver.')
-
         self._driver_details = ContentShellDriverDetails()
 
         # Initialize the AndroidDevices class which tracks available devices.
         default_device = None
         if hasattr(self._options, 'adb_device') and len(self._options.adb_device):
             default_device = self._options.adb_device
 
         self._debug_logging = self.get_option('android_logging')
         self._devices = AndroidDevices(self._executive, default_device, self._debug_logging)
 
@@ skipping 11 matching lines @@
     # Local public methods.
     def path_to_forwarder(self):
         return self._build_path('forwarder')
 
     def path_to_md5sum(self):
         return self._build_path(MD5SUM_DEVICE_FILE_NAME)
 
     def path_to_md5sum_host(self):
         return self._build_path(MD5SUM_HOST_FILE_NAME)
 
-    def additional_drt_flag(self):
-        return self._driver_details.additional_command_line_flags(use_breakpad=not self.get_option('disable_breakpad'))
-
     def default_timeout_ms(self):
         # Android platform has less computing power than desktop platforms.
         # Using 10 seconds allows us to pass most slow tests which are not
         # marked as slow tests on desktop platforms.
         return 10 * 1000
 
     def driver_stop_timeout(self):
         # The driver doesn't respond to closing stdin, so we might as well stop the driver immediately.
         return 0.0
 
@@ skipping 792 matching lines @@
         return command
 
     def _read_prompt(self, deadline):
         last_char = ''
         while True:
             current_char = self._server_process.read_stdout(deadline, 1)
             if current_char == ' ':
                 if last_char in ('#', '$'):
                     return
             last_char = current_char