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

Unified Diff: tools/profile_chrome/systrace_controller.py

Issue 404993004: [Android] Switch to DeviceUtils versions of GetMemoryUsageForPid and __str__. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comment from frankf Created 6 years, 5 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/profile_chrome/systrace_controller.py
diff --git a/tools/profile_chrome/systrace_controller.py b/tools/profile_chrome/systrace_controller.py
index 387ea9f227fd25297d086cb7341b947126bec3ae..52658346a000a645fdd04ef0b487516b2db20432 100644
--- a/tools/profile_chrome/systrace_controller.py
+++ b/tools/profile_chrome/systrace_controller.py
@@ -56,11 +56,11 @@ class SystraceController(controllers.BaseController):
return output_name
def _RunATraceCommand(self, command):
- # TODO(jbudorick) can this be made work with DeviceUtils?
# We use a separate interface to adb because the one from AndroidCommands
# isn't re-entrant.
- device_param = (['-s', self._device.old_interface.GetDevice()]
- if self._device.old_interface.GetDevice() else [])
+ # TODO(jbudorick) Look at providing a way to unhandroll this once the
+ # adb rewrite has fully landed.
+ device_param = (['-s', str(self._device)] if str(self._device) else [])
cmd = ['adb'] + device_param + ['shell', 'atrace', '--%s' % command] + \
_SYSTRACE_OPTIONS + self._categories
return cmd_helper.GetCmdOutput(cmd)
« no previous file with comments | « tools/profile_chrome/perf_controller.py ('k') | tools/telemetry/telemetry/core/forwarders/android_forwarder.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698