Revert of upload SKP renderings that did not match expectations

slave/skia_slave_scripts/run_gm.py

 #!/usr/bin/env python
 # 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.
 
 """ Run the Skia GM executable. """
 
 from build_step import BuildStep
 import build_step
+import os
 import sys
 
 
 JSON_SUMMARY_FILENAME = 'actual-results.json'
 
 
 class RunGM(BuildStep):
   def __init__(self, timeout=9600, no_output_timeout=9600, **kwargs):
     super(RunGM, self).__init__(
       timeout=timeout, no_output_timeout=no_output_timeout, **kwargs)
 
   def _Run(self):
-    output_dir = self._flavor_utils.DevicePathJoin(
-        self._device_dirs.GMActualDir(), self._builder_name)
+    output_dir = os.path.join(self._device_dirs.GMActualDir(),
+                              self._builder_name)
     cmd = ['--verbose',
            '--writeChecksumBasedFilenames',
            # Don't bother writing out image files that match our expectations--
            # we know that previous runs have already uploaded those!
            '--mismatchPath', output_dir,
            '--missingExpectationsPath', output_dir,
-           '--writeJsonSummaryPath', self._flavor_utils.DevicePathJoin(
-               output_dir, JSON_SUMMARY_FILENAME),
+           '--writeJsonSummaryPath', os.path.join(output_dir,
+                                                  JSON_SUMMARY_FILENAME),
            '--ignoreErrorTypes',
                'IntentionallySkipped', 'MissingExpectations',
                'ExpectationsMismatch',
            '--resourcePath', self._device_dirs.ResourceDir(),
            ] + self._gm_args
 
     device_gm_expectations_path = self._flavor_utils.DevicePathJoin(
         self._device_dirs.GMExpectedDir(), build_step.GM_EXPECTATIONS_FILENAME)
     if self._flavor_utils.DevicePathExists(device_gm_expectations_path):
       cmd.extend(['--readPath', device_gm_expectations_path])
@@ skipping 54 matching lines @@
                   '~scaled_tilemodes',
                   '~convexpaths',
                   '~clipped-bitmap',
                   '~xfermodes3'])
 
     self._flavor_utils.RunFlavoredCmd('gm', cmd)
 
 
 if '__main__' == __name__:
   sys.exit(BuildStep.RunBuildStep(RunGM))