Telemetry: fixes Forwarder integration on android.

This has been broken due to recent refactors in the forwarder component.

BUG=160963
TEST=./tools/telemetry/run_tests --browser=android-content-shell testCustomActionToNavigate


Review URL: https://chromiumcodereview.appspot.com/11411074

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

2 files changed, 13 insertions, 11 deletions

diff --git a/tools/telemetry/telemetry/adb_commands.py b/tools/telemetry/telemetry/adb_commands.py
index a1dbb40..9b21d38 100644
--- a/tools/telemetry/telemetry/adb_commands.py
+++ b/tools/telemetry/telemetry/adb_commands.py
@@ -17,6 +17,7 @@ sys.path.append(
                      '../../../build/android')))
 try:
   from pylib import android_commands # pylint: disable=F0401
+  from pylib import cmd_helper # pylint: disable=F0401
   from pylib import forwarder # pylint: disable=F0401
   from pylib import valgrind_tools # pylint: disable=F0401
 except Exception:
@@ -119,27 +120,28 @@ class AdbCommands(object):
   def IsRootEnabled(self):
     return self._adb.IsRootEnabled()
 
-def HasForwarder(adb, buildtype=None):
+def HasForwarder(buildtype=None):
   if not buildtype:
-    return (HasForwarder(adb, buildtype='Release') or
-            HasForwarder(adb, buildtype='Debug'))
-  return (os.path.exists(os.path.join('out', buildtype, 'device_forwarder')) and
-          os.path.exists(os.path.join('out', buildtype, 'host_forwarder')))
+    return (HasForwarder(buildtype='Release') or
+            HasForwarder(buildtype='Debug'))
+  return (os.path.exists(os.path.join(cmd_helper.OutDirectory.get(), buildtype,
+                                     'device_forwarder')) and
+          os.path.exists(os.path.join(cmd_helper.OutDirectory.get(), buildtype,
+                                      'host_forwarder')))
 
 class Forwarder(object):
   def __init__(self, adb, *ports):
-    assert HasForwarder(adb)
+    assert HasForwarder()
 
     port_pairs = [(port, port) for port in ports]
     tool = valgrind_tools.BaseTool()
 
     self._host_port = ports[0]
     buildtype = 'Debug'
-    if HasForwarder(adb, 'Release'):
+    if HasForwarder('Release'):
       buildtype = 'Release'
-    self._forwarder = forwarder.Forwarder(
-        adb.Adb(), port_pairs,
-        tool, '127.0.0.1', buildtype)
+    self._forwarder = forwarder.Forwarder(adb.Adb(), buildtype)
+    self._forwarder.Run(port_pairs, tool, '127.0.0.1')
 
   @property
   def url(self):
diff --git a/tools/telemetry/telemetry/android_browser_finder.py b/tools/telemetry/telemetry/android_browser_finder.py
index 83e1030..838960b 100644
--- a/tools/telemetry/telemetry/android_browser_finder.py
+++ b/tools/telemetry/telemetry/android_browser_finder.py
@@ -138,7 +138,7 @@ def FindAllAvailableBrowsers(options, logging=real_logging):
 
   # See if the "forwarder" is installed -- we need this to host content locally
   # but make it accessible to the device.
-  if len(possible_browsers) and not adb_commands.HasForwarder(adb):
+  if len(possible_browsers) and not adb_commands.HasForwarder():
     logging.warn('telemetry detected an android device. However,')
     logging.warn('Chrome\'s port-forwarder app is not available.')
     logging.warn('To build:')