Revert of Avoid nesting steps called under waiting for x:

scripts/slave/recipe_modules/auto_bisect/example.expected/basic.json

 [
   {
     "cmd": [
       "git",
       "update-ref",
       "refs/heads/master",
       "refs/remotes/origin/master"
     ],
     "cwd": "[TMP_BASE]/fake_checkout_tmp_1",
     "name": "git update-ref"
@@ skipping 205 matching lines @@
       "--svn_repo",
       "svn://svn.chromium.org/chrome-try/try-perf",
       "--diff",
       "/dev/null"
     ],
     "cwd": "[TMP_BASE]/fake_checkout_tmp_1",
     "name": "Requesting build for 00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111 via git try."
   },
   {
     "cmd": [
+      "git",
+      "footers",
+      "--position",
+      "a6298e4afedbf2cd461755ea6f45b0ad64222222"
+    ],
+    "cwd": "[TMP_BASE]/fake_checkout_tmp_1",
+    "name": "resolving hash a6298e4afedbf2cd461755ea6f45b0ad64222222",
+    "stdout": "/path/to/tmp/"
+  },
+  {
+    "cmd": [],
+    "name": "Waiting for chromium@a6298e4afe"
+  },
+  {
+    "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
       "--",
       "[DEPOT_TOOLS]/gsutil.py",
       "----",
       "ls",
       "gs://chrome-perf/Linux Builder/full-build-linux_a6298e4afedbf2cd461755ea6f45b0ad64222222.zip"
     ],
-    "name": "gsutil ls (3)"
+    "name": "Waiting for chromium@a6298e4afe.gsutil ls",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
   },
   {
     "cmd": [],
-    "name": "Triggering test job for a6298e4afedbf2cd461755ea6f45b0ad64222222",
+    "name": "Waiting for chromium@a6298e4afe.Triggering test job for a6298e4afedbf2cd461755ea6f45b0ad64222222",
     "trigger_specs": [
       {
         "builder_name": "linux_perf_tester",
         "properties": {
           "bisect_config": {
             "command": "src/tools/perf/run_benchmark -v --browser=release smoothness.tough_scrolling_cases",
             "metric": "mean_input_event_latency/mean_input_event_latency",
             "repeat_count": 5,
             "test_type": "perf"
           },
           "job_name": "a6298e4afedbf2cd461755ea6f45b0ad64222222-test",
           "parent_build_archive_url": "gs://chrome-perf/Linux Builder/full-build-linux_a6298e4afedbf2cd461755ea6f45b0ad64222222.zip",
           "parent_got_revision": "a6298e4afedbf2cd461755ea6f45b0ad64222222",
           "revision": "a6298e4afedbf2cd461755ea6f45b0ad64222222",
           "revision_ladder": {
             "chromium": "a6298e4afedbf2cd461755ea6f45b0ad64222222"
           }
         }
       }
+    ],
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "\nimport sys\nimport time\ntime.sleep(20*60)\nsys.exit(0)\n"
     ],
-    "name": "sleeping",
+    "name": "Waiting for chromium@a6298e4afe.sleeping",
     "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@python.inline@@@@",
       "@@@STEP_LOG_LINE@python.inline@import sys@@@",
       "@@@STEP_LOG_LINE@python.inline@import time@@@",
       "@@@STEP_LOG_LINE@python.inline@time.sleep(20*60)@@@",
       "@@@STEP_LOG_LINE@python.inline@sys.exit(0)@@@",
       "@@@STEP_LOG_END@python.inline@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
       "--",
       "[DEPOT_TOOLS]/gsutil.py",
       "----",
       "ls",
       "gs://chrome-perf/bisect-results/a6298e4afedbf2cd461755ea6f45b0ad64222222-test.results"
     ],
-    "name": "gsutil ls (4)"
+    "name": "Waiting for chromium@a6298e4afe.gsutil ls (2)",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
       "--",
       "[DEPOT_TOOLS]/gsutil.py",
       "----",
       "cat",
       "gs://chrome-perf/bisect-results/a6298e4afedbf2cd461755ea6f45b0ad64222222-test.results"
     ],
-    "name": "gsutil Get test results for build a6298e4afedbf2cd461755ea6f45b0ad64222222",
+    "name": "Waiting for chromium@a6298e4afe.gsutil Get test results for build a6298e4afedbf2cd461755ea6f45b0ad64222222",
+    "stdout": "/path/to/tmp/",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "footers",
+      "--position",
+      "00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111"
+    ],
+    "cwd": "[TMP_BASE]/fake_checkout_tmp_1",
+    "name": "resolving hash 00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111",
     "stdout": "/path/to/tmp/"
   },
   {
+    "cmd": [],
+    "name": "Waiting for chromium@00316c9ddf"
+  },
+  {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
       "--",
       "[DEPOT_TOOLS]/gsutil.py",
       "----",
       "ls",
       "gs://chrome-perf/Linux Builder/full-build-linux_00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111.zip"
     ],
