Fix run-blink-httpd to work w/ Apache and refactor webkitpy.layout_tests.servers.

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

Index: Tools/Scripts/webkitpy/layout_tests/servers/apache_http_unittest.py
diff --git a/Tools/Scripts/webkitpy/layout_tests/servers/apache_http_server_unittest.py b/Tools/Scripts/webkitpy/layout_tests/servers/apache_http_unittest.py
similarity index 90%
rename from Tools/Scripts/webkitpy/layout_tests/servers/apache_http_server_unittest.py
rename to Tools/Scripts/webkitpy/layout_tests/servers/apache_http_unittest.py
index 4d0641cb18bba99b77747caa16a95744d4413ede..97eb6d8adff96e3d821a6e8d4a28b0c1b3be88bc 100644
--- a/Tools/Scripts/webkitpy/layout_tests/servers/apache_http_server_unittest.py
+++ b/Tools/Scripts/webkitpy/layout_tests/servers/apache_http_unittest.py
@@ -34,11 +34,11 @@ from webkitpy.common.system.executive_mock import MockExecutive
 from webkitpy.common.system.outputcapture import OutputCapture
 from webkitpy.common.host_mock import MockHost
 from webkitpy.layout_tests.port import test
-from webkitpy.layout_tests.servers.apache_http_server import LayoutTestApacheHttpd
-from webkitpy.layout_tests.servers.http_server_base import ServerError
+from webkitpy.layout_tests.servers.apache_http import ApacheHttpd
+from webkitpy.layout_tests.servers.server_base import ServerError
 
 
-class TestLayoutTestApacheHttpd(unittest.TestCase):
+class TestApacheHttpd(unittest.TestCase):
     def test_start_cmd(self):
         # Fails on win - see https://bugs.webkit.org/show_bug.cgi?id=84726
         if sys.platform in ('cygwin', 'win32'):
@@ -53,7 +53,7 @@ class TestLayoutTestApacheHttpd(unittest.TestCase):
         test_port = test.TestPort(host)
         host.filesystem.write_text_file(test_port.path_to_apache_config_file(), '')
 
-        server = LayoutTestApacheHttpd(test_port, "/mock/output_dir", number_of_servers=4)
+        server = ApacheHttpd(test_port, "/mock/output_dir", number_of_servers=4)
         server._check_that_all_ports_are_available = lambda: True
         server._is_server_running_on_all_ports = lambda: True
         server._wait_for_action = fake_pid
@@ -64,6 +64,7 @@ class TestLayoutTestApacheHttpd(unittest.TestCase):
             server.stop()
         finally:
             _, _, logs = oc.restore_output()
+
         self.assertIn("StartServers 4", logs)
         self.assertIn("MinSpareServers 4", logs)
         self.assertIn("MaxSpareServers 4", logs)