Avoid nesting steps called under waiting for x:

scripts/slave/recipe_modules/auto_bisect/api.py

 # Copyright 2015 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.
 
 """API for the bisect recipe module.
 
 This API is meant to enable the bisect recipe to bisect any chromium-supported
 platform for any test that can be run via buildbot, perf or otherwise.
 """
 
@@ skipping 28 matching lines @@
     self.override_poll_interval = None
     self.bot_db = None
     # Repo for triggering build jobs.
     self.svn_repo_url = 'svn://svn.chromium.org/chrome-try/try-perf'    
     # The variable below are set and used for the internal bisects.
     self.buildurl_gs_prefix = None
     self.internal_bisect = False
     self.builder_bot = None
     self.full_deploy_script = None
 
-  def perform_bisect(self):
-    return local_bisect.perform_bisect(self)
+  def perform_bisect(self, **flags):
+    return local_bisect.perform_bisect(self, **flags)
 
-  def create_bisector(self, bisect_config_dict, dummy_mode=False):
+  def create_bisector(self, bisect_config_dict, dummy_mode=False, **flags):
     """Passes the api and the config dictionary to the Bisector constructor.
 
     For details about the keys in the bisect config dictionary go to:
     http://chromium.org/developers/speed-infra/perf-try-bots-bisect-bots/config
 
     Args:
       bisect_config_dict (dict): Contains the configuration for the bisect job.
       dummy_mode (bool): In dummy mode we prevent the bisector for expanding
         the revision range at construction, to avoid the need for lots of step
         data when performing certain tests (such as results output).
 
     Returns:
       An instance of bisector.Bisector.
     """
     self.override_poll_interval = bisect_config_dict.get('poll_sleep')
     return bisector.Bisector(self, bisect_config_dict,
                              revision_state.RevisionState,
-                             init_revisions=not dummy_mode)
+                             init_revisions=not dummy_mode, **flags)
 
   def set_platform_gs_prefix(self, gs_url):
     """Sets GS path for the platform."""
     self.buildurl_gs_prefix = gs_url  # pragma: no cover
 
   def set_builder_bot(self, builder_bot):
     """Sets builder name for building binaries."""
     self.builder_bot = builder_bot  # pragma: no cover
 
   def set_internal(self):
@@ skipping 263 matching lines @@
       3. A single test run for a recipe bisect job (there will be a
          bisect_config property but it won't contain good/bad revisions).
       4. A perf try job run.
 
     Args:
       api: The recipe api object.
       update_step: Extra update_step to, used for some job types.
       bot_db: A BotConfigAndTestDB object, used for some job types.
       kwargs: Args to use only for legacy bisect.
     """
+    flags = {}
+    if kwargs.get('do_not_nest_wait_for_revision'):
+      flags['do_not_nest_wait_for_revision'] = kwargs.pop(
+          'do_not_nest_wait_for_revision')
     if bot_db is None:  # pragma: no cover
       self.bot_db = api.chromium_tests.create_bot_db_from_master_dict(
           '', None, None)
     else:
       self.bot_db = bot_db
     affected_files = self.m.tryserver.get_files_affected_by_patch()
     # Skip device setup for internal bisect as it is taken care in
     # internal recipes.
     if api.chromium.c.TARGET_PLATFORM == 'android' and not self.internal_bisect:
       api.chromium_android.common_tests_setup_steps(
           perf_setup=True, remove_system_webview=True)
       api.chromium.runhooks()
     try:
       # Run legacy bisect script if the patch contains bisect.cfg.
       if BISECT_CONFIG_FILE in affected_files:
         self.run_bisect_script(**kwargs)
       elif api.properties.get('bisect_config'):
         # We can distinguish between a config for a full bisect vs a single
         # test by checking for the presence of the good_revision key.
         if api.properties.get('bisect_config').get('good_revision'):
-          local_bisect.perform_bisect(self)  # pragma: no cover
+          local_bisect.perform_bisect(self, **flags)  # pragma: no cover
         else:
           self.start_test_run_for_bisect(update_step, self.bot_db,
                                          api.properties)
       else:
         self.m.perf_try.start_perf_try_job(
             affected_files, update_step, self.bot_db)
     finally:
       if api.chromium.c.TARGET_PLATFORM == 'android':
         api.chromium_android.common_tests_final_steps()