Directly use TestImporter in DepsUpdater instead of invoking script.

third_party/WebKit/Tools/Scripts/webkitpy/w3c/deps_updater.py

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Fetches a copy of the latest state of a W3C test repository and commits.
 
-If this script is given the argument --auto-update, it will also attempt to
-upload a CL, triggery try jobs, and make any changes that are required for
-new failing tests before committing.
+If this script is given the argument --auto-update, it will also:
+ 1. Upload a CL.
+ 2. Trigger try jobs and wait for them to complete.
+ 3. Make any changes that are required for new failing tests.
+ 4. Commit the CL.
 """
 
 import logging
 import argparse
 import json
 
 from webkitpy.common.net.git_cl import GitCL
 from webkitpy.common.webkit_finder import WebKitFinder
 from webkitpy.layout_tests.models.test_expectations import TestExpectations, TestExpectationParser
+from webkitpy.w3c.test_importer import TestImporter
 
 # Import destination directories (under LayoutTests/external/).
 WPT_DEST_NAME = 'wpt'
 CSS_DEST_NAME = 'csswg-test'
 
 # Our mirrors of the official w3c repos, which we pull from.
 WPT_REPO_URL = 'https://chromium.googlesource.com/external/w3c/web-platform-tests.git'
 CSS_REPO_URL = 'https://chromium.googlesource.com/external/w3c/csswg-test.git'
 
 
@@ skipping 112 matching lines @@
             source = self.path_from_webkit_base('LayoutTests', 'resources', filename)
             destination = self.path_from_webkit_base('LayoutTests', 'external', WPT_DEST_NAME, wpt_subdir, filename)
             self.copyfile(source, destination)
             self.run(['git', 'add', destination])
         for filename, wpt_subdir in resources_to_copy_from_wpt:
             source = self.path_from_webkit_base('LayoutTests', 'external', WPT_DEST_NAME, wpt_subdir, filename)
             destination = self.path_from_webkit_base('LayoutTests', 'resources', filename)
             self.copyfile(source, destination)
             self.run(['git', 'add', destination])
 
-    def _generate_manifest(self, original_repo_path, dest_path):
+    def _generate_manifest(self, dest_path):
         """Generates MANIFEST.json for imported tests.
 
         Args:
             original_repo_path: Path to the temporary source WPT repo directory.
             dest_path: Path to the destination WPT directory.
 
         Runs the (newly-updated) manifest command if it's found, and then
         stages the generated MANIFEST.json in the git index, ready to commit.
         """
         manifest_command = self.finder.path_from_webkit_base('Tools', 'Scripts', 'webkitpy', 'thirdparty', 'wpt', 'wpt', 'manifest')
@@ skipping 29 matching lines @@
         master_commitish = show_ref_output.split()[0]
 
         _log.info('Cleaning out tests from LayoutTests/external/%s.', dest_dir_name)
         dest_path = self.path_from_webkit_base('LayoutTests', 'external', dest_dir_name)
         is_not_baseline_filter = lambda fs, dirname, basename: not self.is_baseline(basename)
         files_to_delete = self.fs.files_under(dest_path, file_filter=is_not_baseline_filter)
         for subpath in files_to_delete:
             self.remove('LayoutTests', 'external', subpath)
 
         _log.info('Importing the tests.')
-        src_repo = self.path_from_webkit_base(dest_dir_name)
-        import_path = self.path_from_webkit_base('Tools', 'Scripts', 'import-w3c-tests')
-        self.run([self.host.executable, import_path, '-d', 'external', src_repo])
+        test_importer = TestImporter(self.host, temp_repo_path)
+        test_importer.do_import()
 
         self.run(['git', 'add', '--all', 'LayoutTests/external/%s' % dest_dir_name])
 
         _log.info('Deleting any orphaned baselines.')
 
         is_baseline_filter = lambda fs, dirname, basename: self.is_baseline(basename)
         previous_baselines = self.fs.files_under(dest_path, file_filter=is_baseline_filter)
 
         for subpath in previous_baselines:
             full_path = self.fs.join(dest_path, subpath)
             if self.fs.glob(full_path.replace('-expected.txt', '*')) == [full_path]:
                 self.fs.remove(full_path)
 
-        self._generate_manifest(temp_repo_path, dest_path)
+        self._generate_manifest(dest_path)
 
         if not keep_w3c_repos_around:
             _log.info('Deleting temp repo directory %s.', temp_repo_path)
             self.rmtree(temp_repo_path)
 
         _log.info('Updating TestExpectations for any removed or renamed tests.')
         self.update_all_test_expectations_files(self._list_deleted_tests(), self._list_renamed_tests())
 
         return '%s@%s' % (dest_dir_name, master_commitish)
 
@@ skipping 224 matching lines @@
         """Returns a dict mapping source to dest name for layout tests that have been renamed."""
         out = self.check_run(['git', 'diff', 'origin/master', '-M100%', '--diff-filter=R', '--name-status'])
         renamed_tests = {}
         for line in out.splitlines():
             _, source_path, dest_path = line.split()
             source_test = self.finder.layout_test_name(source_path)
             dest_test = self.finder.layout_test_name(dest_path)
             if source_test and dest_test:
                 renamed_tests[source_test] = dest_test
         return renamed_tests