Rename various methods in webkitpy.layout_test.Port to be public

Tools/Scripts/webkitpy/layout_tests/servers/apache_http_server.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 50 matching lines @@
 
         test_dir = self._port_obj.layout_tests_dir()
         js_test_resources_dir = self._filesystem.join(test_dir, "resources")
         media_resources_dir = self._filesystem.join(test_dir, "media")
         mime_types_path = self._filesystem.join(test_dir, "http", "conf", "mime.types")
         cert_file = self._filesystem.join(test_dir, "http", "conf", "webkit-httpd.pem")
         access_log = self._filesystem.join(output_dir, "access_log.txt")
         error_log = self._filesystem.join(output_dir, "error_log.txt")
         document_root = self._filesystem.join(test_dir, "http", "tests")
 
-        # FIXME: We shouldn't be calling a protected method of _port_obj!
-        executable = self._port_obj._path_to_apache()
+        executable = self._port_obj.path_to_apache()
 
         start_cmd = [executable,
-            '-f', "\"%s\"" % self._get_apache_config_file_path(test_dir, output_dir),
+            '-f', "\"%s\"" % self._port_obj.path_to_apache_config_file(),
             '-C', "\'DocumentRoot \"%s\"\'" % document_root,
             '-c', "\'Alias /js-test-resources \"%s\"'" % js_test_resources_dir,
             '-c', "\'Alias /media-resources \"%s\"'" % media_resources_dir,
             '-c', "\'TypesConfig \"%s\"\'" % mime_types_path,
             '-c', "\'CustomLog \"%s\" common\'" % access_log,
             '-c', "\'ErrorLog \"%s\"\'" % error_log,
             '-C', "\'User \"%s\"\'" % os.environ.get("USERNAME", os.environ.get("USER", "")),
             '-c', "\'PidFile %s'" % self._pid_file,
             '-k', "start"]
 
@@ skipping 28 matching lines @@
                         '-c', "\'<Location %s>\'" % alias,
                         '-c', "\'RemoveHandler .cgi .pl\'",
                         '-c', "\'</Location>\'"]
 
         if self._number_of_servers:
             start_cmd += ['-c', "\'StartServers %d\'" % self._number_of_servers,
                           '-c', "\'MinSpareServers %d\'" % self._number_of_servers,
                           '-c', "\'MaxSpareServers %d\'" % self._number_of_servers]
 
         stop_cmd = [executable,
-            '-f', "\"%s\"" % self._get_apache_config_file_path(test_dir, output_dir),
+            '-f', "\"%s\"" % self._port_obj.path_to_apache_config_file(),
             '-c', "\'PidFile %s'" % self._pid_file,
             '-k', "stop"]
 
         start_cmd.extend(['-c', "\'SSLCertificateFile %s\'" % cert_file])
         # Join the string here so that Cygwin/Windows and Mac/Linux
         # can use the same code. Otherwise, we could remove the single
         # quotes above and keep cmd as a sequence.
         # FIXME: It's unclear if this is still needed.
         self._start_cmd = " ".join(start_cmd)
         self._stop_cmd = " ".join(stop_cmd)
 
-    def _get_apache_config_file_path(self, test_dir, output_dir):
-        """Returns the path to the apache config file to use.
-        Args:
-          test_dir: absolute path to the LayoutTests directory.
-          output_dir: absolute path to the layout test results directory.
-        """
-        httpd_config = self._port_obj._path_to_apache_config_file()
-        httpd_config_copy = os.path.join(output_dir, "httpd.conf")
-        httpd_conf = self._filesystem.read_text_file(httpd_config)
-
-        # FIXME: Why do we need to copy the config file since we're not modifying it?
-        self._filesystem.write_text_file(httpd_config_copy, httpd_conf)
-
-        return httpd_config_copy
-
     def _spawn_process(self):
         _log.debug('Starting %s server, cmd="%s"' % (self._name, str(self._start_cmd)))
         retval, err = self._run(self._start_cmd)
         if retval or len(err):
             raise http_server_base.ServerError('Failed to start %s: %s' % (self._name, err))
 
         # For some reason apache isn't guaranteed to have created the pid file before
         # the process exits, so we wait a little while longer.
         if not self._wait_for_action(lambda: self._filesystem.exists(self._pid_file)):
             raise http_server_base.ServerError('Failed to start %s: no pid file found' % self._name)
@@ skipping 22 matching lines @@
         # the sake of Window/Cygwin and it needs quoting that breaks
         # shell=False.
         # FIXME: We should not need to be joining shell arguments into strings.
         # shell=True is a trail of tears.
         # Note: Not thread safe: http://bugs.python.org/issue2320
         process = self._executive.popen(cmd, shell=True, stderr=self._executive.PIPE)
         process.wait()
         retval = process.returncode
         err = process.stderr.read()
         return (retval, err)