When importing w3c repos, convert CRLF line endings.

third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_importer.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 401 matching lines @@
                 host=self.host)
             for prefixed_property in converted_file[0]:
                 self._prefixed_properties.setdefault(prefixed_property, 0)
                 self._prefixed_properties[prefixed_property] += 1
 
             if not self.options.dry_run:
                 self.filesystem.write_text_file(dest_path, converted_file[1])
         else:
             if not self.import_in_place and not self.options.dry_run:
                 self.filesystem.copyfile(source_path, dest_path)
-                if self.filesystem.read_binary_file(source_path)[:2] == '#!':
-                    self.filesystem.make_executable(dest_path)
+                self._transform_for_presubmit(dest_path)
 
         return dest_path.replace(self._webkit_root, '')
 
+    def _transform_for_presubmit(self, path):
+        """Changes a file in order to pass the Chromium top-level presubmit.
+
+        This should only transform text files; if the Chromium presubmit is
+        changed to ignore imported files, then this would be unnecessary.
+        """
+        # There may be some text files that are encoded with utf-16 or other
+        # encodings, but these are rare.
+        try:
+            text = self.filesystem.read_text_file(path)
+        except UnicodeDecodeError:
+            return
+        if text[:2] == '#!':
+            self.filesystem.make_executable(path)
+        if '\r\n' in text:
+            _log.warning('File %s has CRLF line endings.', path)
+            self.filesystem.write_text_file(path, text.replace('\r\n', '\n'))
+
     @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 re.search(r'[/\\]imported[/\\]wpt[/\\]', 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')
 
     def path_too_long(self, source_path):
         """Checks whether a source path is too long to import.
 
         Args:
             Absolute path of file to be imported.
 
         Returns:
             True if the path is too long to import, False if it's OK.
         """
         path_from_repo_base = os.path.relpath(source_path, self.source_repo_path)
         return len(path_from_repo_base) > MAX_PATH_LENGTH