Rename ProxyService class to ProxyResolutionService
[email protected],[email protected],[email protected],[email protected],[email protected],[email protected],[email protected],[email protected],[email protected],[email protected],[email protected],[email protected],[email protected],[email protected]
Bug: 613637
Cq-Include-Trybots: master.tryserver.chromium.android:android_cronet_tester;master.tryserver.chromium.linux:linux_mojo;master.tryserver.chromium.mac:ios-simulator-cronet;master.tryserver.chromium.mac:ios-simulator-full-configs
Change-Id: Ie296831e1bcb402274e416d85fab43f5f2db5e49
Reviewed-on: https://chromium-review.googlesource.com/857421
Commit-Queue: Lily Houghton <[email protected]>
Reviewed-by: Mike West <[email protected]>
Reviewed-by: Reilly Grant <[email protected]>
Reviewed-by: Gary Kacmarcik <[email protected]>
Reviewed-by: Steven Bennetts <[email protected]>
Reviewed-by: Eugene But <[email protected]>
Reviewed-by: Eric Roman <[email protected]>
Cr-Commit-Position: refs/heads/master@{#530810}diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc
index a8b1384..9d8e6254 100644
--- a/net/http/http_network_transaction_unittest.cc
+++ b/net/http/http_network_transaction_unittest.cc
@@ -3031,8 +3031,8 @@
request.load_flags = LOAD_DO_NOT_SEND_AUTH_DATA;
// Configure against proxy server "myproxy:70".
- session_deps_.proxy_service =
- ProxyService::CreateFixedFromPacResult("PROXY myproxy:70");
+ session_deps_.proxy_resolution_service =
+ ProxyResolutionService::CreateFixedFromPacResult("PROXY myproxy:70");
BoundTestNetLog log;
session_deps_.net_log = log.bound().net_log();
std::unique_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
@@ -3156,8 +3156,8 @@
request.load_flags = LOAD_DO_NOT_SEND_AUTH_DATA;
// Configure against proxy server "myproxy:70".
- session_deps_.proxy_service =
- ProxyService::CreateFixedFromPacResult("PROXY myproxy:70");
+ session_deps_.proxy_resolution_service =
+ ProxyResolutionService::CreateFixedFromPacResult("PROXY myproxy:70");
BoundTestNetLog log;
session_deps_.net_log = log.bound().net_log();
std::unique_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
@@ -3285,7 +3285,8 @@
request.load_flags = LOAD_DO_NOT_SEND_AUTH_DATA;
// Configure against proxy server "myproxy:70".
- session_deps_.proxy_service = ProxyService::CreateFixed("myproxy:70");
+ session_deps_.proxy_resolution_service =
+ ProxyResolutionService::CreateFixed("myproxy:70");
BoundTestNetLog log;
session_deps_.net_log = log.bound().net_log();
std::unique_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
@@ -3395,7 +3396,8 @@
request.load_flags = LOAD_DO_NOT_SEND_AUTH_DATA;
// Configure against proxy server "myproxy:70".
- session_deps_.proxy_service = ProxyService::CreateFixed("myproxy:70");
+ session_deps_.proxy_resolution_service =
+ ProxyResolutionService::CreateFixed("myproxy:70");
BoundTestNetLog log;
session_deps_.net_log = log.bound().net_log();
std::unique_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
@@ -3500,8 +3502,8 @@
request.load_flags = LOAD_DO_NOT_SEND_AUTH_DATA;
// Configure against proxy server "myproxy:70".
- session_deps_.proxy_service =
- ProxyService::CreateFixedFromPacResult("PROXY myproxy:70");
+ session_deps_.proxy_resolution_service =
+ ProxyResolutionService::CreateFixedFromPacResult("PROXY myproxy:70");
BoundTestNetLog log;
session_deps_.net_log = log.bound().net_log();
std::unique_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
@@ -3626,7 +3628,8 @@
request.load_flags = LOAD_DO_NOT_SEND_AUTH_DATA;
// Configure against proxy server "myproxy:70".
- session_deps_.proxy_service = ProxyService::CreateFixed("myproxy:70");
+ session_deps_.proxy_resolution_service =
+ ProxyResolutionService::CreateFixed("myproxy:70");
std::unique_ptr<HttpNetworkSession> session = CreateSession(&session_deps_);
HttpNetworkTransaction trans(DEFAULT_PRIORITY, session.get());
@@ -3713,7 +3716,8 @@
request.url = GURL("https://www.example.org/");
// Configure against proxy server "myproxy:70".
- session_deps_.proxy_service = ProxyService::CreateFixed("myproxy:70");
+ session_deps_.proxy_resolution_service =
+ ProxyResolutionService::CreateFixed("myproxy:70");
std::unique_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
@@ -3770,7 +3774,8 @@
request.url = GURL("https://www.example.org/");
// Configure against proxy server "myproxy:70".
- session_deps_.proxy_service = ProxyService::CreateFixed("myproxy:70");
+ session_deps_.proxy_resolution_service =
+ ProxyResolutionService::CreateFixed("myproxy:70");
std::unique_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
@@ -3873,7 +3878,8 @@
request.method = "GET";
request.url = GURL("https://www.example.org/");
- session_deps_.proxy_service = ProxyService::CreateFixed("myproxy:70");
+ session_deps_.proxy_resolution_service =
+ ProxyResolutionService::CreateFixed("myproxy:70");
BoundTestNetLog log;
session_deps_.net_log = log.bound().net_log();
std::unique_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
@@ -3933,8 +3939,8 @@
request.url = GURL("https://www.example.org/");
// Configure against proxy server "myproxy:70".
- session_deps_.proxy_service =
- ProxyService::CreateFixedFromPacResult("PROXY myproxy:70");
+ session_deps_.proxy_resolution_service =
+ ProxyResolutionService::CreateFixedFromPacResult("PROXY myproxy:70");
auto auth_handler_factory = std::make_unique<HttpAuthHandlerMock::Factory>();
auth_handler_factory->set_do_init_from_challenge(true);
@@ -4049,8 +4055,8 @@
request.url = GURL("https://www.example.org/");
// Configure against proxy server "myproxy:70".
- session_deps_.proxy_service =
- ProxyService::CreateFixedFromPacResult("PROXY myproxy:70");
+ session_deps_.proxy_resolution_service =
+ ProxyResolutionService::CreateFixedFromPacResult("PROXY myproxy:70");
auto auth_handler_factory = std::make_unique<HttpAuthHandlerMock::Factory>();
auth_handler_factory->set_do_init_from_challenge(true);
@@ -4170,8 +4176,8 @@
request.url = GURL("https://www.example.org/");
// Configure against proxy server "myproxy:70".
- session_deps_.proxy_service =
- ProxyService::CreateFixedFromPacResult("PROXY myproxy:70");
+ session_deps_.proxy_resolution_service =
+ ProxyResolutionService::CreateFixedFromPacResult("PROXY myproxy:70");
auto auth_handler_factory = std::make_unique<HttpAuthHandlerMock::Factory>();
auth_handler_factory->set_do_init_from_challenge(true);
@@ -4267,8 +4273,8 @@
request.url = GURL("https://www.example.org/");
// Configure against proxy server "myproxy:70".
- session_deps_.proxy_service =
- ProxyService::CreateFixedFromPacResult("PROXY myproxy:70");
+ session_deps_.proxy_resolution_service =
+ ProxyResolutionService::CreateFixedFromPacResult("PROXY myproxy:70");
auto auth_handler_factory = std::make_unique<HttpAuthHandlerMock::Factory>();
auth_handler_factory->set_do_init_from_challenge(true);
@@ -4559,7 +4565,7 @@
// foo.com using proxy.com as an HTTPS proxy won't use the same socket as a
// request to foo.com using proxy.com as an HTTP proxy.
TEST_F(HttpNetworkTransactionTest, SameDestinationForDifferentProxyTypes) {
- session_deps_.proxy_service = std::make_unique<ProxyService>(
+ session_deps_.proxy_resolution_service = std::make_unique<ProxyResolutionService>(
std::make_unique<ProxyConfigServiceFixed>(
ProxyConfig::CreateAutoDetect()),
std::make_unique<SameProxyWithDifferentSchemesProxyResolverFactory>(),
@@ -4721,7 +4727,8 @@
request2.url = GURL("https://www.example.org/2");
// Configure against proxy server "myproxy:70".
- session_deps_.proxy_service = ProxyService::CreateFixed("myproxy:70");
+ session_deps_.proxy_resolution_service =
+ ProxyResolutionService::CreateFixed("myproxy:70");
BoundTestNetLog log;
session_deps_.net_log = log.bound().net_log();
std::unique_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
@@ -4820,8 +4827,8 @@
request2.url = GURL("https://www.example.org/2");
// Configure against proxy server "myproxy:70".
- session_deps_.proxy_service =
- ProxyService::CreateFixedFromPacResult("PROXY myproxy:70");
+ session_deps_.proxy_resolution_service =
+ ProxyResolutionService::CreateFixedFromPacResult("PROXY myproxy:70");
BoundTestNetLog log;
session_deps_.net_log = log.bound().net_log();
std::unique_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
@@ -4915,7 +4922,8 @@
request.url = GURL("http://www.example.org/");
// Configure against https proxy server "proxy:70".
- session_deps_.proxy_service = ProxyService::CreateFixed("https://proxy:70");
+ session_deps_.proxy_resolution_service =
+ ProxyResolutionService::CreateFixed("https://proxy:70");
BoundTestNetLog log;
session_deps_.net_log = log.bound().net_log();
std::unique_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
@@ -4976,7 +4984,8 @@
request.url = GURL("http://www.example.org/");
// Configure against https proxy server "proxy:70".
- session_deps_.proxy_service = ProxyService::CreateFixed("https://proxy:70");
+ session_deps_.proxy_resolution_service =
+ ProxyResolutionService::CreateFixed("https://proxy:70");
BoundTestNetLog log;
session_deps_.net_log = log.bound().net_log();
std::unique_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
@@ -5035,7 +5044,8 @@
request.url = GURL("http://www.example.org/");
// Configure SPDY proxy server "proxy:70".
- session_deps_.proxy_service = ProxyService::CreateFixed("https://proxy:70");
+ session_deps_.proxy_resolution_service =
+ ProxyResolutionService::CreateFixed("https://proxy:70");
BoundTestNetLog log;
session_deps_.net_log = log.bound().net_log();
std::unique_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
@@ -5102,7 +5112,8 @@
request.url = GURL("http://www.example.org/");
// Configure against https proxy server "myproxy:70".
- session_deps_.proxy_service = ProxyService::CreateFixed("https://myproxy:70");
+ session_deps_.proxy_resolution_service =
+ ProxyResolutionService::CreateFixed("https://myproxy:70");
BoundTestNetLog log;
session_deps_.net_log = log.bound().net_log();
std::unique_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
@@ -5194,7 +5205,8 @@
request.url = GURL("https://www.example.org/");
// Configure against https proxy server "proxy:70".
- session_deps_.proxy_service = ProxyService::CreateFixed("https://proxy:70");
+ session_deps_.proxy_resolution_service =
+ ProxyResolutionService::CreateFixed("https://proxy:70");
BoundTestNetLog log;
session_deps_.net_log = log.bound().net_log();
std::unique_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
@@ -5276,7 +5288,8 @@
request.url = GURL("https://www.example.org/");
// Configure against https proxy server "proxy:70".
- session_deps_.proxy_service = ProxyService::CreateFixed("https://proxy:70");
+ session_deps_.proxy_resolution_service =
+ ProxyResolutionService::CreateFixed("https://proxy:70");
BoundTestNetLog log;
session_deps_.net_log = log.bound().net_log();
std::unique_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
@@ -5362,7 +5375,8 @@
request.url = GURL("https://www.example.org/");
// Configure against https proxy server "proxy:70".
- session_deps_.proxy_service = ProxyService::CreateFixed("https://proxy:70");
+ session_deps_.proxy_resolution_service =
+ ProxyResolutionService::CreateFixed("https://proxy:70");
BoundTestNetLog log;
session_deps_.net_log = log.bound().net_log();
std::unique_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
@@ -5412,7 +5426,8 @@
TEST_F(HttpNetworkTransactionTest,
HttpsProxySpdyConnectHttpsLoadTimingTwoRequestsTwoServers) {
// Configure against https proxy server "proxy:70".
- session_deps_.proxy_service = ProxyService::CreateFixed("https://proxy:70");
+ session_deps_.proxy_resolution_service =
+ ProxyResolutionService::CreateFixed("https://proxy:70");
BoundTestNetLog log;
session_deps_.net_log = log.bound().net_log();
std::unique_ptr<HttpNetworkSession> session(
@@ -5542,7 +5557,8 @@
TEST_F(HttpNetworkTransactionTest,
HttpsProxySpdyConnectHttpsLoadTimingTwoRequestsSameServer) {
// Configure against https proxy server "proxy:70".
- session_deps_.proxy_service = ProxyService::CreateFixed("https://proxy:70");
+ session_deps_.proxy_resolution_service =
+ ProxyResolutionService::CreateFixed("https://proxy:70");
BoundTestNetLog log;
session_deps_.net_log = log.bound().net_log();
std::unique_ptr<HttpNetworkSession> session(
@@ -5663,7 +5679,8 @@
// Proxy to different servers.
TEST_F(HttpNetworkTransactionTest, HttpsProxySpdyLoadTimingTwoHttpRequests) {
// Configure against https proxy server "proxy:70".
- session_deps_.proxy_service = ProxyService::CreateFixed("https://proxy:70");
+ session_deps_.proxy_resolution_service =
+ ProxyResolutionService::CreateFixed("https://proxy:70");
BoundTestNetLog log;
session_deps_.net_log = log.bound().net_log();
std::unique_ptr<HttpNetworkSession> session(
@@ -5765,7 +5782,8 @@
request.load_flags = LOAD_DO_NOT_SEND_AUTH_DATA;
// Configure against https proxy server "myproxy:70".
- session_deps_.proxy_service = ProxyService::CreateFixed("https://myproxy:70");
+ session_deps_.proxy_resolution_service =
+ ProxyResolutionService::CreateFixed("https://myproxy:70");
BoundTestNetLog log;
session_deps_.net_log = log.bound().net_log();
std::unique_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
@@ -5859,7 +5877,8 @@
request.url = GURL("https://www.example.org/");
// Configure against proxy server "myproxy:70".
- session_deps_.proxy_service = ProxyService::CreateFixed("myproxy:70");
+ session_deps_.proxy_resolution_service =
+ ProxyResolutionService::CreateFixed("myproxy:70");
std::unique_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
// Since we have proxy, should try to establish tunnel.
@@ -6073,7 +6092,8 @@
request.url = GURL("http://www.example.org/");
// Configure against proxy server "myproxy:70".
- session_deps_.proxy_service = ProxyService::CreateFixed("myproxy:70");
+ session_deps_.proxy_resolution_service =
+ ProxyResolutionService::CreateFixed("myproxy:70");
std::unique_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
HttpNetworkTransaction trans(DEFAULT_PRIORITY, session.get());
@@ -6787,7 +6807,8 @@
request.url = GURL("https://www.example.org/");
// Configure against proxy server "myproxy:70".
- session_deps_.proxy_service = ProxyService::CreateFixed("myproxy:70");
+ session_deps_.proxy_resolution_service =
+ ProxyResolutionService::CreateFixed("myproxy:70");
std::unique_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
@@ -8282,7 +8303,8 @@
// Test HTTPS connections to a site with a bad certificate, going through a
// proxy
TEST_F(HttpNetworkTransactionTest, HTTPSBadCertificateViaProxy) {
- session_deps_.proxy_service = ProxyService::CreateFixed("myproxy:70");
+ session_deps_.proxy_resolution_service =
+ ProxyResolutionService::CreateFixed("myproxy:70");
HttpRequestInfo request;
request.method = "GET";
@@ -8359,8 +8381,8 @@
// Test HTTPS connections to a site, going through an HTTPS proxy
TEST_F(HttpNetworkTransactionTest, HTTPSViaHttpsProxy) {
- session_deps_.proxy_service =
- ProxyService::CreateFixedFromPacResult("HTTPS proxy:70");
+ session_deps_.proxy_resolution_service =
+ ProxyResolutionService::CreateFixedFromPacResult("HTTPS proxy:70");
TestNetLog net_log;
session_deps_.net_log = &net_log;
@@ -8422,8 +8444,8 @@
// Test an HTTPS Proxy's ability to redirect a CONNECT request
TEST_F(HttpNetworkTransactionTest, RedirectOfHttpsConnectViaHttpsProxy) {
- session_deps_.proxy_service =
- ProxyService::CreateFixedFromPacResult("HTTPS proxy:70");
+ session_deps_.proxy_resolution_service =
+ ProxyResolutionService::CreateFixedFromPacResult("HTTPS proxy:70");
TestNetLog net_log;
session_deps_.net_log = &net_log;
@@ -8496,7 +8518,8 @@
// Test an HTTPS (SPDY) Proxy's ability to redirect a CONNECT request
TEST_F(HttpNetworkTransactionTest, RedirectOfHttpsConnectViaSpdyProxy) {
- session_deps_.proxy_service = ProxyService::CreateFixed("https://proxy:70");
+ session_deps_.proxy_resolution_service =
+ ProxyResolutionService::CreateFixed("https://proxy:70");
HttpRequestInfo request;
request.method = "GET";
@@ -8551,7 +8574,8 @@
// Test that an HTTPS proxy's response to a CONNECT request is filtered.
TEST_F(HttpNetworkTransactionTest, ErrorResponseToHttpsConnectViaHttpsProxy) {
- session_deps_.proxy_service = ProxyService::CreateFixed("https://proxy:70");
+ session_deps_.proxy_resolution_service =
+ ProxyResolutionService::CreateFixed("https://proxy:70");
HttpRequestInfo request;
request.method = "GET";
@@ -8593,7 +8617,8 @@
// Test that a SPDY proxy's response to a CONNECT request is filtered.
TEST_F(HttpNetworkTransactionTest, ErrorResponseToHttpsConnectViaSpdyProxy) {
- session_deps_.proxy_service = ProxyService::CreateFixed("https://proxy:70");
+ session_deps_.proxy_resolution_service =
+ ProxyResolutionService::CreateFixed("https://proxy:70");
HttpRequestInfo request;
request.method = "GET";
@@ -8652,8 +8677,8 @@
request.load_flags = LOAD_DO_NOT_SEND_AUTH_DATA;
// Configure against https proxy server "myproxy:70".
- session_deps_.proxy_service =
- ProxyService::CreateFixedFromPacResult("HTTPS myproxy:70");
+ session_deps_.proxy_resolution_service =
+ ProxyResolutionService::CreateFixedFromPacResult("HTTPS myproxy:70");
BoundTestNetLog log;
session_deps_.net_log = log.bound().net_log();
std::unique_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
@@ -8795,8 +8820,8 @@
push_request.url = GURL("http://www.another-origin.com/foo.dat");
// Configure against https proxy server "myproxy:443".
- session_deps_.proxy_service =
- ProxyService::CreateFixedFromPacResult("HTTPS myproxy:443");
+ session_deps_.proxy_resolution_service =
+ ProxyResolutionService::CreateFixedFromPacResult("HTTPS myproxy:443");
BoundTestNetLog log;
session_deps_.net_log = log.bound().net_log();
@@ -8909,8 +8934,8 @@
request.method = "GET";
request.url = GURL("http://www.example.org/");
- session_deps_.proxy_service =
- ProxyService::CreateFixed("https://myproxy:443");
+ session_deps_.proxy_resolution_service =
+ ProxyResolutionService::CreateFixed("https://myproxy:443");
BoundTestNetLog log;
session_deps_.net_log = log.bound().net_log();
@@ -8991,7 +9016,8 @@
request.url = GURL("http://www.example.org/");
// Configure against https proxy server "myproxy:70".
- session_deps_.proxy_service = ProxyService::CreateFixed("https://myproxy:70");
+ session_deps_.proxy_resolution_service =
+ ProxyResolutionService::CreateFixed("https://myproxy:70");
BoundTestNetLog log;
session_deps_.net_log = log.bound().net_log();
@@ -9067,7 +9093,8 @@
// Test HTTPS connections to a site with a bad certificate, going through an
// HTTPS proxy
TEST_F(HttpNetworkTransactionTest, HTTPSBadCertificateViaHttpsProxy) {
- session_deps_.proxy_service = ProxyService::CreateFixed("https://proxy:70");
+ session_deps_.proxy_resolution_service =
+ ProxyResolutionService::CreateFixed("https://proxy:70");
HttpRequestInfo request;
request.method = "GET";
@@ -9190,7 +9217,8 @@
request.extra_headers.SetHeader(HttpRequestHeaders::kUserAgent,
"Chromium Ultra Awesome X Edition");
- session_deps_.proxy_service = ProxyService::CreateFixed("myproxy:70");
+ session_deps_.proxy_resolution_service =
+ ProxyResolutionService::CreateFixed("myproxy:70");
std::unique_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
HttpNetworkTransaction trans(DEFAULT_PRIORITY, session.get());
@@ -9531,8 +9559,8 @@
request.method = "GET";
request.url = GURL("http://www.example.org/");
- session_deps_.proxy_service =
- ProxyService::CreateFixedFromPacResult("SOCKS myproxy:1080");
+ session_deps_.proxy_resolution_service =
+ ProxyResolutionService::CreateFixedFromPacResult("SOCKS myproxy:1080");
TestNetLog net_log;
session_deps_.net_log = &net_log;
@@ -9589,8 +9617,8 @@
request.method = "GET";
request.url = GURL("https://www.example.org/");
- session_deps_.proxy_service =
- ProxyService::CreateFixedFromPacResult("SOCKS myproxy:1080");
+ session_deps_.proxy_resolution_service =
+ ProxyResolutionService::CreateFixedFromPacResult("SOCKS myproxy:1080");
TestNetLog net_log;
session_deps_.net_log = &net_log;
@@ -9652,8 +9680,8 @@
request.method = "GET";
request.url = GURL("http://www.example.org/");
- session_deps_.proxy_service =
- ProxyService::CreateFixed("socks4://myproxy:1080");
+ session_deps_.proxy_resolution_service =
+ ProxyResolutionService::CreateFixed("socks4://myproxy:1080");
TestNetLog net_log;
session_deps_.net_log = &net_log;
@@ -9709,8 +9737,8 @@
request.method = "GET";
request.url = GURL("http://www.example.org/");
- session_deps_.proxy_service =
- ProxyService::CreateFixedFromPacResult("SOCKS5 myproxy:1080");
+ session_deps_.proxy_resolution_service =
+ ProxyResolutionService::CreateFixedFromPacResult("SOCKS5 myproxy:1080");
TestNetLog net_log;
session_deps_.net_log = &net_log;
@@ -9780,8 +9808,8 @@
request.method = "GET";
request.url = GURL("https://www.example.org/");
- session_deps_.proxy_service =
- ProxyService::CreateFixedFromPacResult("SOCKS5 myproxy:1080");
+ session_deps_.proxy_resolution_service =
+ ProxyResolutionService::CreateFixedFromPacResult("SOCKS5 myproxy:1080");
TestNetLog net_log;
session_deps_.net_log = &net_log;
@@ -9930,8 +9958,8 @@
};
for (size_t i = 0; i < arraysize(tests); ++i) {
- session_deps_.proxy_service =
- ProxyService::CreateFixed(tests[i].proxy_server);
+ session_deps_.proxy_resolution_service =
+ ProxyResolutionService::CreateFixed(tests[i].proxy_server);
std::unique_ptr<HttpNetworkSession> session(
SetupSessionForGroupNameTests(&session_deps_));
@@ -9987,8 +10015,8 @@
};
for (size_t i = 0; i < arraysize(tests); ++i) {
- session_deps_.proxy_service =
- ProxyService::CreateFixed(tests[i].proxy_server);
+ session_deps_.proxy_resolution_service =
+ ProxyResolutionService::CreateFixed(tests[i].proxy_server);
std::unique_ptr<HttpNetworkSession> session(
SetupSessionForGroupNameTests(&session_deps_));
@@ -10055,8 +10083,8 @@
};
for (size_t i = 0; i < arraysize(tests); ++i) {
- session_deps_.proxy_service =
- ProxyService::CreateFixed(tests[i].proxy_server);
+ session_deps_.proxy_resolution_service =
+ ProxyResolutionService::CreateFixed(tests[i].proxy_server);
std::unique_ptr<HttpNetworkSession> session(
SetupSessionForGroupNameTests(&session_deps_));
@@ -10092,8 +10120,8 @@
request.method = "GET";
request.url = GURL("http://www.example.org/");
- session_deps_.proxy_service =
- ProxyService::CreateFixed("myproxy:70;foobar:80");
+ session_deps_.proxy_resolution_service =
+ ProxyResolutionService::CreateFixed("myproxy:70;foobar:80");
// This simulates failure resolving all hostnames; that means we will fail
// connecting to both proxies (myproxy:70 and foobar:80).
@@ -10333,7 +10361,8 @@
// Test HTTPS connections going through a proxy that sends extra data.
TEST_F(HttpNetworkTransactionTest, HTTPSViaProxyWithExtraData) {
- session_deps_.proxy_service = ProxyService::CreateFixed("myproxy:70");
+ session_deps_.proxy_resolution_service =
+ ProxyResolutionService::CreateFixed("myproxy:70");
HttpRequestInfo request;
request.method = "GET";
@@ -11871,7 +11900,7 @@
TestNetLog net_log;
- session_deps_.proxy_service = std::make_unique<ProxyService>(
+ session_deps_.proxy_resolution_service = std::make_unique<ProxyResolutionService>(
std::move(proxy_config_service), std::move(proxy_resolver_factory),
&net_log);
@@ -11947,7 +11976,7 @@
proxy_config.set_pac_url(GURL("http://fooproxyurl"));
CapturingProxyResolver capturing_proxy_resolver;
- session_deps_.proxy_service = std::make_unique<ProxyService>(
+ session_deps_.proxy_resolution_service = std::make_unique<ProxyResolutionService>(
std::make_unique<ProxyConfigServiceFixed>(proxy_config),
std::make_unique<CapturingProxyResolverFactory>(
&capturing_proxy_resolver),
@@ -12986,10 +13015,10 @@
HttpAuth::AUTH_SERVER);
}
if (test_config.proxy_url) {
- session_deps_.proxy_service =
- ProxyService::CreateFixed(test_config.proxy_url);
+ session_deps_.proxy_resolution_service =
+ ProxyResolutionService::CreateFixed(test_config.proxy_url);
} else {
- session_deps_.proxy_service = ProxyService::CreateDirect();
+ session_deps_.proxy_resolution_service = ProxyResolutionService::CreateDirect();
}
HttpRequestInfo request;
@@ -13080,7 +13109,7 @@
HttpAuthHandlerMock::Factory* auth_factory(
new HttpAuthHandlerMock::Factory());
session_deps_.http_auth_handler_factory.reset(auth_factory);
- session_deps_.proxy_service = ProxyService::CreateDirect();
+ session_deps_.proxy_resolution_service = ProxyResolutionService::CreateDirect();
session_deps_.host_resolver->rules()->AddRule("www.example.com", "10.0.0.1");
session_deps_.host_resolver->set_synchronous_mode(true);
@@ -13467,8 +13496,8 @@
// Test a basic GET request through a proxy.
TEST_F(HttpNetworkTransactionTest, ProxyGet) {
- session_deps_.proxy_service =
- ProxyService::CreateFixedFromPacResult("PROXY myproxy:70");
+ session_deps_.proxy_resolution_service =
+ ProxyResolutionService::CreateFixedFromPacResult("PROXY myproxy:70");
BoundTestNetLog log;
session_deps_.net_log = log.bound().net_log();
std::unique_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
@@ -13532,8 +13561,8 @@
// Test a basic HTTPS GET request through a proxy.
TEST_F(HttpNetworkTransactionTest, ProxyTunnelGet) {
- session_deps_.proxy_service =
- ProxyService::CreateFixedFromPacResult("PROXY myproxy:70");
+ session_deps_.proxy_resolution_service =
+ ProxyResolutionService::CreateFixedFromPacResult("PROXY myproxy:70");
BoundTestNetLog log;
session_deps_.net_log = log.bound().net_log();
std::unique_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
@@ -13615,8 +13644,8 @@
// Test a basic HTTPS GET request through a proxy, connecting to an IPv6
// literal host.
TEST_F(HttpNetworkTransactionTest, ProxyTunnelGetIPv6) {
- session_deps_.proxy_service =
- ProxyService::CreateFixedFromPacResult("PROXY myproxy:70");
+ session_deps_.proxy_resolution_service =
+ ProxyResolutionService::CreateFixedFromPacResult("PROXY myproxy:70");
BoundTestNetLog log;
session_deps_.net_log = log.bound().net_log();
std::unique_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
@@ -13691,7 +13720,8 @@
// Test a basic HTTPS GET request through a proxy, but the server hangs up
// while establishing the tunnel.
TEST_F(HttpNetworkTransactionTest, ProxyTunnelGetHangup) {
- session_deps_.proxy_service = ProxyService::CreateFixed("myproxy:70");
+ session_deps_.proxy_resolution_service =
+ ProxyResolutionService::CreateFixed("myproxy:70");
BoundTestNetLog log;
session_deps_.net_log = log.bound().net_log();
std::unique_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
@@ -14053,7 +14083,8 @@
// The test is repeated twice, first for connecting to an HTTPS endpoint,
// then for connecting to an HTTP endpoint.
TEST_F(HttpNetworkTransactionTest, ClientAuthCertCache_Proxy_Fail) {
- session_deps_.proxy_service = ProxyService::CreateFixed("https://proxy:70");
+ session_deps_.proxy_resolution_service =
+ ProxyResolutionService::CreateFixed("https://proxy:70");
BoundTestNetLog log;
session_deps_.net_log = log.bound().net_log();
@@ -15060,8 +15091,8 @@
MockConnect connect_data1(ASYNC, OK);
data1.set_connect_data(connect_data1);
- session_deps_.proxy_service =
- ProxyService::CreateFixedFromPacResult("HTTPS proxy:70");
+ session_deps_.proxy_resolution_service =
+ ProxyResolutionService::CreateFixedFromPacResult("HTTPS proxy:70");
TestNetLog log;
session_deps_.net_log = &log;
SSLSocketDataProvider ssl1(ASYNC, OK); // to the proxy
@@ -15180,7 +15211,7 @@
// all others direct.
ProxyConfig proxy_config;
proxy_config.proxy_rules().ParseFromString("http=https://proxy:443");
- session_deps_.proxy_service = std::make_unique<ProxyService>(
+ session_deps_.proxy_resolution_service = std::make_unique<ProxyResolutionService>(
std::make_unique<ProxyConfigServiceFixed>(proxy_config), nullptr,
nullptr);
@@ -16849,8 +16880,8 @@
AddWebSocketHeaders(&request.extra_headers);
// Configure against proxy server "myproxy:70".
- session_deps_.proxy_service =
- ProxyService::CreateFixedFromPacResult("PROXY myproxy:70");
+ session_deps_.proxy_resolution_service =
+ ProxyResolutionService::CreateFixedFromPacResult("PROXY myproxy:70");
std::unique_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
@@ -16953,8 +16984,8 @@
AddWebSocketHeaders(&request.extra_headers);
// Configure against proxy server "myproxy:70".
- session_deps_.proxy_service =
- ProxyService::CreateFixedFromPacResult("PROXY myproxy:70");
+ session_deps_.proxy_resolution_service =
+ ProxyResolutionService::CreateFixedFromPacResult("PROXY myproxy:70");
std::unique_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
@@ -17563,7 +17594,7 @@
proxy_config.set_pac_url(GURL("http://fooproxyurl"));
proxy_config.set_pac_mandatory(true);
MockAsyncProxyResolver resolver;
- session_deps_.proxy_service.reset(new ProxyService(
+ session_deps_.proxy_resolution_service.reset(new ProxyResolutionService(
std::make_unique<ProxyConfigServiceFixed>(proxy_config),
std::make_unique<FailingProxyResolverFactory>(), nullptr));
@@ -17589,9 +17620,9 @@
MockAsyncProxyResolverFactory* proxy_resolver_factory =
new MockAsyncProxyResolverFactory(false);
MockAsyncProxyResolver resolver;
- session_deps_.proxy_service.reset(
- new ProxyService(std::make_unique<ProxyConfigServiceFixed>(proxy_config),
- base::WrapUnique(proxy_resolver_factory), nullptr));
+ session_deps_.proxy_resolution_service.reset(new ProxyResolutionService(
+ std::make_unique<ProxyConfigServiceFixed>(proxy_config),
+ base::WrapUnique(proxy_resolver_factory), nullptr));
HttpRequestInfo request;
request.method = "GET";
request.url = GURL("http://www.example.org/");
@@ -17610,8 +17641,8 @@
}
TEST_F(HttpNetworkTransactionTest, NoSupportedProxies) {
- session_deps_.proxy_service =
- ProxyService::CreateFixedFromPacResult("QUIC myproxy.org:443");
+ session_deps_.proxy_resolution_service =
+ ProxyResolutionService::CreateFixedFromPacResult("QUIC myproxy.org:443");
session_deps_.enable_quic = false;
std::unique_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
