Ensure manifest exists in Port._wpt_manifest.

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 81 matching lines @@
         self._finder = LayoutTestFinder(self._port, self._options)
         self._webkit_finder = WebKitFinder(port.host.filesystem)
         self._runner = LayoutTestRunner(self._options, self._port, self._printer, self._results_directory, self._test_is_slow)
 
     def run(self, args):
         """Run the tests and return a RunDetails object with the results."""
         start_time = time.time()
         self._printer.write_update("Collecting tests ...")
         running_all_tests = False
 
-        # Regenerate MANIFEST.json from template, necessary for web-platform-tests metadata.
-        self._ensure_manifest()
+        self._printer.write_update('Generating MANIFEST.json for web-platform-tests ...')
+        WPTManifest.ensure_manifest(self._port.host)
 
         try:
             paths, all_test_names, running_all_tests = self._collect_tests(args)
         except IOError:
             # This is raised if --test-list doesn't exist
             return test_run_results.RunDetails(exit_code=test_run_results.NO_TESTS_EXIT_STATUS)
 
         # Create a sorted list of test files so the subset chunk,
         # if used, contains alphabetically consecutive tests.
         if self._options.order == 'natural':
@@ skipping 431 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
-
-    def _ensure_manifest(self):
-        fs = self._filesystem
-        external_path = self._webkit_finder.path_from_webkit_base('LayoutTests', 'external')
-        wpt_path = fs.join(external_path, 'wpt')
-        manifest_path = fs.join(external_path, 'wpt', 'MANIFEST.json')
-        base_manifest_path = fs.join(external_path, 'WPT_BASE_MANIFEST.json')
-
-        if not self._filesystem.exists(manifest_path):
-            fs.copyfile(base_manifest_path, manifest_path)
-
-        self._printer.write_update('Generating MANIFEST.json for web-platform-tests ...')
-
-        # TODO(jeffcarp): handle errors
-        WPTManifest.generate_manifest(self._port.host, wpt_path)