Directly use TestImporter in DepsUpdater instead of invoking script.

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

Index: third_party/WebKit/Tools/Scripts/webkitpy/w3c/deps_updater.py
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/deps_updater.py b/third_party/WebKit/Tools/Scripts/webkitpy/w3c/deps_updater.py
index 0c4ec00e7a436c103f795720f2b0305402c0bfee..e92bc51a672b46491867779ec6ccdbe8a605143a 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/deps_updater.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/w3c/deps_updater.py
@@ -4,9 +4,11 @@
 
 """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
@@ -16,6 +18,7 @@ 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'
@@ -148,7 +151,7 @@ class DepsUpdater(object):
             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:
@@ -198,9 +201,8 @@ class DepsUpdater(object):
             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])
 
@@ -214,7 +216,7 @@ class DepsUpdater(object):
             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)