-    "name": "gsutil ls (5)"
+    "name": "Waiting for chromium@00316c9ddf.gsutil ls",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
   },
   {
     "cmd": [],
-    "name": "Triggering test job for 00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111",
+    "name": "Waiting for chromium@00316c9ddf.Triggering test job for 00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111",
     "trigger_specs": [
       {
         "builder_name": "linux_perf_tester",
         "properties": {
           "bisect_config": {
             "command": "src/tools/perf/run_benchmark -v --browser=release smoothness.tough_scrolling_cases",
             "metric": "mean_input_event_latency/mean_input_event_latency",
             "repeat_count": 5,
             "test_type": "perf"
           },
           "job_name": "00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111-test",
           "parent_build_archive_url": "gs://chrome-perf/Linux Builder/full-build-linux_00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111.zip",
           "parent_got_revision": "00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111",
           "revision": "00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111",
           "revision_ladder": {
             "chromium": "00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111"
           }
         }
       }
+    ],
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "\nimport sys\nimport time\ntime.sleep(20*60)\nsys.exit(0)\n"
     ],
-    "name": "sleeping (2)",
+    "name": "Waiting for chromium@00316c9ddf.sleeping",
     "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@python.inline@@@@",
       "@@@STEP_LOG_LINE@python.inline@import sys@@@",
       "@@@STEP_LOG_LINE@python.inline@import time@@@",
       "@@@STEP_LOG_LINE@python.inline@time.sleep(20*60)@@@",
       "@@@STEP_LOG_LINE@python.inline@sys.exit(0)@@@",
       "@@@STEP_LOG_END@python.inline@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
       "--",
       "[DEPOT_TOOLS]/gsutil.py",
       "----",
       "ls",
       "gs://chrome-perf/bisect-results/00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111-test.results"
     ],
-    "name": "gsutil ls (6)"
+    "name": "Waiting for chromium@00316c9ddf.gsutil ls (2)",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
       "--",
       "[DEPOT_TOOLS]/gsutil.py",
       "----",
       "cat",
       "gs://chrome-perf/bisect-results/00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111-test.results"
     ],
-    "name": "gsutil Get test results for build 00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111",
-    "stdout": "/path/to/tmp/"
+    "name": "Waiting for chromium@00316c9ddf.gsutil Get test results for build 00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111",
+    "stdout": "/path/to/tmp/",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
       "--",
       "[DEPOT_TOOLS]/gsutil.py",
       "----",
       "ls",
       "gs://chrome-perf/Linux Builder/full-build-linux_dcdcdc0ff1122212323134879ddceeb1240b0988.zip"
     ],
-    "name": "gsutil ls (7)"
+    "name": "gsutil ls (3)"
   },
   {
     "cmd": [
       "git",
       "-c",
       "user.email=FAKE_PERF_PUMPKIN@chromium.org",
       "try",
       "--bot",
       "linux_perf_bisect_builder",
       "--revision",
       "dcdcdc0ff1122212323134879ddceeb1240b0988",
       "--name",
       "dcdcdc0ff1122212323134879ddceeb1240b0988-build",
       "--clobber",
       "--svn_repo",
       "svn://svn.chromium.org/chrome-try/try-perf",
       "--diff",
       "/dev/null"
     ],
     "cwd": "[TMP_BASE]/fake_checkout_tmp_1",
     "name": "Requesting build for dcdcdc0ff1122212323134879ddceeb1240b0988 via git try."
   },
   {
     "cmd": [
+      "git",
+      "footers",
+      "--position",
+      "dcdcdc0ff1122212323134879ddceeb1240b0988"
+    ],
+    "cwd": "[TMP_BASE]/fake_checkout_tmp_1",
+    "name": "resolving hash dcdcdc0ff1122212323134879ddceeb1240b0988",
+    "stdout": "/path/to/tmp/"
+  },
+  {
+    "cmd": [],
+    "name": "Waiting for chromium@dcdcdc0ff1"
+  },
+  {
+    "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
       "--",
       "[DEPOT_TOOLS]/gsutil.py",
       "----",
       "ls",
       "gs://chrome-perf/Linux Builder/full-build-linux_dcdcdc0ff1122212323134879ddceeb1240b0988.zip"
     ],
-    "name": "gsutil ls (8)"
+    "name": "Waiting for chromium@dcdcdc0ff1.gsutil ls",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
   },
   {
     "cmd": [],
-    "name": "Triggering test job for dcdcdc0ff1122212323134879ddceeb1240b0988",
+    "name": "Waiting for chromium@dcdcdc0ff1.Triggering test job for dcdcdc0ff1122212323134879ddceeb1240b0988",
     "trigger_specs": [
       {
         "builder_name": "linux_perf_tester",
         "properties": {
           "bisect_config": {
             "command": "src/tools/perf/run_benchmark -v --browser=release smoothness.tough_scrolling_cases",
             "metric": "mean_input_event_latency/mean_input_event_latency",
             "repeat_count": 5,
             "test_type": "perf"
           },
           "job_name": "dcdcdc0ff1122212323134879ddceeb1240b0988-test",
           "parent_build_archive_url": "gs://chrome-perf/Linux Builder/full-build-linux_dcdcdc0ff1122212323134879ddceeb1240b0988.zip",
           "parent_got_revision": "dcdcdc0ff1122212323134879ddceeb1240b0988",
           "revision": "dcdcdc0ff1122212323134879ddceeb1240b0988",
           "revision_ladder": {
             "chromium": "dcdcdc0ff1122212323134879ddceeb1240b0988"
           }
         }
       }
+    ],
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "\nimport sys\nimport time\ntime.sleep(20*60)\nsys.exit(0)\n"
     ],
