Use sky_shell instead of mojo_shell for testing.

sky/tools/webkitpy/layout_tests/port/base.py

 # Copyright (C) 2010 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 69 matching lines @@
     # one unique value per class.
 
     # FIXME: We should probably rename this to something like 'implementation_name'.
     port_name = None
 
     # Test names resemble unix relative paths, and use '/' as a directory separator.
     TEST_PATH_SEPARATOR = '/'
 
     ALL_BUILD_TYPES = ('debug', 'release')
 
-    CONTENT_SHELL_NAME = 'content_shell'
-    MOJO_SHELL_NAME = 'mojo_shell'
+    SKY_SHELL_NAME = 'sky_shell'
 
     # True if the port as aac and mp3 codecs built in.
     PORT_HAS_AUDIO_CODECS_BUILT_IN = False
 
     ALL_SYSTEMS = (
         ('snowleopard', 'x86'),
         ('lion', 'x86'),
 
         # FIXME: We treat Retina (High-DPI) devices as if they are running
         # a different operating system version. This isn't accurate, but will work until
@@ skipping 114 matching lines @@
 
         if not hasattr(options, 'configuration') or not options.configuration:
             self.set_option_default('configuration', self.default_configuration())
         self._test_configuration = None
         self._reftest_list = {}
         self._results_directory = None
 
     def buildbot_archives_baselines(self):
         return True
 
-    def additional_drt_flag(self):
-        driver_name = self.driver_name()
-        if driver_name == self.CONTENT_SHELL_NAME:
-            return ['--dump-render-tree']
-        if driver_name == self.MOJO_SHELL_NAME:
-            return [
-                # TODO(ianh): Remove text/sky once we remove .sky files
-                '--args-for=mojo:native_viewport_service --use-headless-config --use-osmesa',
-                '--args-for=mojo:sky_viewer --testing',
-                '--content-handlers=text/sky,mojo:sky_viewer,application/dart,mojo:sky_viewer',
-                '--url-mappings=mojo:window_manager=mojo:sky_tester,mojo:surfaces_service=mojo:fake_surfaces_service',
-                'mojo:window_manager',
-            ]
-        return []
-
     def supports_per_test_timeout(self):
         return False
 
     def default_pixel_tests(self):
         return False
 
     def default_smoke_test_only(self):
         return False
 
     def default_timeout_ms(self):
@@ skipping 266 matching lines @@
         # the diff. Relevant Python issue: http://bugs.python.org/issue2142
         def diff_fixup(diff):
             for line in diff:
                 yield line
                 if not line.endswith('\n'):
                     yield '\n\ No newline at end of file\n'
 
         return ''.join(diff_fixup(diff))
 
     def driver_name(self):
-        if self.get_option('driver_name'):
-            return self.get_option('driver_name')
-        return self.MOJO_SHELL_NAME
+        return self.SKY_SHELL_NAME
 
     def expected_baselines_by_extension(self, test_name):
         """Returns a dict mapping baseline suffix to relative path for each baseline in
         a test. For reftests, it returns ".==" or ".!=" instead of the suffix."""
         # FIXME: The name similarity between this and expected_baselines() below, is unfortunate.
         # We should probably rename them both.
         baseline_dict = {}
         reference_files = self.reference_files(test_name)
         if reference_files:
             # FIXME: How should this handle more than one type of reftest?
@@ skipping 1227 matching lines @@
 
 class PhysicalTestSuite(object):
     def __init__(self, base, args):
         self.name = base
         self.base = base
         self.args = args
         self.tests = set()
 
     def __repr__(self):
         return "PhysicalTestSuite('%s', '%s', %s)" % (self.name, self.base, self.args)