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

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

 # Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 #
 # 1. Redistributions of source code must retain the above
 #    copyright notice, this list of conditions and the following
 #    disclaimer.
 # 2. Redistributions in binary form must reproduce the above
@@ skipping 27 matching lines @@
 
 def convert_for_webkit(new_path, filename, reference_support_info, host=Host()):
     """Converts a file's contents so the Blink layout test runner can run it.
 
     Args:
         new_path: Absolute path where file will be copied to in the Chromium repo.
         filename: Absolute path to where the file is.
         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')
     except UnicodeDecodeError:
         contents = contents.decode('utf-16')
 
     converter = _W3CTestConverter(new_path, filename, reference_support_info, host)
     if filename.endswith('.css'):
         return converter.add_webkit_prefix_to_unprefixed_properties(contents)
     converter.feed(contents)
@@ skipping 164 matching lines @@
         self.converted_data.extend(['&#', name, ';'])
 
     def handle_comment(self, data):
         self.converted_data.extend(['<!--', data, '-->'])
 
     def handle_decl(self, decl):
         self.converted_data.extend(['<!', decl, '>'])
 
     def handle_pi(self, data):
         self.converted_data.extend(['<?', data, '>'])