Index: tools/telemetry/telemetry/internal/backends/chrome/android_browser_backend.py |
diff --git a/tools/telemetry/telemetry/internal/backends/chrome/android_browser_backend.py b/tools/telemetry/telemetry/internal/backends/chrome/android_browser_backend.py |
index 6c857b75ec48a8190a9055093da169966e61c3ef..b763d3588d1fba7379cd8fe7cf8f9dbc0207276e 100644 |
--- a/tools/telemetry/telemetry/internal/backends/chrome/android_browser_backend.py |
+++ b/tools/telemetry/telemetry/internal/backends/chrome/android_browser_backend.py |
@@ -13,7 +13,6 @@ from telemetry.internal.backends import android_command_line_backend |
from telemetry.internal.backends import browser_backend |
from telemetry.internal.backends.chrome import chrome_browser_backend |
from telemetry.internal.browser import user_agent |
-from telemetry.internal import forwarders |
from devil.android.sdk import intent |
@@ -46,9 +45,6 @@ class AndroidBrowserBackend(chrome_browser_backend.ChromeBrowserBackend): |
self._target_arch = target_arch |
self._saved_sslflag = '' |
- # TODO(wuhu): Move to network controller backend. |
- self.platform_backend.InstallTestCa() |
- |
# Kill old browser. |
self._KillBrowser() |
@@ -62,14 +58,6 @@ class AndroidBrowserBackend(chrome_browser_backend.ChromeBrowserBackend): |
self._backend_settings.package, |
self._backend_settings.profile_ignore_list) |
- if self.browser_options.netsim: |
- assert self.platform_backend.use_rndis_forwarder, ( |
- 'Netsim requires RNDIS forwarding.') |
- self.wpr_port_pairs = forwarders.PortPairs( |
- http=forwarders.PortPair(0, 80), |
- https=forwarders.PortPair(0, 443), |
- dns=forwarders.PortPair(0, 53)) |
- |
# Set the debug app if needed. |
self.platform_backend.SetDebugApp(self._backend_settings.package) |
@@ -113,42 +101,15 @@ class AndroidBrowserBackend(chrome_browser_backend.ChromeBrowserBackend): |
extras=user_agent_dict), |
blocking=True) |
+ # TODO(crbug.com/404771): Move port forwarding to network_controller. |
remote_devtools_port = self._backend_settings.GetDevtoolsRemotePort( |
self.device) |
- try: |
- # Release reserved port right before forwarding host to device. |
- self._port_keeper.Release() |
- assert self._port == self._port_keeper.port, ( |
+ # Release reserved port right before forwarding host to device. |
+ self._port_keeper.Release() |
+ assert self._port == self._port_keeper.port, ( |
'Android browser backend must use reserved port by _port_keeper') |
- self.platform_backend.ForwardHostToDevice( |
- self._port, remote_devtools_port) |
- except Exception: |
- logging.exception('Failed to forward %s to %s.', |
- str(self._port), str(remote_devtools_port)) |
- logging.warning('Currently forwarding:') |
- try: |
- for line in self.device.adb.ForwardList().splitlines(): |
- logging.warning(' %s', line) |
- except Exception: |
- logging.warning('Exception raised while listing forwarded ' |
- 'connections.') |
- |
- logging.warning('Host tcp ports in use:') |
- try: |
- for line in subprocess.check_output(['netstat', '-t']).splitlines(): |
- logging.warning(' %s', line) |
- except Exception: |
- logging.warning('Exception raised while listing tcp ports.') |
- |
- logging.warning('Device unix domain sockets in use:') |
- try: |
- for line in self.device.ReadFile('/proc/net/unix', as_root=True, |
- force_pull=True).splitlines(): |
- logging.warning(' %s', line) |
- except Exception: |
- logging.warning('Exception raised while listing unix domain sockets.') |
- |
- raise |
+ self.platform_backend.ForwardHostToDevice( |
+ self._port, remote_devtools_port) |
try: |
self._WaitForBrowserToComeUp() |
@@ -207,8 +168,6 @@ class AndroidBrowserBackend(chrome_browser_backend.ChromeBrowserBackend): |
def Close(self): |
super(AndroidBrowserBackend, self).Close() |
- self.platform_backend.RemoveTestCa() |
- |
self._KillBrowser() |
self.platform_backend.StopForwardingHost(self._port) |