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

scripts/slave/recipe_modules/chromium/config.expected/Debug-mac.intel.64-to-ios.arm.32.json

Index: scripts/slave/recipe_modules/chromium/config.expected/Debug-mac.intel.64-to-ios.arm.32.json
diff --git a/scripts/slave/recipe_modules/chromium/config.expected/Debug-mac.intel.64-to-ios.arm.32.json b/scripts/slave/recipe_modules/chromium/config.expected/Debug-mac.intel.64-to-ios.arm.32.json
index 79d62580f4a894e1bab59af33e4c480ff3c8216a..616e4cd39088a48fa34ede9545fdf9fea4ef278a 100644
--- a/scripts/slave/recipe_modules/chromium/config.expected/Debug-mac.intel.64-to-ios.arm.32.json
+++ b/scripts/slave/recipe_modules/chromium/config.expected/Debug-mac.intel.64-to-ios.arm.32.json
@@ -9,8 +9,10 @@
       ]
     }, 
     "gyp_env": {
-      "GYP_DEFINES": "component=shared_library fastbuild=1", 
-      "GYP_GENERATORS": "ninja"
+      "GYP_CROSSCOMPILE": 1, 
+      "GYP_DEFINES": "OS=android component=shared_library fastbuild=1 gcc_version=46 host_os=linux order_text_section=['orderfiles', 'orderfile.out'] target_arch=arm", 
+      "GYP_GENERATORS": "ninja", 
+      "GYP_GENERATOR_FLAGS": "default_target=All"
     }
   }, 
   "blink": {
@@ -55,8 +57,10 @@
       ]
     }, 
     "gyp_env": {
-      "GYP_DEFINES": "clang=1 component=shared_library fastbuild=1", 
-      "GYP_GENERATORS": "ninja"
+      "GYP_CROSSCOMPILE": 1, 
+      "GYP_DEFINES": "OS=android clang=1 component=shared_library fastbuild=1 gcc_version=46 host_os=linux order_text_section=['orderfiles', 'orderfile.out'] target_arch=arm", 
+      "GYP_GENERATORS": "ninja", 
+      "GYP_GENERATOR_FLAGS": "default_target=All"
     }
   }, 
   "component_builder": {
@@ -70,8 +74,10 @@
       ]
     }, 
     "gyp_env": {
-      "GYP_DEFINES": "component=shared_library fastbuild=1", 
-      "GYP_GENERATORS": "ninja"
+      "GYP_CROSSCOMPILE": 1, 
+      "GYP_DEFINES": "OS=android component=shared_library fastbuild=1 gcc_version=46 host_os=linux order_text_section=['orderfiles', 'orderfile.out'] target_arch=arm", 
+      "GYP_GENERATORS": "ninja", 
+      "GYP_GENERATOR_FLAGS": "default_target=All"
     }
   }, 
   "klp_builder": {
@@ -85,8 +91,10 @@
       ]
     }, 
     "gyp_env": {
-      "GYP_DEFINES": "component=shared_library fastbuild=1", 
-      "GYP_GENERATORS": "ninja"
+      "GYP_CROSSCOMPILE": 1, 
+      "GYP_DEFINES": "OS=android component=shared_library fastbuild=1 gcc_version=46 host_os=linux order_text_section=['orderfiles', 'orderfile.out'] target_arch=arm", 
+      "GYP_GENERATORS": "ninja", 
+      "GYP_GENERATOR_FLAGS": "default_target=All"
     }
   }, 
   "main_builder": {
@@ -100,8 +108,10 @@
       ]
     }, 
     "gyp_env": {
-      "GYP_DEFINES": "component=shared_library fastbuild=1", 
-      "GYP_GENERATORS": "ninja"
+      "GYP_CROSSCOMPILE": 1, 
+      "GYP_DEFINES": "OS=android component=shared_library fastbuild=1 gcc_version=46 host_os=linux order_text_section=['orderfiles', 'orderfile.out'] target_arch=arm", 
+      "GYP_GENERATORS": "ninja", 
+      "GYP_GENERATOR_FLAGS": "default_target=All"
     }
   }, 
   "msvs": "can not use msvs on \"mac\"", 
@@ -127,8 +137,10 @@
       ]
     }, 
     "gyp_env": {
-      "GYP_DEFINES": "component=shared_library fastbuild=1", 
-      "GYP_GENERATORS": "ninja"
+      "GYP_CROSSCOMPILE": 1, 
+      "GYP_DEFINES": "OS=android component=shared_library fastbuild=1 gcc_version=46 host_os=linux order_text_section=['orderfiles', 'orderfile.out'] target_arch=arm", 
+      "GYP_GENERATORS": "ninja", 
+      "GYP_GENERATOR_FLAGS": "default_target=All"
     }
   }, 
   "v8": {
@@ -155,8 +167,10 @@
       ]
     }, 
     "gyp_env": {
-      "GYP_DEFINES": "component=shared_library fastbuild=1", 
-      "GYP_GENERATORS": "ninja"
+      "GYP_CROSSCOMPILE": 1, 
+      "GYP_DEFINES": "OS=android component=shared_library fastbuild=1 gcc_version=46 host_os=linux order_text_section=['orderfiles', 'orderfile.out'] target_arch=arm", 
+      "GYP_GENERATORS": "ninja", 
+      "GYP_GENERATOR_FLAGS": "default_target=All"
     }
   }
 }