Stop trying to convert CSS properties in imported tests.

third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_copier.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 15 matching lines @@
 # SUCH DAMAGE.
 
 """Logic for converting and copying files from a W3C repo.
 
 This module is responsible for modifying and copying a subset of the tests from
 a local W3C repository source directory into a destination directory.
 """
 
 import logging
 import mimetypes
-import re
 
 from webkitpy.common.webkit_finder import WebKitFinder
 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
 
 _log = logging.getLogger(__name__)
 
 
 class TestCopier(object):
 
     def __init__(self, host, source_repo_path, dest_dir_name='external'):
         """Initializes variables to prepare for copying and converting files.
 
         Args:
@@ skipping 212 matching lines @@
         dest_path = self.filesystem.join(dest_dir, file_to_copy['dest'])
 
         if self.filesystem.isdir(source_path):
             _log.error('%s refers to a directory', source_path)
             return None
 
         if not self.filesystem.exists(source_path):
             _log.error('%s not found. Possible error in the test.', source_path)
             return None
 
-        reference_support_info = file_to_copy.get('reference_support_info') or None
-
         if not self.filesystem.exists(self.filesystem.dirname(dest_path)):
             if not self.import_in_place:
                 self.filesystem.maybe_make_directory(self.filesystem.dirname(dest_path))
 
         relpath = self.filesystem.relpath(dest_path, self.layout_tests_dir)
         # FIXME: Maybe doing a file diff is in order here for existing files?
         # In other words, there's no sense in overwriting identical files, but
         # there's no harm in copying the identical thing.
         _log.debug('  copying %s', relpath)
 
-        if self.should_try_to_convert(file_to_copy, source_path, dest_dir):
-            converted_file = convert_for_webkit(
-                dest_dir, filename=source_path,
-                reference_support_info=reference_support_info,
-                host=self.host)
-            for prefixed_property in converted_file[0]:
-                self._prefixed_properties.setdefault(prefixed_property, 0)
-                self._prefixed_properties[prefixed_property] += 1
-
-            self.filesystem.write_text_file(dest_path, converted_file[1])
-        else:
-            if not self.import_in_place:
-                self.filesystem.copyfile(source_path, dest_path)
-                if self.filesystem.read_binary_file(source_path)[:2] == '#!':
-                    self.filesystem.make_executable(dest_path)
+        if not self.import_in_place:
+            self.filesystem.copyfile(source_path, dest_path)
+            if self.filesystem.read_binary_file(source_path)[:2] == '#!':
+                self.filesystem.make_executable(dest_path)
 
         return dest_path.replace(self._webkit_root, '')
-
-    @staticmethod
-    def should_try_to_convert(file_to_copy, source_path, dest_dir):
-        """Checks whether we should try to modify the file when importing."""
-        if file_to_copy.get('is_jstest', False):
-            return False
-
-        # Conversion is not necessary for any tests in wpt now; see http://crbug.com/654081.
-        # Note, we want to move away from converting files, see http://crbug.com/663773.
-        if not re.search(r'[/\\]external[/\\]wpt[/\\]css[/\\]', dest_dir):
-            return False
-
-        # Only HTML, XHTML and CSS files should be converted.
-        mimetype, _ = mimetypes.guess_type(source_path)
-        return mimetype in ('text/html', 'application/xhtml+xml', 'text/css')