telemetry/telemetry/internal/backends/chrome/cros_browser_backend.py - Issue 2267613002: Revert "[telemetry] Wire TsProxy through telemetry's network stack."

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: telemetry/telemetry/internal/backends/chrome/cros_browser_backend.py

Issue 2267613002: Revert "[telemetry] Wire TsProxy through telemetry's network stack." (Closed) Base URL: https://github.com/catapult-project/catapult.git@master

Patch Set: Created 4 years, 4 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

« no previous file with comments | « telemetry/telemetry/internal/backends/chrome/chrome_browser_backend_unittest.py ('k') | telemetry/telemetry/internal/browser/browser_unittest.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: telemetry/telemetry/internal/backends/chrome/cros_browser_backend.py

diff --git a/telemetry/telemetry/internal/backends/chrome/cros_browser_backend.py b/telemetry/telemetry/internal/backends/chrome/cros_browser_backend.py

index b68e060a3cf5b7757c88966087de4b81e328ea68..226cc6fefb6993c49315ed429355a26dff553af3 100644

--- a/telemetry/telemetry/internal/backends/chrome/cros_browser_backend.py

+++ b/telemetry/telemetry/internal/backends/chrome/cros_browser_backend.py

@@ -131,8 +131,10 @@ class CrOSBrowserBackend(chrome_browser_backend.ChromeBrowserBackend):

# TODO(crbug.com/404771): Move port forwarding to network_controller.

self._port = util.GetUnreservedAvailableLocalPort()

self._forwarder = self._platform_backend.forwarder_factory.Create(

- forwarders.PortPair(self._port, self._remote_debugging_port),

- use_remote_port_forwarding=False)

+ forwarders.PortPairs(

+ http=forwarders.PortPair(self._port, self._remote_debugging_port),

+ https=None,

+ dns=None), use_remote_port_forwarding=False)

# Wait for new chrome and oobe.

util.WaitFor(lambda: pid != self.pid, 15)