Modify the Android test running scripts so they can be used from WebKit

build/android/pylib/forwarder.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.
 
 import logging
 import os
 import re
 import sys
 import time
 
 import android_commands
 import cmd_helper
 import constants
 import ports
 
 from pylib import pexpect
 
 
 def _MakeBinaryPath(build_type, binary_name):
-  return os.path.join(constants.CHROME_DIR, 'out', build_type, binary_name)
+  return os.path.join(cmd_helper.OutDirectory(), build_type, binary_name)
 
 
 class Forwarder(object):
   """Class to manage port forwards from the device to the host."""
 
   _DEVICE_FORWARDER_PATH = constants.TEST_EXECUTABLE_DIR + '/device_forwarder'
 
   # Unix Abstract socket path:
   _DEVICE_ADB_CONTROL_PORT = 'chrome_device_forwarder'
   _TIMEOUT_SECS = 30
@@ skipping 122 matching lines @@
 
   def DevicePortForHostPort(self, host_port):
     """Get the device port that corresponds to a given host port."""
     return self._host_to_device_port_map.get(host_port)
 
   def Close(self):
     """Terminate the forwarder process."""
     if self._device_process:
       self._device_process.close()
       self._device_process = None