Use devil's adb with each bisect iteration, also start/stop daemons.

scripts/slave/recipe_modules/chromium_android/api.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.
 
 import contextlib
 import datetime
 import json
 import os
 import pipes
 import re
@@ skipping 300 matching lines @@
   def use_devil_adb(self):
     # TODO(jbudorick): Remove this after resolving
     # https://github.com/catapult-project/catapult/issues/2901
     devil_path = self.m.path['checkout'].join('third_party', 'catapult', 'devil')
     self.m.python.inline(
         'initialize devil',
         """
         import sys
         sys.path.append(sys.argv[1])
         from devil import devil_env
+        from devil.android.sdk import adb_wrapper
         devil_env.config.Initialize()
         devil_env.config.PrefetchPaths(dependencies=['adb'])
+        adb_wrapper.AdbWrapper.StartServer()
         """,
         args=[devil_path])
     self.m.adb.set_adb_path(
         devil_path.join('bin', 'deps', 'linux2', 'x86_64', 'bin', 'adb'))
 
   def create_adb_symlink(self):
     # Creates a sym link to the adb executable in the home dir
     self.m.python(
         'create adb symlink',
         self.m.path['checkout'].join('build', 'symlink.py'),
@@ skipping 821 matching lines @@
       self.asan_device_setup()
 
   def common_tests_final_steps(self, logcat_gs_bucket='chromium-android'):
     self.shutdown_device_monitor()
     self.logcat_dump(gs_bucket=logcat_gs_bucket)
     self.stack_tool_steps()
     if self.m.chromium.c.gyp_env.GYP_DEFINES.get('asan', 0) == 1:
       self.asan_device_teardown()
     self.test_report()
 
+  def android_build_wrapper(self, logcat_gs_bucket='chromium-android'):

[ghost stip (do not use), 2016/11/09 01:55:56]

this wacky construction of a contextmanager-generating function is so we can
have consistently defined logcat_gs_bucket. I think it's overkill, but jbudorick
seemed to prefer this over my initial solution in
https://codereview.chromium.org/2485763002/

[jbudorick, 2016/11/09 14:32:36]

On looking at this, a config setting probably would be cleaner, but I could live
with this.

+    @contextlib.contextmanager
+    def wrapper(bisect_obj):
+      """A context manager for use as auto_bisect's build_context_mgr.
+
+      This wraps every overall bisect run.
+      """
+      try:
+        bisect_obj.m.chromium_android.common_tests_setup_steps(
+            perf_setup=True, remove_system_webview=True)
+        bisect_obj.m.chromium.runhooks()
+
+        yield
+      finally:
+        bisect_obj.ensure_checkout()
+        bisect_obj.m.chromium_android.common_tests_final_steps(
+          logcat_gs_bucket=logcat_gs_bucket)
+    return wrapper
+
+  def android_bisect_test_wrapper(self, logcat_gs_bucket='chromium-android'):
+    @contextlib.contextmanager
+    def wrapper(bisect_obj):
+      """A context manager for use as auto_bisect's test_context_mgr.
+
+      This wraps each individual bisect test.
+      """
+      self.use_devil_adb()
+      with self.android_test_wrapper(logcat_gs_bucket)(bisect_obj):

[ghost stip (do not use), 2016/11/09 01:55:56]

this split is so android_test_wrapper can be used independently outside of
bisect and not have the repeated use_devil_adb

[jbudorick, 2016/11/09 14:32:36]

I think this belongs in the bisect modules rather than in here.

[RobertoCN, 2016/11/09 22:10:31]

+1

[ghost stip (do not use), 2016/11/09 23:05:37]

Done.

+        yield
+    return wrapper
+
+  def android_test_wrapper(self, logcat_gs_bucket='chromium-android'):
+    @contextlib.contextmanager
+    def wrapper(_bisect_obj):
+      """A context manager for running android test steps."""
+      try:
+        self.spawn_logcat_monitor()
+        self.spawn_device_monitor()
+
+        yield
+      finally:
+        self.shutdown_device_monitor()
+        self.logcat_dump(gs_bucket=logcat_gs_bucket)
+        self.stack_tool_steps()
+    return wrapper
+
   def run_bisect_script(self, extra_src='', path_to_config='', **kwargs):
     self.m.step('prepare bisect perf regression',
         [self.m.path['checkout'].join('tools',
                                       'prepare-bisect-perf-regression.py'),
          '-w', self.m.path['slave_build']])
 
     args = []
     if extra_src:
       args = args + ['--extra_src', extra_src]
     if path_to_config:
@@ skipping 440 matching lines @@
       script = self.c.test_runner
       if wrapper_script_suite_name:
         script = self.m.chromium.output_dir.join('bin', 'run_%s' %
                                                  wrapper_script_suite_name)
       else:
         env = kwargs.get('env', {})
         env['CHROMIUM_OUTPUT_DIR'] = env.get('CHROMIUM_OUTPUT_DIR',
                                              self.m.chromium.output_dir)
         kwargs['env'] = env
       return self.m.python(step_name, script, args, **kwargs)