Remove base-* directories from gm expected/actual paths; just use platform names

buildbot/slave/skia_slave_scripts/run_decoding_tests.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 skimage executable. """
 
 from build_step import BuildStep
 import sys
 
 class RunDecodingTests(BuildStep):
   def _Run(self):
     cmd = ['-r', self._device_dirs.SKImageInDir(), '--noreencode']
 
-    # TODO(scroggo): Once we have expectations files with the new name,
-    # the expectations_name will use self._builder_name
-    if self._gm_image_subdir is not None:
-      expectations_name = self._gm_image_subdir + '.json'
+    if self._builder_name is not None:
+      expectations_name = self._builder_name + '.json'
 
       # Read expectations, which were downloaded/copied to the device.
       expectations_file = self._flavor_utils.DevicePathJoin(
         self._device_dirs.SKImageExpectedDir(),
         expectations_name)
 
       if self._flavor_utils.DevicePathExists(expectations_file):
         cmd.extend(['--readExpectationsPath', expectations_file])
 
     # Write the expectations file, in case any did not match.
     output_expectations_file = self._flavor_utils.DevicePathJoin(
         self._device_dirs.SKImageOutDir(),
         expectations_name)
 
     cmd.extend(['--createExpectationsPath', output_expectations_file])
 
     # Draw any mismatches to the same folder as the output json.
     cmd.extend(['--mismatchPath', self._device_dirs.SKImageOutDir()])
 
     self._flavor_utils.RunFlavoredCmd('skimage', cmd)
 
 
 if '__main__' == __name__:
   sys.exit(BuildStep.RunBuildStep(RunDecodingTests))