Revert "Reland r212020: Move Python setup/tear down logic into Forwarder ..."

build/android/adb_reverse_forwarder.py

 #!/usr/bin/env python
 #
 # Copyright (c) 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.
 
 """Command line tool for forwarding ports from a device to the host.
 
 Allows an Android device to connect to services running on the host machine,
 i.e., "adb forward" in reverse. Requires |host_forwarder| and |device_forwarder|
 to be built.
 """
 
 import optparse
 import sys
 import time
 
 from pylib import android_commands, forwarder
 from pylib.utils import run_tests_helper
+from pylib.valgrind_tools import CreateTool
 
 
 def main(argv):
   parser = optparse.OptionParser(usage='Usage: %prog [options] device_port '
                                  'host_port [device_port_2 host_port_2] ...',
                                  description=__doc__)
   parser.add_option('-v',
                     '--verbose',
                     dest='verbose_count',
                     default=0,
@@ skipping 13 matching lines @@
     sys.exit(1)
 
   try:
     port_pairs = map(int, args[1:])
     port_pairs = zip(port_pairs[::2], port_pairs[1::2])
   except ValueError:
     parser.error('Bad port number')
     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)