Add support for Mac vs. Linux sky_server builds

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

Index: sky/tools/webkitpy/layout_tests/port/base.py
diff --git a/sky/tools/webkitpy/layout_tests/port/base.py b/sky/tools/webkitpy/layout_tests/port/base.py
index 169a5e434b1543733bb7f1f652a1e6eee8dcc2c7..4ed1604e6043e3420133d802da28a8a70d1d57a8 100644
--- a/sky/tools/webkitpy/layout_tests/port/base.py
+++ b/sky/tools/webkitpy/layout_tests/port/base.py
@@ -66,6 +66,7 @@ from webkitpy.layout_tests.port import server_process
 from webkitpy.layout_tests.port.factory import PortFactory
 from webkitpy.layout_tests.servers import apache_http
 from webkitpy.layout_tests.servers import pywebsocket
+from skypy.skyserver import SkyServer
 
 _log = logging.getLogger(__name__)
 
@@ -1093,8 +1094,8 @@ class Port(object):
         return self._build_path('gen/dart-pkg/packages')
 
     def server_command_line(self):
-        path = (self._options.path_to_server or
-            self.path_from_chromium_base('out', 'downloads', 'sky_server'))
+        # TODO(eseidel): Shouldn't this just use skyserver.py?
+        path = (self._options.path_to_server or SkyServer.sky_server_path())
         return [
             path,
             '-t', self.get_option('configuration'),
@@ -1108,7 +1109,6 @@ class Port(object):
 
         Ports can stub this out if they don't need a web server to be running."""
         assert not self._http_server, 'Already running an http server.'
-        subprocess.call(self.path_to_script('download_sky_server'))
         self._http_server = subprocess.Popen(self.server_command_line())
 
     def start_websocket_server(self):