Revert of Remove adb_commands from android_browser_backend and android_browser_backend_settings.

tools/telemetry/telemetry/internal/backends/android_browser_backend_settings.py

Index: tools/telemetry/telemetry/internal/backends/android_browser_backend_settings.py
diff --git a/tools/telemetry/telemetry/internal/backends/android_browser_backend_settings.py b/tools/telemetry/telemetry/internal/backends/android_browser_backend_settings.py
index 6834dab4aab520611b12d94a131963c31e815713..21f4f1db44f8d5016fb1f777d25431f76bc92424 100644
--- a/tools/telemetry/telemetry/internal/backends/android_browser_backend_settings.py
+++ b/tools/telemetry/telemetry/internal/backends/android_browser_backend_settings.py
@@ -37,7 +37,7 @@
   def GetCommandLineFile(self, is_user_debug_build):  # pylint: disable=W0613
     return self._cmdline_file
 
-  def GetDevtoolsRemotePort(self, device):
+  def GetDevtoolsRemotePort(self, adb):
     raise NotImplementedError()
 
   @property
@@ -64,7 +64,7 @@
         pseudo_exec_name='chrome',
         supports_tab_control=True)
 
-  def GetDevtoolsRemotePort(self, device):
+  def GetDevtoolsRemotePort(self, adb):
     return 'localabstract:chrome_devtools_remote'
 
 
@@ -77,7 +77,7 @@
         pseudo_exec_name='content_shell',
         supports_tab_control=False)
 
-  def GetDevtoolsRemotePort(self, device):
+  def GetDevtoolsRemotePort(self, adb):
     return 'localabstract:content_shell_devtools_remote'
 
 
@@ -90,7 +90,7 @@
           pseudo_exec_name='chrome_shell',
           supports_tab_control=False)
 
-  def GetDevtoolsRemotePort(self, device):
+  def GetDevtoolsRemotePort(self, adb):
     return 'localabstract:chrome_shell_devtools_remote'
 
 
@@ -106,26 +106,26 @@
         pseudo_exec_name='webview',
         supports_tab_control=False)
 
-  def GetDevtoolsRemotePort(self, device):
+  def GetDevtoolsRemotePort(self, adb):
     # The DevTools socket name for WebView depends on the activity PID's.
     retries = 0
     timeout = 1
     pid = None
     while True:
-      pids = device.GetPids(self.package)
-      if not pids or self._backend_settings.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
+      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.')
     return 'localabstract:webview_devtools_remote_%s' % str(pid)