Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(478)

Unified Diff: tools/chrome_remote_control/chrome_remote_control/android_browser_finder.py

Issue 11187036: Android: start upstreaming some of our perf tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sami's comments Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: tools/chrome_remote_control/chrome_remote_control/android_browser_finder.py
diff --git a/tools/chrome_remote_control/chrome_remote_control/android_browser_finder.py b/tools/chrome_remote_control/chrome_remote_control/android_browser_finder.py
index 92c6a280a1cd1d375f4c7ca342fc8bfbbd6b1aa7..a0d4b04da800467fdc61a9af0267197d6e8c11a1 100644
--- a/tools/chrome_remote_control/chrome_remote_control/android_browser_finder.py
+++ b/tools/chrome_remote_control/chrome_remote_control/android_browser_finder.py
@@ -10,6 +10,7 @@ import subprocess
from chrome_remote_control import adb_commands
from chrome_remote_control import android_browser_backend
+from chrome_remote_control import android_platform
from chrome_remote_control import browser
from chrome_remote_control import possible_browser
@@ -52,7 +53,10 @@ class PossibleAndroidBrowser(possible_browser.PossibleBrowser):
def Create(self):
backend = android_browser_backend.AndroidBrowserBackend(
self._options, *self._args)
- return browser.Browser(backend)
+ platform = android_platform.AndroidPlatform(
+ self._args[0].Adb(), self._args[1],
+ self._args[1] + self._args[4])
+ return browser.Browser(backend, platform)
def FindAllAvailableBrowsers(options, logging=real_logging):
"""Finds all the desktop browsers available on this machine."""
@@ -136,11 +140,9 @@ def FindAllAvailableBrowsers(options, logging=real_logging):
# but make it accessible to the device.
if len(possible_browsers) and not adb_commands.HasForwarder(adb):
logging.warn('chrome_remote_control detected an android device. However,')
- logging.warn('Chrome\'s port-forwarder app is not installed on the device.')
+ logging.warn('Chrome\'s port-forwarder app is not available.')
logging.warn('To build:')
- logging.warn(' make -j16 out/$BUILDTYPE/forwarder')
- logging.warn('And then install it:')
- logging.warn(' %s', adb_commands.HowToInstallForwarder())
+ logging.warn(' make -j16 host_forwarder device_forwarder')
logging.warn('')
logging.warn('')
return []

Powered by Google App Engine
This is Rietveld 408576698