Use Port.skips_test in copy-existing-baselines command.

third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/rebaseline.py

 # Copyright (c) 2010 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 # copyright notice, this list of conditions and the following disclaimer
@@ skipping 174 matching lines @@
                 _log.debug("No existing baseline for %s.", test_name)
                 continue
 
             new_baseline = self._tool.filesystem.join(
                 port.baseline_version_dir(),
                 self._file_name_for_expected_result(test_name, suffix))
             if self._tool.filesystem.exists(new_baseline):
                 _log.debug("Existing baseline at %s, not copying over it.", new_baseline)
                 continue
 
-            expectations = TestExpectations(port, [test_name])
-            # TODO(qyearsley): Make sure we're also skipping copying existing baselines in
-            # the case where the port only runs smoke tests and the test is a smoke test.
-            if SKIP in expectations.get_expectations(test_name):
+            generic_expectations = TestExpectations(port, tests=[test_name], include_overrides=False)
+            full_expectations = TestExpectations(port, tests=[test_name], include_overrides=True)
+            # TODO(qyearsley): Change Port.skips_test so that this can be simplified.
+            if SKIP in full_expectations.get_expectations(test_name):
+                _log.debug("%s is skipped (perhaps temporarily) on %s.", test_name, port.name())
+                continue
+            if port.skips_test(test_name, generic_expectations, full_expectations):
                 _log.debug("%s is skipped on %s.", test_name, port.name())
                 continue
 
             old_baselines.append(old_baseline)
             new_baselines.append(new_baseline)
 
         for i in range(len(old_baselines)):
             old_baseline = old_baselines[i]
             new_baseline = new_baselines[i]
 
@@ skipping 498 matching lines @@
             for test in args:
                 if test not in test_prefix_list:
                     test_prefix_list[test] = {}
                 build = Build(builder)
                 test_prefix_list[test][build] = suffixes_to_update
 
         if options.verbose:
             _log.debug("rebaseline-json: " + str(test_prefix_list))
 
         self.rebaseline(options, test_prefix_list)