W3C Importer: Consolidate and simplify logic for deciding what not to convert.

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

Index: third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_converter.py
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_converter.py b/third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_converter.py
index 8cddcb6888a6f94d6a38514088d8a26876d0336a..cdf326caa7094d8c9bdb4c890c91522e93be6b62 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_converter.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_converter.py
@@ -45,13 +45,9 @@ def convert_for_webkit(new_path, filename, reference_support_info, host=Host()):
         reference_support_info: Dict of information about a related reference HTML, if any.
 
     Returns:
-        A pair of (list of modified CSS properties, modified text) if the file
-        should be modified; None, if the file is not modified.
+        A pair of (list of modified CSS properties, modified text).
     """
     # Conversion is not necessary for any tests in wpt now; see http://crbug.com/654081.
-    if re.search(r'[/\\]imported[/\\]wpt[/\\]', new_path):
-        return None
-
     contents = host.filesystem.read_binary_file(filename)
     try:
         contents = contents.decode('utf-8')