[Telemetry] Remove adb_commands from android_browser_backend and android_browser_backend_setting

tools/telemetry/telemetry/internal/backends/android_browser_backend_settings.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 logging
 import time
 
 from telemetry.core import exceptions
 
 
@@ skipping 19 matching lines @@
   def pseudo_exec_name(self):
     return self._pseudo_exec_name
 
   @property
   def supports_tab_control(self):
     return self._supports_tab_control
 
   def GetCommandLineFile(self, is_user_debug_build):  # pylint: disable=W0613
     return self._cmdline_file
 
-  def GetDevtoolsRemotePort(self, adb):
+  def GetDevtoolsRemotePort(self, device):
     raise NotImplementedError()
 
   @property
   def profile_ignore_list(self):
     # Don't delete lib, since it is created by the installer.
     return ['lib']
 
 
 class ChromeBackendSettings(AndroidBrowserBackendSettings):
   # Stores a default Preferences file, re-used to speed up "--page-repeat".
   _default_preferences_file = None
 
   def GetCommandLineFile(self, is_user_debug_build):
     if is_user_debug_build:
       return '/data/local/tmp/chrome-command-line'
     else:
       return '/data/local/chrome-command-line'
 
   def __init__(self, package):
     super(ChromeBackendSettings, self).__init__(
         activity='com.google.android.apps.chrome.Main',
         cmdline_file=None,
         package=package,
         pseudo_exec_name='chrome',
         supports_tab_control=True)
 
-  def GetDevtoolsRemotePort(self, adb):
+  def GetDevtoolsRemotePort(self, device):
     return 'localabstract:chrome_devtools_remote'
 
 
 class ContentShellBackendSettings(AndroidBrowserBackendSettings):
   def __init__(self, package):
     super(ContentShellBackendSettings, self).__init__(
         activity='org.chromium.content_shell_apk.ContentShellActivity',
         cmdline_file='/data/local/tmp/content-shell-command-line',
         package=package,
         pseudo_exec_name='content_shell',
         supports_tab_control=False)
 
-  def GetDevtoolsRemotePort(self, adb):
+  def GetDevtoolsRemotePort(self, device):
     return 'localabstract:content_shell_devtools_remote'
 
 
 class ChromeShellBackendSettings(AndroidBrowserBackendSettings):
   def __init__(self, package):
     super(ChromeShellBackendSettings, self).__init__(
           activity='org.chromium.chrome.shell.ChromeShellActivity',
           cmdline_file='/data/local/tmp/chrome-shell-command-line',
           package=package,
           pseudo_exec_name='chrome_shell',
           supports_tab_control=False)
 
-  def GetDevtoolsRemotePort(self, adb):
+  def GetDevtoolsRemotePort(self, device):
     return 'localabstract:chrome_shell_devtools_remote'
 
 
 class WebviewBackendSettings(AndroidBrowserBackendSettings):
   def __init__(self,
                package,
                activity='org.chromium.webview_shell.TelemetryActivity',
                cmdline_file='/data/local/tmp/webview-command-line'):
     super(WebviewBackendSettings, self).__init__(
         activity=activity,
         cmdline_file=cmdline_file,
         package=package,
         pseudo_exec_name='webview',
         supports_tab_control=False)
 
-  def GetDevtoolsRemotePort(self, adb):
+  def GetDevtoolsRemotePort(self, device):
     # The DevTools socket name for WebView depends on the activity PID's.
     retries = 0
     timeout = 1
     pid = None
     while True:
-      pids = adb.ExtractPid(self.package)
-      if len(pids) > 0:
-        pid = pids[-1]
-        break
-      time.sleep(timeout)
-      retries += 1
-      timeout *= 2
-      if retries == 4:
-        logging.critical('android_browser_backend: Timeout while waiting for '
-                         'activity %s:%s to come up',
-                         self.package,
-                         self.activity)
-        raise exceptions.BrowserGoneException(self.browser,
-                                              'Timeout waiting for PID.')
+      pids = device.GetPids(self.package)
+      if not pids or self.package not in pids:
+        time.sleep(timeout)
+        retries += 1
+        timeout *= 2
+        if retries == 4:
+          logging.critical('android_browser_backend: Timeout while waiting for '
+                           'activity %s:%s to come up',
+                           self.package,
+                           self.activity)
+          raise exceptions.BrowserGoneException(self.browser,
+                                                'Timeout waiting for PID.')
+      pid = pids[self.package]
+      break
     return 'localabstract:webview_devtools_remote_%s' % str(pid)
 
 
 class WebviewShellBackendSettings(WebviewBackendSettings):
   def __init__(self, package):
     super(WebviewShellBackendSettings, self).__init__(
         activity='org.chromium.android_webview.shell.AwShellActivity',
         cmdline_file='/data/local/tmp/android-webview-command-line',
         package=package)