Revert of upload SKP renderings that did not match expectations

slave/skia_slave_scripts/build_step.py

 # Copyright (c) 2013 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.
 
 """Base class for all slave-side build steps. """
 
 import config
 # pylint: disable=W0611
 import flavor_utils
 import imp
@@ skipping 173 matching lines @@
     self._make_flags = shlex.split(args['make_flags'].replace('"', ''))
     self._test_args = shlex.split(args['test_args'].replace('"', ''))
     self._gm_args = shlex.split(args['gm_args'].replace('"', ''))
     self._gm_args.append('--serialize')
     self._bench_args = shlex.split(args['bench_args'].replace('"', ''))
     self._is_try = args['is_try'] == 'True'
 
     self._default_make_flags = []
     self._default_ninja_flags = []
 
-    # TODO(epoger): Throughout the buildbot code, we use various terms to refer
-    # to the same thing: "skps", "pictures", "replay", "playback".
-    # We should pick one of those terms, and rename things so that we are
-    # consistent.
-    # See https://codereview.chromium.org/295753002/ for additional discussion.
-
     # Adding the playback directory transfer objects.
     self._local_playback_dirs = LocalSkpPlaybackDirs(
         self._builder_name,
         None if args['perf_output_basedir'] == 'None'
             else args['perf_output_basedir'])
     self._storage_playback_dirs = StorageSkpPlaybackDirs(
         self._builder_name,
         None if args['perf_output_basedir'] == 'None'
             else args['perf_output_basedir'])
 
     self.skp_dir = self._local_playback_dirs.PlaybackSkpDir()
-    self.playback_actual_images_dir = (
-        self._local_playback_dirs.PlaybackActualImagesDir())
-    self.playback_actual_summaries_dir = (
-        self._local_playback_dirs.PlaybackActualSummariesDir())
-    self.playback_expected_summaries_dir = (
-        self._local_playback_dirs.PlaybackExpectedSummariesDir())
+    self.skp_out_dir = self._local_playback_dirs.PlaybackImageResultsDir()
 
     # Figure out where we are going to store performance related data.
     if args['perf_output_basedir'] != 'None':
       self._perf_data_dir = os.path.join(args['perf_output_basedir'],
                                          self._builder_name, 'data')
       self._perf_graphs_dir = os.path.join(args['perf_output_basedir'],
                                            self._builder_name, 'graphs')
       self._perf_range_input_dir = os.path.join(
           args['perf_output_basedir'], self._builder_name, 'expectations')
       self._perf_autogen_upload_dir = os.path.join(
@@ skipping 164 matching lines @@
         else:
           raise BuildStepFailure('Build step failed.')
       except Exception:
         print traceback.format_exc()
         if attempt + 1 >= step.attempts:
           raise
       # pylint: disable=W0212
       step._WaitFunc(attempt)
       attempt += 1
       print '**** %s, attempt %d ****' % (StepType.__name__, attempt + 1)