Update README.md and HACKING.md and resulting yak shave.

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 170 matching lines @@
         # options defined on it.
         self._options = options or optparse.Values()
 
         self.host = host
         self._executive = host.executive
         self._filesystem = host.filesystem
         self._webkit_finder = WebKitFinder(host.filesystem)
         self._config = port_config.Config(self._executive, self._filesystem, self.port_name)
 
         self._helper = None
-        self._http_server = None
+        self._sky_server = None
         self._websocket_server = None
         self._image_differ = None
         self._server_process_constructor = server_process.ServerProcess  # overridable for testing
         self._http_lock = None  # FIXME: Why does this live on the port object?
         self._dump_reader = None
 
         # Python's Popen has a bug that causes any pipes opened to a
         # process that can't be executed to be leaked.  Since this
         # code is specifically designed to tolerate exec failures
         # to gracefully handle cases where wdiff is not installed,
@@ skipping 20 matching lines @@
 
     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,text/plain,mojo:sky_viewer',
+                '--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
@@ skipping 832 matching lines @@
         helper_path = self._path_to_helper()
         if helper_path:
             _log.debug("Starting layout helper %s" % helper_path)
             # Note: Not thread safe: http://bugs.python.org/issue2320
             self._helper = self._executive.popen([helper_path],
                 stdin=self._executive.PIPE, stdout=self._executive.PIPE, stderr=None)
             is_ready = self._helper.stdout.readline()
             if not is_ready.startswith('ready'):
                 _log.error("layout_test_helper failed to be ready")
 
-    def requires_http_server(self):
+    def requires_sky_server(self):
         """Does the port require an HTTP server for running tests? This could
         be the case when the tests aren't run on the host platform."""
         return True
 
     def _dart_packages_root(self):
         return self._build_path('gen/dart-pkg/packages')
 
-    def server_command_line(self):
-        # 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'),
-            self.path_from_chromium_base(),
-            '8000',
-            self._dart_packages_root()
-        ]
-
-    def start_http_server(self, additional_dirs, number_of_drivers):
+    def start_sky_server(self, additional_dirs, number_of_drivers):
         """Start a web server. Raise an error if it can't start or is already running.
 
         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.'
-        self._http_server = subprocess.Popen(self.server_command_line())
+        assert not self._sky_server, 'Already running an http server.'
+        self._sky_server = SkyServer(8000, self.path_from_chromium_base(), self._dart_packages_root())
+        self._sky_server.start()
 
     def start_websocket_server(self):
         """Start a web server. Raise an error if it can't start or is already running.
 
         Ports can stub this out if they don't need a websocket server to be running."""
         assert not self._websocket_server, 'Already running a websocket server.'
 
         server = pywebsocket.PyWebSocket(self, self.results_directory())
         server.start()
         self._websocket_server = server
@@ skipping 12 matching lines @@
             _log.debug("Stopping layout test helper")
             try:
                 self._helper.stdin.write("x\n")
                 self._helper.stdin.close()
                 self._helper.wait()
             except IOError, e:
                 pass
             finally:
                 self._helper = None
 
-    def stop_http_server(self):
-        """Shut down the http server if it is running. Do nothing if it isn't."""
-        if self._http_server:
-            self._http_server.terminate()
-            self._http_server = None
+    def stop_sky_server(self):
+        """Shut down the Http server if it is running. Do nothing if it isn't."""
+        if self._sky_server:
+            self._sky_server.stop()
+            self._sky_server = None
 
     def stop_websocket_server(self):
         """Shut down the websocket server if it is running. Do nothing if it isn't."""
         if self._websocket_server:
             self._websocket_server.stop()
             self._websocket_server = None
 
     #
     # TEST EXPECTATION-RELATED METHODS
     #
@@ skipping 617 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)