Chromium Code Reviews| Index: build/android/pylib/forwarder.py |
| diff --git a/build/android/pylib/forwarder.py b/build/android/pylib/forwarder.py |
| index 5cd56e4a97faca35af61731046d5c115936722b7..0784854d9238625c8cdc43924123dd0946921e27 100644 |
| --- a/build/android/pylib/forwarder.py |
| +++ b/build/android/pylib/forwarder.py |
| @@ -13,8 +13,6 @@ from pylib import cmd_helper |
| from pylib import constants |
| from pylib import valgrind_tools |
| -# TODO(jbudorick) Remove once telemetry gets switched over. |
| -import pylib.android_commands |
| import pylib.device.device_utils |
| @@ -74,7 +72,6 @@ class Forwarder(object): |
| Exception on failure to forward the port. |
| """ |
| # TODO(jbudorick) Remove once telemetry gets switched over. |
|
jbudorick
2015/07/28 17:31:42
these can go too :P
nednguyen
2015/07/28 17:39:38
Done.
|
| - assert not isinstance(device, pylib.android_commands.AndroidCommands) |
| if not tool: |
| tool = valgrind_tools.CreateTool(None, device) |
| with _FileLock(Forwarder._LOCK_PATH): |
| @@ -123,7 +120,6 @@ class Forwarder(object): |
| device_port: A previously forwarded port (through Map()). |
| """ |
| # TODO(jbudorick) Remove once telemetry gets switched over. |
| - assert not isinstance(device, pylib.android_commands.AndroidCommands) |
| with _FileLock(Forwarder._LOCK_PATH): |
| Forwarder._UnmapDevicePortLocked(device_port, device) |
| @@ -136,7 +132,6 @@ class Forwarder(object): |
| port_pairs: A list of tuples (device_port, host_port) to unmap. |
| """ |
| # TODO(jbudorick) Remove once telemetry gets switched over. |
| - assert not isinstance(device, pylib.android_commands.AndroidCommands) |
| with _FileLock(Forwarder._LOCK_PATH): |
| if not Forwarder._instance: |
| return |