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

Unified Diff: tools/telemetry/telemetry/core/backends/android_command_line_backend.py

Issue 1141833003: [Android] Remove adb_commands from telemetry. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: (last?) rebase Created 5 years, 7 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/telemetry/telemetry/core/backends/android_command_line_backend.py
diff --git a/tools/telemetry/telemetry/core/backends/android_command_line_backend.py b/tools/telemetry/telemetry/core/backends/android_command_line_backend.py
index e05c0bbb1dc10bcd0281c9377f3c9f61e25cf5c4..2636fe604662cd1df7c7736adb9cd553ce158964 100644
--- a/tools/telemetry/telemetry/core/backends/android_command_line_backend.py
+++ b/tools/telemetry/telemetry/core/backends/android_command_line_backend.py
@@ -35,12 +35,12 @@ class SetUpCommandLineFlags(object):
Example usage:
with android_command_line_backend.SetUpCommandLineFlags(
- adb, backend_settings, startup_args):
+ device, backend_settings, startup_args):
# Something to run while the command line flags are set appropriately.
"""
- def __init__(self, adb, backend_settings, startup_args):
+ def __init__(self, device, backend_settings, startup_args):
self._android_command_line_backend = _AndroidCommandLineBackend(
- adb, backend_settings, startup_args)
+ device, backend_settings, startup_args)
def __enter__(self):
self._android_command_line_backend.SetUpCommandLineFlags()
@@ -59,15 +59,15 @@ class _AndroidCommandLineBackend(object):
functionality.
"""
- def __init__(self, adb, backend_settings, startup_args):
- self._adb = adb
+ def __init__(self, device, backend_settings, startup_args):
+ self._device = device
self._backend_settings = backend_settings
self._startup_args = startup_args
self._saved_command_line_file_contents = None
@property
def command_line_file(self):
- return self._backend_settings.GetCommandLineFile(self._adb.IsUserBuild())
+ return self._backend_settings.GetCommandLineFile(self._device.IsUserBuild())
def SetUpCommandLineFlags(self):
args = [self._backend_settings.pseudo_exec_name]
@@ -100,11 +100,11 @@ class _AndroidCommandLineBackend(object):
self._WriteFile(self._saved_command_line_file_contents)
def _ReadFile(self):
- return self._adb.device().ReadFile(self.command_line_file, as_root=True)
+ return self._device.ReadFile(self.command_line_file, as_root=True)
def _WriteFile(self, contents):
- self._adb.device().WriteFile(self.command_line_file, contents, as_root=True)
+ self._device.WriteFile(self.command_line_file, contents, as_root=True)
def _RemoveFile(self):
- self._adb.device().RunShellCommand(['rm', '-f', self.command_line_file],
- as_root=True, check_return=True)
+ self._device.RunShellCommand(['rm', '-f', self.command_line_file],
+ as_root=True, check_return=True)

Powered by Google App Engine
This is Rietveld 408576698