Remove net::ProxyDelegate as a per-request parameter of net::ProxyResolutionService.
Previously methods on ProxyResolutionService took an optional ProxyDelegate pointer. This was problematic as not all callers were providing the correct value, and plumbing it down was inconvenient.
Now the ProxyDelegate is instead an internal detail of the ProxyResolutionService.
Bug: 793071
Cq-Include-Trybots: luci.chromium.try:linux_mojo
Change-Id: I2eed185bc42cdc0bfcb945ad037fe2df52416198
Reviewed-on: https://chromium-review.googlesource.com/1208465
Reviewed-by: Matt Mueller <[email protected]>
Reviewed-by: Tarun Bansal <[email protected]>
Reviewed-by: Steven Bennetts <[email protected]>
Reviewed-by: John Abd-El-Malek <[email protected]>
Commit-Queue: Eric Roman <[email protected]>
Cr-Commit-Position: refs/heads/master@{#589950}diff --git a/net/websockets/websocket_end_to_end_test.cc b/net/websockets/websocket_end_to_end_test.cc
index aea2424..e15dbcb6 100644
--- a/net/websockets/websocket_end_to_end_test.cc
+++ b/net/websockets/websocket_end_to_end_test.cc
@@ -266,8 +266,9 @@
// ConnectAndWait(). This method is for the use of tests that need the
// URLRequestContext initialised before calling ConnectAndWait().
void InitialiseContext() {
- context_.set_proxy_delegate(proxy_delegate_.get());
context_.Init();
+ context_.proxy_resolution_service()->SetProxyDelegate(
+ proxy_delegate_.get());
initialised_context_ = true;
}
