Reland r210268: "Improve forwarder2 setup/tear down in telemetry."

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

Index: tools/telemetry/telemetry/core/chrome/adb_commands.py
diff --git a/tools/telemetry/telemetry/core/chrome/adb_commands.py b/tools/telemetry/telemetry/core/chrome/adb_commands.py
index 8c2afd24755350fceb7fde6a8cc6e4c4cfbe51e4..3cf3ac3174d4ac194b63bf34ec6b83eac0568c25 100644
--- a/tools/telemetry/telemetry/core/chrome/adb_commands.py
+++ b/tools/telemetry/telemetry/core/chrome/adb_commands.py
@@ -156,19 +156,28 @@ def HasForwarder(buildtype=None):
 
 class Forwarder(object):
   def __init__(self, adb, *port_pairs):
-    assert HasForwarder()
     tool = valgrind_tools.BaseTool()
     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]
 
-    buildtype = 'Debug'
-    if HasForwarder('Release'):
-      buildtype = 'Release'
-    self._forwarder = forwarder.Forwarder(adb.Adb(), buildtype)
+    self._forwarder = forwarder.Forwarder(adb.Adb(), Forwarder._GetBuildType())
     self._forwarder.Run(new_port_pairs, tool)
 
+  @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