Revert of upload SKP renderings that did not match expectations

slave/skia_slave_scripts/flavor_utils/default_build_step_utils.py

Index: slave/skia_slave_scripts/flavor_utils/default_build_step_utils.py
diff --git a/slave/skia_slave_scripts/flavor_utils/default_build_step_utils.py b/slave/skia_slave_scripts/flavor_utils/default_build_step_utils.py
index 6547592ba07d25725fa1f15d504c35d039b6c7d6..73baf4086c98953ca195826215e04bec80799668 100644
--- a/slave/skia_slave_scripts/flavor_utils/default_build_step_utils.py
+++ b/slave/skia_slave_scripts/flavor_utils/default_build_step_utils.py
@@ -16,9 +16,7 @@
 class DeviceDirs(object):
   def __init__(self, perf_data_dir, gm_actual_dir, gm_expected_dir,
                resource_dir, skimage_in_dir, skimage_expected_dir,
-               skimage_out_dir, skp_dir, skp_perf_dir,
-               playback_actual_images_dir, playback_actual_summaries_dir,
-               playback_expected_summaries_dir, tmp_dir):
+               skimage_out_dir, skp_dir, skp_perf_dir, skp_out_dir, tmp_dir):
     self._perf_data_dir = perf_data_dir
     self._gm_actual_dir = gm_actual_dir
     self._gm_expected_dir = gm_expected_dir
@@ -28,34 +26,18 @@
     self._skimage_out_dir = skimage_out_dir
     self._skp_dir = skp_dir
     self._skp_perf_dir = skp_perf_dir
-    self._playback_actual_images_dir = playback_actual_images_dir
-    self._playback_actual_summaries_dir = playback_actual_summaries_dir
-    self._playback_expected_summaries_dir = playback_expected_summaries_dir
+    self._skp_out_dir = skp_out_dir
     self._tmp_dir = tmp_dir
 
   def GMActualDir(self):
-    """Holds images and JSON summary written out by the 'gm' tool."""
-    return self._gm_actual_dir
+    return  self._gm_actual_dir
 
   def GMExpectedDir(self):
-    """Holds expectations JSON summary read by the 'gm' tool."""
     return self._gm_expected_dir
 
   def PerfDir(self):
     return self._perf_data_dir
 
-  def PlaybackActualImagesDir(self):
-    """Holds image files written out by the 'render_pictures' tool."""
-    return self._playback_actual_images_dir
-
-  def PlaybackActualSummariesDir(self):
-    """Holds actual-result JSON summaries written by 'render_pictures' tool."""
-    return self._playback_actual_summaries_dir
-
-  def PlaybackExpectedSummariesDir(self):
-    """Holds expected-result JSON summaries read by 'render_pictures' tool."""
-    return self._playback_expected_summaries_dir
-
   def ResourceDir(self):
     return self._resource_dir
 
@@ -69,11 +51,13 @@
     return self._skimage_out_dir
 
   def SKPDir(self):
-    """Holds SKP files that are consumed by RenderSKPs and BenchPictures."""
     return self._skp_dir
 
   def SKPPerfDir(self):
     return self._skp_perf_dir
+
+  def SKPOutDir(self):
+    return self._skp_out_dir
 
   def TmpDir(self):
     return self._tmp_dir
@@ -122,13 +106,7 @@
     """ Copy the contents of a host-side directory to a clean directory on the
     device side. Subclasses should override this method with one appropriate for
     copying the contents of a host-side directory to a clean device-side
-    directory.
-
-    TODO(epoger): Clarify the description a bit: this method does not expect
-    device_dir to be an empty directory before it is called.  Implementations
-    of this method for other device types create an empty directory at
-    device_dir as the first step.
-    """
+    directory."""
     # For "normal" builders who don't have an attached device, we expect
     # host_dir and device_dir to be the same.
     if host_dir != device_dir:
@@ -232,11 +210,7 @@
     pass
 
   def GetDeviceDirs(self):
-    """ Set the directories which will be used by the BuildStep.
-
-    In the case of DefaultBuildStepUtils, host_dirs and device_dirs are the
-    same, which is why CopyDirectoryContentsToDevice() is a no-op.
-    """
+    """ Set the directories which will be used by the BuildStep. """
     return DeviceDirs(
         perf_data_dir=self._step.perf_data_dir,
         # TODO(epoger): Instead, set gm_actual_dir to self._step._gm_actual_dir
@@ -251,8 +225,5 @@
         skimage_out_dir=self._step.skimage_out_dir,
         skp_dir=self._step.skp_dir,
         skp_perf_dir=self._step.perf_data_dir,
-        playback_actual_images_dir=self._step.playback_actual_images_dir,
-        playback_actual_summaries_dir=self._step.playback_actual_summaries_dir,
-        playback_expected_summaries_dir=(
-            self._step.playback_expected_summaries_dir),
+        skp_out_dir=self._step.skp_out_dir,
         tmp_dir=os.path.join(os.pardir, 'tmp'))