Reland of "update SCM and expectations all at once after all commands".

third_party/WebKit/Tools/Scripts/webkitpy/common/checkout/baselineoptimizer.py

 # Copyright (C) 2011, 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 233 matching lines @@
                 if self._skip_scm_commands:
                     self._files_to_delete.extend(scm_files)
                 else:
                     self._scm.delete_list(scm_files)
             if fs_files:
                 _log.debug("    Deleting (file system):")
                 for platform_dir in sorted(self._platform(filename) for filename in fs_files):
                     _log.debug("      " + platform_dir)
                 for filename in fs_files:
                     self._filesystem.remove(filename)
+                    self._files_to_delete.extend(scm_files)

[qyearsley, 2016/10/04 22:41:37]

This is a fix that I think in theory should prevent http://crbug.com/650944 from
happening again if this is submitted.

         else:
             _log.debug("    (Nothing to delete)")
 
         file_names = []
         for directory, result in new_results_by_directory.items():
             if results_by_directory.get(directory) != result:
                 destination = self._join_directory(directory, baseline_name)
                 self._filesystem.maybe_make_directory(self._filesystem.split(destination)[0])
                 self._filesystem.write_binary_file(destination, data_for_result[result])
                 file_names.append(destination)
@@ skipping 89 matching lines @@
         result = self._optimize_subtree(baseline_name)
         non_virtual_baseline_name = self._virtual_base(baseline_name)
         if not non_virtual_baseline_name:
             return result, self._files_to_delete, self._files_to_add
 
         self._optimize_virtual_root(baseline_name, non_virtual_baseline_name)
 
         _log.debug("Optimizing non-virtual fallback path.")
         result |= self._optimize_subtree(non_virtual_baseline_name)
         return result, self._files_to_delete, self._files_to_add