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

buildbot/master/skia_master_scripts/utils.py

 # 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.
 
 
 """Miscellaneous utilities needed by the Skia buildbot master."""
 
 
 import difflib
 import httplib2
@@ skipping 435 matching lines @@
     # pylint: disable=W0601
     global skia_all_subdirs
     try:
       if skia_all_subdirs:
         raise Exception('skia_all_subdirs has already been defined!')
     except NameError:
       skia_all_subdirs = all_subdirs
 
 
 def _MakeBuilder(helper, role, os, model, gpu, configuration, arch,
-                 gm_image_subdir, factory_type, extra_config=None,
+                 factory_type, extra_config=None,
                  perf_output_basedir=None, extra_branches=None, is_trybot=False,
                  **kwargs):
-  """ Creates a builder and scheduler.
-
-  TODO(epoger): gm_image_subdir is no longer used, should be removed."""
+  """ Creates a builder and scheduler."""
   B = helper.Builder
   F = helper.Factory
 
   if not extra_branches:
     extra_branches = []
   subdirs_to_checkout = set(extra_branches)
 
   builder_name = builder_name_schema.MakeBuilderName(
       role=role,
       os=os,
@@ skipping 10 matching lines @@
     scheduler_name = builder_name + builder_name_schema.BUILDER_NAME_SEP + \
                      'Scheduler'
     branches = list(subdirs_to_checkout.union(SKIA_PRIMARY_SUBDIRS))
     helper.AnyBranchScheduler(scheduler_name, branches=branches)
 
   B(builder_name, 'f_%s' % builder_name, scheduler=scheduler_name)
   F('f_%s' % builder_name, factory_type(
       builder_name=builder_name,
       other_subdirs=subdirs_to_checkout,
       configuration=configuration,
-      gm_image_subdir=gm_image_subdir,
       do_patch_step=is_trybot,
       perf_output_basedir=perf_output_basedir,
       **kwargs
       ).Build(role=role))
 
 
 def _MakeBuilderAndMaybeTrybotSet(do_trybots=True, **kwargs):
   _MakeBuilder(**kwargs)
   if do_trybots:
     _MakeBuilder(is_trybot=True, **kwargs)
@@ skipping 75 matching lines @@
   # request is associated with a change but the revisions match (#5 above).
   if req1.source.changes and not req2.source.changes:
     return False
   if not req1.source.changes and req2.source.changes:
     return False
   if not (req1.source.changes and req2.source.changes):
     if req1.source.revision != req2.source.revision:
       return False
   
   return True