Android: start upstreaming some of our perf tests.

tools/chrome_remote_control/chrome_remote_control/adb_commands.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.
 """Brings in Chrome Android's android_commands module, which itself is a
 thin(ish) wrapper around adb."""
 import os
 import sys
 
 # This is currently a thin wrapper around Chrome Android's
 # build scripts, located in chrome/build/android. This file exists mainly to
@@ skipping 101 matching lines @@
 
   def Pull(self, remote, local):
     return self._adb.Adb().Pull(remote, local)
 
   def FileExistsOnDevice(self, file_name):
     return self._adb.FileExistsOnDevice(file_name)
 
   def IsRootEnabled(self):
     return self._adb.IsRootEnabled()
 
-def HasForwarder(adb):
-  return adb.FileExistsOnDevice('/data/local/tmp/forwarder')
+
+def HasForwarder(adb, 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')))
+
 
 def HowToInstallForwarder():
-  return 'adb push out/$BUILD_TYPE/forwarder %s' % (
-    '/data/local/tmp/forwarder')
+  return 'adb push out/$BUILD_TYPE/device_forwarder %s' % (
+    '/data/local/tmp/device_forwarder')
 
 class Forwarder(object):
   def __init__(self, adb, host_port):
     assert HasForwarder(adb)
 
-    port_pairs = [(host_port, host_port), ]
+    port_pairs = [(0, host_port), ]

[tonyg, 2012/10/19 00:47:19]

Why the 0? I didn't need this in my patch.

[bulach, 2012/10/22 15:57:14]

0 means dynamically allocating the device port. since we're getting it on 149
anyways, seems better..

     tool = valgrind_tools.BaseTool()
 
     self._host_port = host_port
-
-    # Currently, Forwarder requires that ../out/Debug/forwarder exists,
-    # in case it needs to push it to the device. However, to get to here,
-    # android_browser_finder has ensured that device HasForwarder, above.
-    #
-    # Therefore, here, we just need to instantiate the forwarder, no push
-    # needed.
-    #
-    # To do this, we monkey patch adb.PushIfNeeded to a noop.
-    #
-    # TODO(nduca): Fix build.android.pylib.Forwarder to not need this.
-    real_push_if_needed = adb.Adb().PushIfNeeded
-    def FakePush(_, device_path):
-      assert adb.FileExistsOnDevice(device_path)
-    try:
-      adb.Adb().PushIfNeeded = FakePush
-      self._forwarder = forwarder.Forwarder(
+    buildtype = 'Debug'
+    if HasForwarder(adb, 'Release'):
+      buildtype = 'Release'
+    self._forwarder = forwarder.Forwarder(
         adb.Adb(), port_pairs,
-        tool, 'localhost', 'unused')
-    finally:
-      adb.Adb().PushIfNeeded = real_push_if_needed
+        tool, '127.0.0.1', buildtype)
     self._device_port = self._forwarder.DevicePortForHostPort(self._host_port)
 
   @property
   def url(self):
     assert self._forwarder
     return 'http://localhost:%i' % self._device_port
 
   def Close(self):
     if self._forwarder:
       self._forwarder.Close()
       self._forwarder = None