Revert of upload SKP renderings that did not match expectations

slave/skia_slave_scripts/playback_dirs.py

Index: slave/skia_slave_scripts/playback_dirs.py
diff --git a/slave/skia_slave_scripts/playback_dirs.py b/slave/skia_slave_scripts/playback_dirs.py
index 5df68f8ffa628a848ad892f7b0c861efef3ce44e..0af0bc5d565e92c720df8f03aea10266a5002c2e 100644
--- a/slave/skia_slave_scripts/playback_dirs.py
+++ b/slave/skia_slave_scripts/playback_dirs.py
@@ -12,12 +12,9 @@
 # The playback root directory name will be used both locally and on Google
 # Storage.
 ROOT_PLAYBACK_DIR_NAME = 'playback'
-
 # These subdirectory names will be used both locally and on Google Storage.
-ACTUAL_IMAGES_DIR_NAME = 'actualImages'
-ACTUAL_SUMMARIES_DIR_NAME = 'actualSummaries'
-EXPECTED_SUMMARIES_DIR_NAME = 'expectedSummaries'
 SKPICTURES_DIR_NAME = 'skps'
+IMAGERESULTS_DIR_NAME = 'imageResults'
 
 
 class SkpPlaybackDirs(object):
@@ -28,26 +25,20 @@
     self._builder_name = builder_name
     self._perf_output_basedir = perf_output_basedir
 
-  def PlaybackActualImagesDir(self):
-    raise NotImplementedError("PlaybackActualImagesDir is unimplemented")
+  def PlaybackRootDir(self):
+    raise NotImplementedError("PlaybackRootDir is unimplemented!")
 
-  def PlaybackActualSummariesDir(self):
-    raise NotImplementedError("PlaybackActualSummariesDir is unimplemented")
+  def PlaybackSkpDir(self):
+    raise NotImplementedError("PlaybackSkpDir is unimplemented!")
 
-  def PlaybackExpectedSummariesDir(self):
-    raise NotImplementedError("PlaybackExpectedSummariesDir is unimplemented")
+  def PlaybackImageResultsDir(self):
+    raise NotImplementedError("PlaybackImageResultsDir is unimplemented")
 
   def PlaybackPerfDataDir(self):
     raise NotImplementedError("PlaybackPerfDataDir is unimplemented")
 
   def PlaybackPerfGraphsDir(self):
     raise NotImplementedError("PlaybackPerfGraphsDir is unimplemented")
-
-  def PlaybackRootDir(self):
-    raise NotImplementedError("PlaybackRootDir is unimplemented!")
-
-  def PlaybackSkpDir(self):
-    raise NotImplementedError("PlaybackSkpDir is unimplemented!")
 
 
 class LocalSkpPlaybackDirs(SkpPlaybackDirs):
@@ -69,22 +60,11 @@
     return os.path.join(
         self._local_playback_root_dir, SKPICTURES_DIR_NAME)
 
-  def PlaybackActualImagesDir(self):
+  def PlaybackImageResultsDir(self):
     """Returns the local playback image output directory."""
     return os.path.join(
-        self._local_playback_root_dir, ACTUAL_IMAGES_DIR_NAME,
+        self._local_playback_root_dir, IMAGERESULTS_DIR_NAME,
         self._builder_name)
-
-  def PlaybackActualSummariesDir(self):
-    """Returns the local playback JSON-summary output directory."""
-    return os.path.join(
-        self._local_playback_root_dir, ACTUAL_SUMMARIES_DIR_NAME,
-        self._builder_name)
-
-  def PlaybackExpectedSummariesDir(self):
-    """Returns the local playback JSON-summary input directory."""
-    return os.path.abspath(os.path.join(
-        'expectations', 'skp', self._builder_name))
 
   def PlaybackPerfDataDir(self):
     """Returns the local playback perf data directory."""
@@ -114,20 +94,10 @@
     """Returns the relative storage playback skp directory."""
     return posixpath.join(ROOT_PLAYBACK_DIR_NAME, SKPICTURES_DIR_NAME)
 
-  def PlaybackActualImagesDir(self):
+  def PlaybackImageResultsDir(self):
     """Returns the relative storage playback image output directory."""
     return posixpath.join(
-        ROOT_PLAYBACK_DIR_NAME, ACTUAL_IMAGES_DIR_NAME, self._builder_name)
-
-  def PlaybackActualSummariesDir(self):
-    """Returns the relative storage playback JSON-summary output directory."""
-    return posixpath.join(
-        ROOT_PLAYBACK_DIR_NAME, ACTUAL_SUMMARIES_DIR_NAME, self._builder_name)
-
-  def PlaybackExpectedSummariesDir(self):
-    """Returns the relative storage playback JSON-summary input directory."""
-    return posixpath.join(
-        ROOT_PLAYBACK_DIR_NAME, EXPECTED_SUMMARIES_DIR_NAME, self._builder_name)
+        ROOT_PLAYBACK_DIR_NAME, IMAGERESULTS_DIR_NAME, self._builder_name)
 
   def PlaybackPerfDataDir(self):
     """Returns the relative playback perf data directory."""