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

buildbot/master/skia_master_scripts/factory.py

Index: buildbot/master/skia_master_scripts/factory.py
===================================================================
--- buildbot/master/skia_master_scripts/factory.py	(revision 10693)
+++ buildbot/master/skia_master_scripts/factory.py	(working copy)
@@ -50,7 +50,7 @@
                do_patch_step=False, build_subdir='trunk',
                target_platform=None, configuration=CONFIG_DEBUG,
                default_timeout=8*60*60, deps_target_os=None,
-               environment_variables=None, gm_image_subdir=None,
+               environment_variables=None,
                perf_output_basedir=None, builder_name=None, flavor=None,
                make_flags=None, test_args=None, gm_args=None, bench_args=None,
                bench_pictures_cfg='default', compile_warnings_as_errors=False,
@@ -68,8 +68,6 @@
     deps_target_os: string; the target_os to be specified in the gclient config.
     environment_variables: dictionary of environment variables that should
         be passed to all commands
-    gm_image_subdir: directory containing images for comparison against results
-        of gm tool
     perf_output_basedir: path to directory under which to store performance
         data, or None if we don't want to store performance data
     builder_name: name of the builder associated with this factory
@@ -114,9 +112,6 @@
 
     self._deps_target_os = deps_target_os
 
-    if gm_image_subdir:
-      properties['gm_image_subdir'] = gm_image_subdir
-
     # Set _default_clobber based on config.Master
     self._default_clobber = getattr(config.Master, 'default_clobber', False)
 
@@ -185,7 +180,6 @@
         '--configuration', configuration,
         '--deps_target_os', self._deps_target_os or 'None',
         '--do_upload_results', str(self._do_upload_results),
-        '--gm_image_subdir', gm_image_subdir or 'None',
         '--builder_name', builder_name,
         '--target_platform', target_platform,
         '--revision', WithProperties('%(rev)s', rev=_DetermineRevision),
@@ -500,13 +494,13 @@
 
   def CompareGMs(self):
     """ Run the "skdiff" tool to compare the "actual" GM images we just
-    generated to the baselines in _gm_image_subdir. """
+    generated to the baselines for this builder_name. """
     self.AddSlaveScript(script='compare_gms.py', description='CompareGMs',
                         is_rebaseline_step=True)
   
   def CompareAndUploadWebpageGMs(self):
     """ Run the "skdiff" tool to compare the "actual" GM images we just
-    generated to the baselines in _gm_image_subdir and uploads the actual
+    generated to the baselines for this builder_name and uploads the actual
     images if appropriate. """
     self.AddSlaveScript(script='compare_and_upload_webpage_gms.py',
                         description='CompareAndUploadWebpageGMs',