-    "name": "sleeping (3)",
+    "name": "Waiting for chromium@dcdcdc0ff1.sleeping",
     "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@python.inline@@@@",
       "@@@STEP_LOG_LINE@python.inline@import sys@@@",
       "@@@STEP_LOG_LINE@python.inline@import time@@@",
       "@@@STEP_LOG_LINE@python.inline@time.sleep(20*60)@@@",
       "@@@STEP_LOG_LINE@python.inline@sys.exit(0)@@@",
       "@@@STEP_LOG_END@python.inline@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
       "--",
       "[DEPOT_TOOLS]/gsutil.py",
       "----",
       "ls",
       "gs://chrome-perf/bisect-results/dcdcdc0ff1122212323134879ddceeb1240b0988-test.results"
     ],
-    "name": "gsutil ls (9)"
+    "name": "Waiting for chromium@dcdcdc0ff1.gsutil ls (2)",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
       "--",
       "[DEPOT_TOOLS]/gsutil.py",
       "----",
       "cat",
       "gs://chrome-perf/bisect-results/dcdcdc0ff1122212323134879ddceeb1240b0988-test.results"
     ],
-    "name": "gsutil Get test results for build dcdcdc0ff1122212323134879ddceeb1240b0988",
-    "stdout": "/path/to/tmp/"
+    "name": "Waiting for chromium@dcdcdc0ff1.gsutil Get test results for build dcdcdc0ff1122212323134879ddceeb1240b0988",
+    "stdout": "/path/to/tmp/",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::auto_bisect]/resources/significantly_different.py",
       "[19, 20, 21, 22, 23]",
       "[12, 13, 14, 15, 16]",
       "0.01"
     ],
-    "name": "Checking sample difference",
+    "name": "Waiting for chromium@dcdcdc0ff1.Checking sample difference",
     "stdout": "/path/to/tmp/json",
     "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@json.output (invalid)@null@@@",
       "@@@STEP_LOG_END@json.output (invalid)@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::auto_bisect]/resources/significantly_different.py",
       "[12, 13, 14, 15, 16]",
       "[12, 13, 14, 15, 16]",
       "0.01"
     ],
-    "name": "Checking sample difference (2)",
+    "name": "Waiting for chromium@dcdcdc0ff1.Checking sample difference (2)",
     "stdout": "/path/to/tmp/json",
     "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@json.output (invalid)@null@@@",
       "@@@STEP_LOG_END@json.output (invalid)@@@"
     ]
   },
   {
     "cmd": [
       "git",
       "show",
       "--name-only",
       "--pretty=format:",
@@ skipping 100 matching lines @@
       "a6298e4afedbf2cd461755ea6f45b0ad64222222:DEPS",
       "f412e8458",
       "--src-prefix=IAMSRC:",
       "--dst-prefix=IAMDST:"
     ],
     "cwd": "[SLAVE_BUILD]/src",
     "name": "Generating patch for a6298e4afedbf2cd461755ea6f45b0ad64222222:DEPS to 003",
     "stdout": "/path/to/tmp/"
   },
   {
-    "cmd": [
-      "git",
-      "footers",
-      "--position",
-      "a6298e4afedbf2cd461755ea6f45b0ad64222222"
-    ],
-    "cwd": "[TMP_BASE]/fake_checkout_tmp_1",
-    "name": "resolving hash a6298e4afedbf2cd461755ea6f45b0ad64222222",
-    "stdout": "/path/to/tmp/"
-  },
-  {
     "cmd": [],
     "name": "Wiggling revision chromium@a6298e4afe,v8@003"
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
       "--",
       "[DEPOT_TOOLS]/gsutil.py",
       "----",
       "ls",
       "gs://chrome-perf/Linux Builder/full-build-linux_a6298e4afedbf2cd461755ea6f45b0ad64222222_51e7ed4b63ad81d8b499e42b888149349afaaca1.zip"
     ],
-    "name": "gsutil ls (10)"
+    "name": "gsutil ls (4)"
   },
   {
     "cmd": [
       "python",
       "-u",
       "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
       "Dummy .diff contents 001 - 003\ndiff --git DEPS.sha DEPS.sha\nnew file mode 100644\n--- /dev/null\n+++ DEPS.sha\n@@ -0,0 +1 @@\n+51e7ed4b63ad81d8b499e42b888149349afaaca1\n",
       "[TMP_BASE]/003-build.diff"
     ],
     "name": "Saving diff patch for 003"
@@ skipping 55 matching lines @@
       "@@@STEP_LOG_LINE@json.output@}@@@",
       "@@@STEP_LOG_END@json.output@@@"
     ]
   },
   {
     "name": "$result",
     "recipe_result": null,
     "status_code": 0
   }
 ]