Rename the modules and classes in webkitpy.layout_tests.servers.

Tools/Scripts/webkitpy/layout_tests/servers/lighttpd.py

 # Copyright (C) 2011 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 14 matching lines @@
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 """A class to help start/stop the lighttpd server used by layout tests."""
 
 import logging
 import os
 import time
 
-from webkitpy.layout_tests.servers import http_server_base
+from webkitpy.layout_tests.servers import server_base
 
 
 _log = logging.getLogger(__name__)
 
 
-class Lighttpd(http_server_base.HttpServerBase):
+class Lighttpd(server_base.ServerBase):
 
     def __init__(self, port_obj, output_dir, background=False, port=None,
                  root=None, run_background=None, additional_dirs=None,
                  layout_tests_dir=None, number_of_servers=None):
         """Args:
           output_dir: the absolute path to the layout test result directory
         """
         # Webkit tests
-        http_server_base.HttpServerBase.__init__(self, port_obj, number_of_servers)
+        super(Lighttpd, self).__init__(port_obj, number_of_servers)
         self._name = 'lighttpd'
         self._output_dir = output_dir
         self._port = port
         self._root = root
         self._run_background = run_background
         self._additional_dirs = additional_dirs
         self._layout_tests_dir = layout_tests_dir
 
         self._pid_file = self._filesystem.join(self._runtime_path, '%s.pid' % self._name)
 
@@ skipping 158 matching lines @@
                 # FIXME: https://bugs.webkit.org/show_bug.cgi?id=106838
                 # We need to kill all of the child processes as well as the
                 # parent, so we can't use executive.kill_process().
                 #
                 # If this is actually working, we should figure out a clean API.
                 self._executive.run_command(["taskkill.exe", "/f", "/t", "/pid", self._pid], error_handler=self._executive.ignore_error)
             else:
                 self._executive.kill_process(self._pid)
             return False
         return True