Revert 212020 "Move Python setup/tear down logic into Forwarder ..."

This causes flakiness on the Android debug tester bot.

> Move Python setup/tear down logic into Forwarder itself.
> 
> Forwarder used to be a pain to setup/tear down across all the various
> harnesses.
> This CL should hopefully solve these issues by hiding these implementation
> details. The host daemon is now killed once the first time that the Forwarder
> class is used and the daemon running on the devices is also killed the first
> time a port is forwarded for a specific device.
> 
> BUG=242846
> R=bulach@chromium.org, frankf@chromium.org
> 
> Review URL: https://codereview.chromium.org/18086004

TBR=pliard@chromium.org

Review URL: https://codereview.chromium.org/19576005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212054 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 2 deletions

diff --git a/build/android/adb_reverse_forwarder.py b/build/android/adb_reverse_forwarder.py
index ee38332..e465ea7 100755
--- a/build/android/adb_reverse_forwarder.py
+++ b/build/android/adb_reverse_forwarder.py
@@ -17,6 +17,7 @@ import time
 
 from pylib import android_commands, forwarder
 from pylib.utils import run_tests_helper
+from pylib.valgrind_tools import CreateTool
 
 
 def main(argv):
@@ -50,14 +51,17 @@ def main(argv):
     sys.exit(1)
 
   adb = android_commands.AndroidCommands(options.device)
+  tool = CreateTool(None, adb)
+  forwarder_instance = forwarder.Forwarder(adb, options.build_type)
   try:
-    forwarder.Forwarder.Map(port_pairs, adb, options.build_type)
+    forwarder_instance.Run(port_pairs, tool)
     while True:
       time.sleep(60)
   except KeyboardInterrupt:
     sys.exit(0)
   finally:
-    forwarder.Forwarder.UnmapAllDevicePorts(adb)
+    forwarder_instance.Close()
+
 
 if __name__ == '__main__':
   main(sys.argv)