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

Tools/Scripts/webkitpy/layout_tests/servers/pywebsocket.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 15 matching lines @@
 # (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 PyWebSocket server used by layout tests."""
 
 import logging
 import os
 import sys
 import time
 
-from webkitpy.layout_tests.servers import http_server
-from webkitpy.layout_tests.servers import http_server_base
+from webkitpy.layout_tests.servers import lighttpd
+from webkitpy.layout_tests.servers import server_base
 
 _log = logging.getLogger(__name__)
 
 
 _WS_LOG_PREFIX = 'pywebsocket.ws.log-'
 _WSS_LOG_PREFIX = 'pywebsocket.wss.log-'
 
 
 _DEFAULT_WS_PORT = 8880
 _DEFAULT_WSS_PORT = 9323
 
 
-class PyWebSocket(http_server.Lighttpd):
+class PyWebSocket(lighttpd.Lighttpd):
     def __init__(self, port_obj, output_dir, port=_DEFAULT_WS_PORT,
                  root=None, use_tls=False,
                  private_key=None, certificate=None, ca_certificate=None,
                  pidfile=None):
         """Args:
           output_dir: the absolute path to the layout test result directory
         """
-        http_server.Lighttpd.__init__(self, port_obj, output_dir,
-                                      port=_DEFAULT_WS_PORT,
-                                      root=root)
+        super(PyWebSocket, self).__init__(port_obj, output_dir,
+                                          port=_DEFAULT_WS_PORT,
+                                          root=root)
         self._output_dir = output_dir
         self._pid_file = pidfile
         self._process = None
 
         self._port = port
         self._root = root
         self._use_tls = use_tls
 
         self._name = 'pywebsocket'
         if self._use_tls:
@@ skipping 95 matching lines @@
 
     def _stop_running_server(self):
         super(PyWebSocket, self)._stop_running_server()
 
         if self._wsin:
             self._wsin.close()
             self._wsin = None
         if self._wsout:
             self._wsout.close()
             self._wsout = None