Minor cleanup of some recipe framework code.

scripts/slave/unittests/recipes_test.py

 #!/usr/bin/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.
 
 """Provides test coverage for individual recipes.
 
 Recipe tests are located in ../recipes_test/*.py.
 
 Each py file's splitext'd name is expected to match a recipe in ../recipes/*.py.
@@ skipping 66 matching lines @@
   root, name = os.path.split(recipe_path)
   name = os.path.splitext(name)[0]
   expect_path = os.path.join(root, '%s.expected' % name)
   if not os.path.isdir(expect_path):
     os.makedirs(expect_path)
   return os.path.join(expect_path, test_name+'.json')
 
 
 def exec_test_file(recipe_name):
   with cover():
-    recipe = recipe_loader.LoadRecipe(recipe_name)
+    recipe = recipe_loader.load_recipe(recipe_name)
     try:
-      test_api = recipe_loader.CreateTestApi(recipe.DEPS)
+      test_api = recipe_loader.create_test_api(recipe.DEPS)
       gen = recipe.GenTests(test_api)
     except Exception, e:
       print "Caught exception while processing %s: %s" % (recipe_name, e)
       raise
   try:
     while True:
       with cover():
         test_data = next(gen)
       yield test_data
   except StopIteration:
     pass
   except:
     print 'Exception while processing "%s"!' % recipe_name
     raise
 
 
 def execute_test_case(test_data, recipe_path, recipe_name):
   try:
     props = test_data.properties
     props['recipe'] = recipe_name
 
     stream = annotator.StructuredAnnotationStream(stream=open(os.devnull, 'w'))
 
     def api(*args, **kwargs):
-      return recipe_loader.CreateRecipeApi(test_data=test_data, *args, **kwargs)
+      return recipe_loader.create_recipe_api(
+        test_data=test_data, *args, **kwargs)
 
     with cover():
       recipe_config_types.ResetTostringFns()
       step_data = annotated_run.run_steps(
         stream, props, props, api, test_data).steps_ran.values()
       return [s.step for s in step_data]
   except:
     print 'Exception while processing test case: "%s"!' % test_data.name
     raise
 
@@ skipping 98 matching lines @@
       retcode = retcode or 2
 
   if training:
     test_env.print_coverage_warning()
 
   return retcode
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))