Move Python setup/tear down logic into Forwarder itself.

tools/telemetry/telemetry/core/chrome/adb_commands.py

 # Copyright (c) 2012 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.
 """Brings in Chrome Android's android_commands module, which itself is a
 thin(ish) wrapper around adb."""
 import os
 import sys
 
 # This is currently a thin wrapper around Chrome Android's
 # build scripts, located in chrome/build/android. This file exists mainly to
 # deal with locating the module.
 
 # Get build/android scripts into our path.
 sys.path.append(
     os.path.abspath(
         os.path.join(os.path.dirname(__file__),
                      '..', '..', '..', '..', '..', 'build', 'android')))
 try:
   from pylib import android_commands # pylint: disable=F0401
   from pylib import cmd_helper # pylint: disable=F0401
   from pylib import forwarder # pylint: disable=F0401
   from pylib import ports # pylint: disable=F0401
-  from pylib import valgrind_tools # pylint: disable=F0401
 except Exception:
   android_commands = None
 
 
 def IsAndroidSupported():
   return android_commands != None
 
 
 def GetAttachedDevices():
   """Returns a list of attached, online android devices.
@@ skipping 115 matching lines @@
   if not buildtype:
     return (HasForwarder(buildtype='Release') or
             HasForwarder(buildtype='Debug'))
   return (os.path.exists(os.path.join(GetOutDirectory(), buildtype,
                                       'device_forwarder')) and
           os.path.exists(os.path.join(GetOutDirectory(), buildtype,
                                       'host_forwarder')))
 
 class Forwarder(object):
   def __init__(self, adb, *port_pairs):
-    tool = valgrind_tools.BaseTool()
+    self._adb = adb.Adb()
     self._host_port = port_pairs[0].local_port
 
     new_port_pairs = [(port_pair.local_port, port_pair.remote_port)
                       for port_pair in port_pairs]
 
-    self._forwarder = forwarder.Forwarder(adb.Adb(), Forwarder._GetBuildType())
-    self._forwarder.Run(new_port_pairs, tool)
+    self._port_pairs = new_port_pairs
+    forwarder.Forwarder.Map(new_port_pairs, self._adb)
 
   @staticmethod
   def _GetBuildType():
     assert HasForwarder()
     return 'Debug' if HasForwarder('Debug') else 'Release'
 
-  @staticmethod
-  def KillHost():
-    forwarder.Forwarder.KillHost(Forwarder._GetBuildType())
-
-  @staticmethod
-  def KillDevice(adb):
-    forwarder.Forwarder.KillDevice(adb.Adb(), valgrind_tools.BaseTool())
-
   @property
   def url(self):
-    assert self._forwarder
     return 'http://localhost:%i' % self._host_port
 
   def Close(self):
-    if self._forwarder:
-      self._forwarder.Close()
-      self._forwarder = None
+    for (device_port, _) in self._port_pairs:
+      forwarder.Forwarder.UnmapDevicePort(device_port, self._adb)