Ensure manifest exists in Port._wpt_manifest.

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

Index: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py
index bbab2f280281c912fee8f64251d6292d65992fb2..088d6c2f7e6892f01083d25c182518dee7c1d882 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py
@@ -99,8 +99,8 @@ class Manager(object):
         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)
@@ -552,18 +552,3 @@ class Manager(object):
         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)