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

Unified Diff: tools/telemetry/telemetry/internal/backends/mandoline/android_mandoline_backend.py

Issue 1491183003: [Telemetry] Move WPR life cycle from browser to platform (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: work in progress Created 4 years, 11 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/internal/backends/mandoline/android_mandoline_backend.py
diff --git a/tools/telemetry/telemetry/internal/backends/mandoline/android_mandoline_backend.py b/tools/telemetry/telemetry/internal/backends/mandoline/android_mandoline_backend.py
index 4065546a62437faa195f82bdbe1bfe39f7f35b66..a7918cc86f641639b48cdd41cecc97ab482e0b32 100644
--- a/tools/telemetry/telemetry/internal/backends/mandoline/android_mandoline_backend.py
+++ b/tools/telemetry/telemetry/internal/backends/mandoline/android_mandoline_backend.py
@@ -41,9 +41,6 @@ class AndroidMandolineBackend(
self._device_port = None
self._chrome_root = chrome_root
- # TODO(wuhu): Move to network controller backend.
- self.platform_backend.InstallTestCa()
-
# Kill old browser.
self._KillBrowser()
@@ -62,12 +59,10 @@ class AndroidMandolineBackend(
self.platform_backend.DismissCrashDialogIfNeeded()
+ # TODO(crbug.com/404771): Move port forwarding to network_controller.
self._port = util.GetUnreservedAvailableLocalPort()
self._device_port = self._GetAvailableDevicePort()
-
- self.device.adb.Forward('tcp:%d' % self._port, 'tcp:%d' % self._device_port)
- logging.info('Forwarded host port %d to device port %d.' %
- (self._port, self._device_port))
+ self.platform_backend.ForwardHostToDevice(self._port, self._device_port)
args = self.GetBrowserStartupArgs()
@@ -144,9 +139,6 @@ class AndroidMandolineBackend(
def Close(self):
super(AndroidMandolineBackend, self).Close()
-
- self.platform_backend.RemoveTestCa()
-
self._KillBrowser()
if self._port:

Powered by Google App Engine
This is Rietveld 408576698