[Telemetry] Refactor common Android cleanup functions.

tools/telemetry/telemetry/core/backends/chrome/android_browser_finder.py

Index: tools/telemetry/telemetry/core/backends/chrome/android_browser_finder.py
diff --git a/tools/telemetry/telemetry/core/backends/chrome/android_browser_finder.py b/tools/telemetry/telemetry/core/backends/chrome/android_browser_finder.py
index f956cedb4bbe931909a7d025754f823a49cfb28a..bd847cdecf9a4c3b2ac1cd534f5d53dbb5a40626 100644
--- a/tools/telemetry/telemetry/core/backends/chrome/android_browser_finder.py
+++ b/tools/telemetry/telemetry/core/backends/chrome/android_browser_finder.py
@@ -17,6 +17,9 @@ from telemetry.core.backends import adb_commands
 from telemetry.core.backends.chrome import android_browser_backend
 from telemetry.core.platform import android_platform_backend
 
+util.AddDirToPythonPath(util.GetChromiumSrcDir(), 'build', 'android')
+from pylib.utils import test_environment  # pylint: disable=F0401
+
 CHROME_PACKAGE_NAMES = {
   'android-content-shell':
       ['org.chromium.content_shell_apk',
@@ -203,13 +206,12 @@ def FindAllAvailableBrowsers(finder_options, logging=real_logging):
     # report that the device is offline. Our working theory is that killing
     # the process and allowing it to be automatically relaunched will allow us
     # to run for longer before it hangs.
-    if not finder_options.keep_test_server_ports:
+    if (not finder_options.keep_test_server_ports and

[bulach, 2013/11/15 09:36:07]

note to myself: this option is no longer needed, I'll cleanup from everywhere..

+        not os.environ.get('BUILDBOT_BUILDERNAME')):
       # This would break forwarder connections, so we cannot do this if
-      # instructed to keep server ports open.
-      logging.info('Killing adbd on device')
-      adb.KillAll('adbd')
-      logging.info('Waiting for adbd to restart')
-      adb.Adb().Adb().SendCommand('wait-for-device')
+      # instructed to keep server ports open. Furthermore, when running in a bot
+      # environment, the bot steps will call CleanupPendingProcess themselves.
+      test_environment.CleanupPendingProcesses(restart_adb_as_root=False)

[tonyg, 2013/11/15 05:45:10]

What happens if adb can't be put into root mode? If the failure is non-fatal,
I'd like to try to upgrade to root here.

[bulach, 2013/11/15 09:36:07]

+1!

[Primiano Tucci (use gerrit), 2013/11/19 18:13:03]

From adb_interface.py it look like that, unless SetAbortOnError is called on
run_command.py (which is not the case), that should just log an error message
and continue. 

 
   packages = adb.RunShellCommand('pm list packages')
   possible_browsers = []