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

trunk/src/chrome/test/chromedriver/run_py_tests.py

 #!/usr/bin/env python
 # 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.
 
 """End to end tests for ChromeDriver."""
 
 import base64
 import optparse
 import os
@@ skipping 125 matching lines @@
 
 class ChromeDriverTest(ChromeDriverBaseTest):
   """End to end tests for ChromeDriver."""
 
   @staticmethod
   def GlobalSetUp():
     ChromeDriverTest._http_server = webserver.WebServer(
         chrome_paths.GetTestData())
     if _ANDROID_PACKAGE:
       ChromeDriverTest._adb = android_commands.AndroidCommands()
-      self._host_port = ChromeDriverTest._http_server._server.server_port
-      forwarder.Forwarder.Map(
-          [(self._host_port, self._host_port)], ChromeDriverTest._adb)
+      forwarder.Forwarder.KillHost('Debug')
+      ChromeDriverTest._forwarder = forwarder.Forwarder(ChromeDriverTest._adb,
+                                                        'Debug')
+      host_port = ChromeDriverTest._http_server._server.server_port
+      ChromeDriverTest._forwarder.Run(
+          [(host_port, host_port)], valgrind_tools.BaseTool())
 
   @staticmethod
   def GlobalTearDown():
     if _ANDROID_PACKAGE:
-      forwarder.Forwarder.UnmapAllDevicePorts(ChromeDriverTest._adb)
+      forwarder.Forwarder.KillDevice(ChromeDriverTest._adb,
+                                     valgrind_tools.BaseTool())
+      ChromeDriverTest._forwarder.Close()
     ChromeDriverTest._http_server.Shutdown()
 
   @staticmethod
   def GetHttpUrlForFile(file_path):
     return ChromeDriverTest._http_server.GetUrl() + file_path
 
   def setUp(self):
     self._driver = self.CreateDriver()
 
   def testStartStop(self):
@@ skipping 571 matching lines @@
       negative_filter = _GetDesktopNegativeFilter(options.chrome_version)
     options.filter = '*-' + ':__main__.'.join([''] + negative_filter)
 
   all_tests_suite = unittest.defaultTestLoader.loadTestsFromModule(
       sys.modules[__name__])
   tests = unittest_util.FilterTestSuite(all_tests_suite, options.filter)
   ChromeDriverTest.GlobalSetUp()
   result = unittest.TextTestRunner(stream=sys.stdout, verbosity=2).run(tests)
   ChromeDriverTest.GlobalTearDown()
   sys.exit(len(result.failures) + len(result.errors))