Rename functions in Port related to wptserve and add a helper function.

third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/driver.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 210 matching lines @@
         # used by e.g. tools/valgrind/valgrind_tests.py.
         return shlex.split(wrapper_option) if wrapper_option else []
 
     HTTP_DIR = "http/tests/"
     HTTP_LOCAL_DIR = "http/tests/local/"
     WPT_DIR = "imported/wpt/"
 
     def is_http_test(self, test_name):
         return test_name.startswith(self.HTTP_DIR) and not test_name.startswith(self.HTTP_LOCAL_DIR)
 
-    def _should_treat_as_wpt_test(self, test_name):
-        return self._port.is_wpt_enabled() and self._port.is_wpt_test(test_name)
-
     def _get_http_host_and_ports_for_test(self, test_name):
-        if self._should_treat_as_wpt_test(test_name):
+        if self._port.should_use_wptserve(test_name):
             # TODO(burnik): Read from config or args.
             return ("web-platform.test", 8001, 8444)
         else:
             return ("127.0.0.1", 8000, 8443)
 
     def test_to_uri(self, test_name):
         """Convert a test name to a URI.
 
         Tests which have an 'https' directory in their paths (e.g.
         '/http/tests/security/mixedContent/https/test1.html') or '.https.' in
         their name (e.g. 'http/tests/security/mixedContent/test1.https.html') will
         be loaded over HTTPS; all other tests over HTTP.
         """
-        is_wpt_test = self._should_treat_as_wpt_test(test_name)
+        using_wptserve = self._port.should_use_wptserve(test_name)
 
-        if not self.is_http_test(test_name) and not is_wpt_test:
+        if not self.is_http_test(test_name) and not using_wptserve:
             return path.abspath_to_uri(self._port.host.platform, self._port.abspath_for_test(test_name))
 
-        if is_wpt_test:
+        if using_wptserve:
             test_dir_prefix = self.WPT_DIR
         else:
             test_dir_prefix = self.HTTP_DIR
 
         relative_path = test_name[len(test_dir_prefix):]
         hostname, insecure_port, secure_port = self._get_http_host_and_ports_for_test(test_name)
 
         if "/https/" in test_name or ".https." in test_name:
             return "https://%s:%d/%s" % (hostname, secure_port, relative_path)
         return "http://%s:%d/%s" % (hostname, insecure_port, relative_path)
@@ skipping 141 matching lines @@
             self._leaked = True
             match = re.match('#LEAK - (\S+) pid (\d+) (.+)\n', error_line)
             self._leak_log = match.group(3)
         return self._leaked
 
     def _command_from_driver_input(self, driver_input):
         # FIXME: performance tests pass in full URLs instead of test names.
         if driver_input.test_name.startswith(
                 'http://') or driver_input.test_name.startswith('https://') or driver_input.test_name == ('about:blank'):
             command = driver_input.test_name
-        elif self.is_http_test(driver_input.test_name) or self._should_treat_as_wpt_test(driver_input.test_name):
+        elif self.is_http_test(driver_input.test_name) or self._port.should_use_wptserve(driver_input.test_name):
             command = self.test_to_uri(driver_input.test_name)
         else:
             command = self._port.abspath_for_test(driver_input.test_name)
             if sys.platform == 'cygwin':
                 command = path.cygpath(command)
 
         assert not driver_input.image_hash or driver_input.should_run_pixel_test
 
         # ' is the separator between arguments.
         if self._port.supports_per_test_timeout():
@@ skipping 117 matching lines @@
         self.decoded_content = None
         self.malloc = None
         self.js_heap = None
         self.stdin_path = None
 
     def decode_content(self):
         if self.encoding == 'base64' and self.content is not None:
             self.decoded_content = base64.b64decode(self.content)
         else:
             self.decoded_content = self.content