Revert of upload SKP renderings that did not match expectations

slave/skia_slave_scripts/prerender.py

Index: slave/skia_slave_scripts/prerender.py
diff --git a/slave/skia_slave_scripts/prerender.py b/slave/skia_slave_scripts/prerender.py
index 3fd217a5ff1e629555549413b0c030e7a1d6d2f5..d5d9950f1c640dc72f9ed0bbe7b76ec37302c82c 100644
--- a/slave/skia_slave_scripts/prerender.py
+++ b/slave/skia_slave_scripts/prerender.py
@@ -17,7 +17,7 @@
 
 class PreRender(BuildStep):
 
-  def _RunBeforeGenerateGMs(self):
+  def _Run(self):
     # Prepare directory to hold GM expectations.
     self._flavor_utils.CreateCleanDeviceDirectory(
         self._device_dirs.GMExpectedDir())
@@ -53,8 +53,9 @@
     self._flavor_utils.CreateCleanDeviceDirectory(
         self._flavor_utils.DevicePathJoin(self._device_dirs.GMActualDir(),
                                           self._builder_name))
+    self._flavor_utils.CreateCleanHostDirectory(self.skp_out_dir)
+    self._flavor_utils.CreateCleanDeviceDirectory(self._device_dirs.SKPOutDir())
 
-  def _RunBeforeRunDecodingTests(self):
     # Copy expectations file and images to decode in skimage to device.
     self._flavor_utils.CreateCleanDeviceDirectory(
         self._device_dirs.SKImageExpectedDir())
@@ -87,36 +88,12 @@
     self._flavor_utils.CopyDirectoryContentsToDevice(
         self._skimage_in_dir, self._device_dirs.SKImageInDir())
 
+
     # Create a directory for the output of skimage
     self._flavor_utils.CreateCleanHostDirectory(self._skimage_out_dir)
     self._flavor_utils.CreateCleanDeviceDirectory(
         self._device_dirs.SKImageOutDir())
 
-  def _RunBeforeRenderSKPs(self):
-    # SKP files have already been installed by DownloadSKPs.
-
-    # Install JSON summaries of image expectations.
-    self._flavor_utils.CopyDirectoryContentsToDevice(
-        self.playback_expected_summaries_dir,
-        self._device_dirs.PlaybackExpectedSummariesDir())
-
-    # Prepare directory to hold actually-generated images.
-    self._flavor_utils.CreateCleanHostDirectory(
-        self.playback_actual_images_dir)
-    self._flavor_utils.CreateCleanDeviceDirectory(
-        self._device_dirs.PlaybackActualImagesDir())
-
-    # Prepare directory to hold JSON summaries of actually-generated images.
-    self._flavor_utils.CreateCleanHostDirectory(
-        self.playback_actual_summaries_dir)
-    self._flavor_utils.CreateCleanDeviceDirectory(
-        self._device_dirs.PlaybackActualSummariesDir())
-
-  def _Run(self):
-    self._RunBeforeGenerateGMs()
-    self._RunBeforeRunDecodingTests()
-    self._RunBeforeRenderSKPs()
-
 
 if '__main__' == __name__:
   sys.exit(BuildStep.RunBuildStep(PreRender))