Move gm-expected to trunk/expectations/gm , and modify scripts that use it.

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 438 matching lines @@
       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,
                  perf_output_basedir=None, extra_branches=None, is_trybot=False,
                  **kwargs):
-  """ Creates a builder and scheduler. """
+  """ Creates a builder and scheduler.
+
+  TODO(epoger): gm_image_subdir is no longer used, should be removed."""
   B = helper.Builder
   F = helper.Factory
 
   if not extra_branches:
     extra_branches = []
   subdirs_to_checkout = set(extra_branches)
-  if gm_image_subdir:
-    gm_image_branch = 'gm-expected/%s' % gm_image_subdir
-    subdirs_to_checkout.add(gm_image_branch)
 
   builder_name = builder_name_schema.MakeBuilderName(
       role=role,
       os=os,
       model=model,
       gpu=gpu,
       configuration=configuration,
       arch=arch,
       extra_config=extra_config,
       is_trybot=is_trybot)
@@ skipping 100 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