webkitpy: Remove unnecessary code in test_copier.py

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 42 matching lines @@
                 TODO(qyearsley): This can be made into a constant.
         """
         self.host = host
 
         assert self.host.filesystem.exists(source_repo_path)
         self.source_repo_path = source_repo_path
         self.dest_dir_name = dest_dir_name
 
         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.layout_tests_dir()
         self.destination_directory = self.filesystem.normpath(
             self.filesystem.join(
                 self.layout_tests_dir,
                 dest_dir_name,
                 self.filesystem.basename(self.source_repo_path)))
         self.import_in_place = (self.source_repo_path == self.destination_directory)
         self.dir_above_repo = self.filesystem.dirname(self.source_repo_path)
 
         self.import_list = []
@@ skipping 87 matching lines @@
                 continue
 
             orig_path = dir_to_copy['dirname']
 
             relative_dir = self.filesystem.relpath(orig_path, self.source_repo_path)
             dest_dir = self.filesystem.join(self.destination_directory, relative_dir)
 
             if not self.filesystem.exists(dest_dir):
                 self.filesystem.maybe_make_directory(dest_dir)
 
-            copied_files = []
-
             for file_to_copy in dir_to_copy['copy_list']:
-                copied_file = self.copy_file(file_to_copy, dest_dir)
-                if copied_file:
-                    copied_files.append(copied_file)
+                self.copy_file(file_to_copy, dest_dir)
 
         _log.info('')
         _log.info('Import complete')
         _log.info('')
 
         if self._prefixed_properties:
             _log.info('Properties needing prefixes (by count):')
             for prefixed_property in sorted(self._prefixed_properties, key=lambda p: self._prefixed_properties[p]):
                 _log.info('  %s: %s', prefixed_property, self._prefixed_properties[prefixed_property])
 
     def copy_file(self, file_to_copy, dest_dir):
         """Converts and copies a file, if it should be copied.
 
         Args:
             file_to_copy: A dict in a file copy list constructed by
                 find_importable_tests, which represents one file to copy, including
                 the keys:
                     "src": Absolute path to the source location of the file.
                     "destination": File name of the destination file.
                 And possibly also the keys "reference_support_info" or "is_jstest".
             dest_dir: Path to the directory where the file should be copied.
-
-        Returns:
-            The path to the new file, relative to the Blink root (//third_party/WebKit).
         """
         source_path = self.filesystem.normpath(file_to_copy['src'])
         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
+            return
 
         if not self.filesystem.exists(source_path):
             _log.error('%s not found. Possible error in the test.', source_path)
-            return None
+            return
 
         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 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, '')