[chromium_android recipes] Cleanup envsetup step and cleanup step names.

scripts/slave/recipes/android/android_builder.py

 # Copyright 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.
 
 DEPS = [
   'chromium_android',
   'properties',
 ]
 
 def GenSteps(api):
@@ skipping 13 matching lines @@
   if droid.c.run_lint:
     yield droid.lint()
   if droid.c.run_checkdeps:
     yield droid.checkdeps()
 
 def GenTests(api):
   bot_ids = ['main_builder', 'component_builder', 'clang_builder',
              'x86_builder', 'klp_builder', 'try_builder']
   def _common_step_mocks():
     return {
-      'Get AppManifestVars': {
+      'get app_manifest_vars': {
         'json': {
           'output': {
             'version_code': 10,
-            'version_name': 'some builder 1234',
+            'version_name': 'some_builder_1234',
             'build_id': 3333,
             'date_string': 6001
           }
         }
       },
       'envsetup': {
         'json': {
           'output': {
             'PATH': './',
+            'GYP_DEFINES': 'my_new_gyp_def=aaa',
+            'GYP_SOMETHING': 'gyp_something_value'
           }
         }
       }
     }
 
   for bot_id in bot_ids:
     props = {
             'repo_name': 'src/repo',
             'repo_url': 'svn://svn.chromium.org/chrome/trunk/src',
             'revision': '4f4b02f6b7fa20a3a25682c457bbc8ad589c8a00',
             'android_bot_id': bot_id,
             'buildername': 'builder_name',
             'internal': True
     }
     if bot_id == 'try_builder':
       props['revision'] = ''
     yield bot_id, {
         'properties': props,
         'step_mocks': _common_step_mocks()
     }