| Index: third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_importer.py
|
| diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_importer.py b/third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_importer.py
|
| index c13ea0598cc95f2d8ab260b222a8496f8b474bdc..c5b886243a3fdff8f100d0963af328b988746718 100644
|
| --- a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_importer.py
|
| +++ b/third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_importer.py
|
| @@ -71,7 +71,7 @@ import os
|
| import sys
|
|
|
| from webkitpy.common.host import Host
|
| -from webkitpy.common.webkit_finder import WebKitFinder
|
| +from webkitpy.common.blink_finder import BlinkFinder
|
| from webkitpy.layout_tests.models.test_expectations import TestExpectationParser
|
| from webkitpy.w3c.test_parser import TestParser
|
| from webkitpy.w3c.test_converter import convert_for_webkit
|
| @@ -145,9 +145,9 @@ class TestImporter(object):
|
| self.options = options
|
|
|
| self.filesystem = self.host.filesystem
|
| - self.webkit_finder = WebKitFinder(self.filesystem)
|
| - self._webkit_root = self.webkit_finder.webkit_base()
|
| - self.layout_tests_dir = self.webkit_finder.path_from_webkit_base('LayoutTests')
|
| + self.blink_finder = BlinkFinder(self.filesystem)
|
| + self._webkit_root = self.blink_finder.blink_base()
|
| + self.layout_tests_dir = self.blink_finder.path_from_blink_base('LayoutTests')
|
| self.destination_directory = self.filesystem.normpath(
|
| self.filesystem.join(
|
| self.layout_tests_dir,
|
| @@ -296,7 +296,7 @@ class TestImporter(object):
|
|
|
| paths_to_skip = set()
|
| port = self.host.port_factory.get()
|
| - w3c_import_expectations_path = self.webkit_finder.path_from_webkit_base('LayoutTests', 'W3CImportExpectations')
|
| + w3c_import_expectations_path = self.blink_finder.path_from_blink_base('LayoutTests', 'W3CImportExpectations')
|
| w3c_import_expectations = self.filesystem.read_text_file(w3c_import_expectations_path)
|
| parser = TestExpectationParser(port, all_tests=(), is_lint_mode=False)
|
| expectation_lines = parser.parse(w3c_import_expectations_path, w3c_import_expectations)
|
|
|