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

third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py

 # Copyright (C) 2010 Google Inc. All rights reserved.
 # Copyright (C) 2010 Gabor Rapcsanyi (rgabor@inf.u-szeged.hu), University of Szeged
 #
 # 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
@@ skipping 212 matching lines @@
         return (
             test.startswith(self.HTTP_SUBDIR) or
             self._is_websocket_test(test) or
             self._port.TEST_PATH_SEPARATOR + self.HTTP_SUBDIR in test
         )
 
     def _is_inspector_test(self, test):
         return self.INSPECTOR_SUBDIR in test
 
     def _is_websocket_test(self, test):
-        if self._port.is_wpt_enabled() and self._port.is_wpt_test(test):
+        if self._port.should_use_wptserve(test):
             return False
 
         return self.WEBSOCKET_SUBDIR in test
 
     def _http_tests(self, test_names):
         return set(test for test in test_names if self._is_http_test(test))
 
     def _is_perf_test(self, test):
         return self.PERF_SUBDIR == test or (self.PERF_SUBDIR + self._port.TEST_PATH_SEPARATOR) in test
 
@@ skipping 118 matching lines @@
 
         test_inputs = []
         for _ in xrange(iterations):
             for test in tests_to_run:
                 for _ in xrange(repeat_each):
                     test_inputs.append(self._test_input_for_file(test))
         return self._runner.run_tests(self._expectations, test_inputs,
                                       tests_to_skip, num_workers, retry_attempt)
 
     def _start_servers(self, tests_to_run):
-        if self._port.is_wpt_enabled() and any(self._port.is_wpt_test(test) for test in tests_to_run):
+        if self._port.is_wptserve_enabled() and any(self._port.is_wptserve_test(test) for test in tests_to_run):
             self._printer.write_update('Starting WPTServe ...')
             self._port.start_wptserve()
             self._wptserve_started = True
 
         if self._port.requires_http_server() or any((self._is_http_test(test) or self._is_inspector_test(test))
                                                     for test in tests_to_run):
             self._printer.write_update('Starting HTTP server ...')
             self._port.start_http_server(additional_dirs={}, number_of_drivers=self._options.max_locked_shards)
             self._http_server_started = True
 
@@ skipping 170 matching lines @@
 
         stats = {}
         for result in initial_results.results_by_name.values():
             if result.type != test_expectations.SKIP:
                 stats[result.test_name] = {'results': (_worker_number(result.worker_name), result.test_number, result.pid, int(
                     result.test_run_time * 1000), int(result.total_run_time * 1000))}
         stats_trie = {}
         for name, value in stats.iteritems():
             json_results_generator.add_path_to_trie(name, value, stats_trie)
         return stats_trie