| Index: tools/telemetry/telemetry/core/backends/chrome/android_browser_backend.py
|
| diff --git a/tools/telemetry/telemetry/core/backends/chrome/android_browser_backend.py b/tools/telemetry/telemetry/core/backends/chrome/android_browser_backend.py
|
| index d18ee012e28df3e7c590119ba1861c22b75fb840..9170014530c71746b162154eaaf3cb4d9fde2e4a 100644
|
| --- a/tools/telemetry/telemetry/core/backends/chrome/android_browser_backend.py
|
| +++ b/tools/telemetry/telemetry/core/backends/chrome/android_browser_backend.py
|
| @@ -25,8 +25,8 @@
|
| class AndroidBrowserBackend(chrome_browser_backend.ChromeBrowserBackend):
|
| """The backend for controlling a browser instance running on Android."""
|
| def __init__(self, android_platform_backend, browser_options,
|
| - backend_settings, output_profile_path, extensions_to_load,
|
| - target_arch):
|
| + backend_settings, use_rndis_forwarder, output_profile_path,
|
| + extensions_to_load, target_arch):
|
| assert isinstance(android_platform_backend,
|
| android_platform_backend_module.AndroidPlatformBackend)
|
| super(AndroidBrowserBackend, self).__init__(
|
| @@ -64,9 +64,13 @@
|
| self._backend_settings.package,
|
| self._backend_settings.profile_ignore_list)
|
|
|
| - if self.browser_options.netsim or self.platform_backend.use_rndis_forwarder:
|
| - assert self.platform_backend.use_rndis_forwarder, (
|
| - 'Netsim requires RNDIS forwarding.')
|
| + # Configure platform to use the rndis forwarder.
|
| + # TODO(ariblue): Move this setting out of a browser-specific path, since
|
| + # apps may want to use the forwarder, as well.
|
| + self._platform_backend.SetRndisForwarder(use_rndis_forwarder)
|
| +
|
| + if self.browser_options.netsim or use_rndis_forwarder:
|
| + assert use_rndis_forwarder, 'Netsim requires RNDIS forwarding.'
|
| self.wpr_port_pairs = forwarders.PortPairs(
|
| http=forwarders.PortPair(0, 80),
|
| https=forwarders.PortPair(0, 443),
|
|
|