Minor cleanup of some recipe framework code.

scripts/slave/annotated_run.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.
 
 """Entry point for fully-annotated builds.
 
 This script is part of the effort to move all builds to annotator-based
 systems. Any builder configured to use the AnnotatorFactory.BaseFactory()
 found in scripts/master/factory/annotator_factory.py executes a single
@@ skipping 361 matching lines @@
 def main(argv=None):
   opts, _ = get_args(argv)
 
   stream = annotator.StructuredAnnotationStream(seed_steps=['setup_build'])
 
   ret = run_steps(stream, opts.build_properties, opts.factory_properties)
   return ret.status_code
 
 
 def run_steps(stream, build_properties, factory_properties,
-              api=recipe_loader.CreateRecipeApi,
+              api=recipe_loader.create_recipe_api,
               test=recipe_test_api.DisabledTestData()):
   """Returns a tuple of (status_code, steps_ran).
 
   Only one of these values will be set at a time. This is mainly to support the
   testing interface used by unittests/recipes_test.py.
   """
   stream.honor_zero_return_code()
   MakeStepsRetval = collections.namedtuple('MakeStepsRetval',
                                            'status_code steps_ran')
 
@@ skipping 12 matching lines @@
   if ('use_mirror' not in properties and (
     'TESTING_MASTERNAME' in os.environ or
     'TESTING_SLAVENAME' in os.environ)):
     properties['use_mirror'] = False
 
   step_history = collections.OrderedDict()
   with stream.step('setup_build') as s:
     assert 'recipe' in factory_properties
     recipe = factory_properties['recipe']
     try:
-      recipe_module = recipe_loader.LoadRecipe(recipe)
+      recipe_module = recipe_loader.load_recipe(recipe)
       stream.emit('Running recipe with %s' % (properties,))
       steps = recipe_module.GenSteps(api(recipe_module.DEPS,
                                          properties=properties,
                                          step_history=step_history))
       assert inspect.isgenerator(steps)
       s.step_text('<br/>running recipe: "%s"' % recipe)
     except recipe_loader.NoSuchRecipe as e:
       s.step_text('<br/>recipe not found: %s' % e)
       s.step_failure()
       return MakeStepsRetval(2, None)
@@ skipping 85 matching lines @@
 
 def shell_main(argv):
   if UpdateScripts():
     return subprocess.call([sys.executable] + argv)
   else:
     return main(argv)
 
 
 if __name__ == '__main__':
   sys.exit(shell_main(sys.argv))