Cleanup after enabling WPTServe.

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

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Fetches a copy of the latest state of a W3C test repository and commits.
 
 If this script is given the argument --auto-update, it will also:
  1. Upload a CL.
  2. Trigger try jobs and wait for them to complete.
  3. Make any changes that are required for new failing tests.
@@ skipping 98 matching lines @@
             _log.warning('WebKit/%s exists; aborting.', WPT_DEST_NAME)
             return False
 
         if self.fs.exists(self.path_from_webkit_base(CSS_DEST_NAME)):
             _log.warning('WebKit/%s repo exists; aborting.', CSS_DEST_NAME)
             return False
 
         return True
 
     def _copy_resources(self):
-        """Copies resources from LayoutTests/resources to wpt and vice versa.
+        """Copies resources from wpt to LayoutTests/resources.
 
-        There are resources from our repository that we use instead of the
-        upstream versions. Conversely, there are also some resources that
-        are copied in the other direction.
-
-        Specifically:
-          - testharnessreport.js contains code needed to integrate our testing
-            with testharness.js; we also want our code to be used for tests
-            in wpt.
-          - TODO(qyearsley, jsbell): Document why other other files are copied,
-            or stop copying them if it's unnecessary.
+        We copy idlharness.js and testharness.js in wpt to LayoutTests/resources
+        in order to use them in non-imported tests.
 
         If this method is changed, the lists of files expected to be identical
         in LayoutTests/PRESUBMIT.py should also be changed.
         """
-        # TODO(tkent): resources_to_copy_to_wpt is unnecessary after enabling
-        # WPTServe.

[qyearsley, 2017/01/19 18:00:33]

Excellent :-D

-        resources_to_copy_to_wpt = [
-            ('testharnessreport.js', 'resources'),
-            ('WebIDLParser.js', 'resources'),
-            ('vendor-prefix.js', 'common'),
-        ]
         resources_to_copy_from_wpt = [
             ('idlharness.js', 'resources'),
             ('testharness.js', 'resources'),
         ]
-        for filename, wpt_subdir in resources_to_copy_to_wpt:
-            source = self.path_from_webkit_base('LayoutTests', 'resources', filename)
-            destination = self.path_from_webkit_base('LayoutTests', 'external', WPT_DEST_NAME, wpt_subdir, filename)
-            self.copyfile(source, destination)
-            self.run(['git', 'add', destination])
         for filename, wpt_subdir in resources_to_copy_from_wpt:
             source = self.path_from_webkit_base('LayoutTests', 'external', WPT_DEST_NAME, wpt_subdir, filename)
             destination = self.path_from_webkit_base('LayoutTests', 'resources', filename)
             self.copyfile(source, destination)
             self.run(['git', 'add', destination])
 
     def _generate_manifest(self, dest_path):
         """Generates MANIFEST.json for imported tests.
 
         Args:
@@ skipping 301 matching lines @@
         """Returns a dict mapping source to dest name for layout tests that have been renamed."""
         out = self.check_run(['git', 'diff', 'origin/master', '-M100%', '--diff-filter=R', '--name-status'])
         renamed_tests = {}
         for line in out.splitlines():
             _, source_path, dest_path = line.split()
             source_test = self.finder.layout_test_name(source_path)
             dest_test = self.finder.layout_test_name(dest_path)
             if source_test and dest_test:
                 renamed_tests[source_test] = dest_test
         return renamed_tests