Rename ConfiguredProxyResolutionService test-only functions.
This CL renames CreateFixedFromPacResult to
CreateFixedFromPacResultForTest and
CreateFixedFromAutoDetectedPacResult as well for readability.
Bug: 1320187
Change-Id: Id38310339fcd10ffdeef51e18e65501a7a89f2cd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3774958
Reviewed-by: Yutaka Hirano <[email protected]>
Commit-Queue: Yoichi Osato <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1026153}
diff --git a/net/quic/quic_network_transaction_unittest.cc b/net/quic/quic_network_transaction_unittest.cc
index 70bf596..2be5e32 100644
--- a/net/quic/quic_network_transaction_unittest.cc
+++ b/net/quic/quic_network_transaction_unittest.cc
@@ -1668,7 +1668,7 @@
TEST_P(QuicNetworkTransactionTest, QuicProxy) {
session_params_.enable_quic = true;
proxy_resolution_service_ =
- ConfiguredProxyResolutionService::CreateFixedFromPacResult(
+ ConfiguredProxyResolutionService::CreateFixedFromPacResultForTest(
"QUIC mail.example.org:70", TRAFFIC_ANNOTATION_FOR_TESTS);
MockQuicData mock_quic_data(version_);
@@ -1719,7 +1719,7 @@
session_params_.enable_quic = true;
proxy_resolution_service_ =
- ConfiguredProxyResolutionService::CreateFixedFromPacResult(
+ ConfiguredProxyResolutionService::CreateFixedFromPacResultForTest(
"QUIC " + proxy_host + ":70", TRAFFIC_ANNOTATION_FOR_TESTS);
client_maker_->set_hostname(origin_host);
@@ -5054,7 +5054,7 @@
return;
}
proxy_resolution_service_ =
- ConfiguredProxyResolutionService::CreateFixedFromPacResult(
+ ConfiguredProxyResolutionService::CreateFixedFromPacResultForTest(
"PROXY myproxy:70", TRAFFIC_ANNOTATION_FOR_TESTS);
// Since we are using a proxy, the QUIC job will not succeed.
@@ -6123,7 +6123,7 @@
const HostPortPair host_port_pair("myproxy.org", 443);
proxy_resolution_service_ =
- ConfiguredProxyResolutionService::CreateFixedFromPacResult(
+ ConfiguredProxyResolutionService::CreateFixedFromPacResultForTest(
"QUIC myproxy.org:443; HTTPS myproxy.org:443",
TRAFFIC_ANNOTATION_FOR_TESTS);
proxy_resolution_service_->SetProxyDelegate(&test_proxy_delegate);
@@ -7705,7 +7705,7 @@
session_params_.enable_quic = true;
session_params_.enable_quic_proxies_for_https_urls = true;
proxy_resolution_service_ =
- ConfiguredProxyResolutionService::CreateFixedFromPacResult(
+ ConfiguredProxyResolutionService::CreateFixedFromPacResultForTest(
"QUIC proxy.example.org:70", TRAFFIC_ANNOTATION_FOR_TESTS);
MockQuicData mock_quic_data(version_);
@@ -7798,7 +7798,7 @@
session_params_.enable_quic = true;
session_params_.enable_quic_proxies_for_https_urls = true;
proxy_resolution_service_ =
- ConfiguredProxyResolutionService::CreateFixedFromPacResult(
+ ConfiguredProxyResolutionService::CreateFixedFromPacResultForTest(
"QUIC proxy.example.org:70", TRAFFIC_ANNOTATION_FOR_TESTS);
MockQuicData mock_quic_data(version_);
@@ -7892,7 +7892,7 @@
session_params_.enable_quic = true;
session_params_.enable_quic_proxies_for_https_urls = true;
proxy_resolution_service_ =
- ConfiguredProxyResolutionService::CreateFixedFromPacResult(
+ ConfiguredProxyResolutionService::CreateFixedFromPacResultForTest(
"QUIC proxy.example.org:70", TRAFFIC_ANNOTATION_FOR_TESTS);
MockQuicData mock_quic_data(version_);
@@ -8019,7 +8019,7 @@
session_params_.enable_quic = true;
session_params_.enable_quic_proxies_for_https_urls = true;
proxy_resolution_service_ =
- ConfiguredProxyResolutionService::CreateFixedFromPacResult(
+ ConfiguredProxyResolutionService::CreateFixedFromPacResultForTest(
"QUIC proxy.example.org:70", TRAFFIC_ANNOTATION_FOR_TESTS);
MockQuicData mock_quic_data(version_);
@@ -8179,7 +8179,7 @@
session_params_.enable_quic = true;
session_params_.enable_quic_proxies_for_https_urls = true;
proxy_resolution_service_ =
- ConfiguredProxyResolutionService::CreateFixedFromPacResult(
+ ConfiguredProxyResolutionService::CreateFixedFromPacResultForTest(
"QUIC proxy.example.org:70", TRAFFIC_ANNOTATION_FOR_TESTS);
MockQuicData mock_quic_data(version_);
@@ -8230,7 +8230,7 @@
session_params_.enable_quic = true;
session_params_.enable_quic_proxies_for_https_urls = true;
proxy_resolution_service_ =
- ConfiguredProxyResolutionService::CreateFixedFromPacResult(
+ ConfiguredProxyResolutionService::CreateFixedFromPacResultForTest(
"QUIC proxy.example.org:70", TRAFFIC_ANNOTATION_FOR_TESTS);
MockQuicData mock_quic_data(version_);
@@ -8271,7 +8271,7 @@
session_params_.enable_quic = true;
session_params_.enable_quic_proxies_for_https_urls = true;
proxy_resolution_service_ =
- ConfiguredProxyResolutionService::CreateFixedFromPacResult(
+ ConfiguredProxyResolutionService::CreateFixedFromPacResultForTest(
"QUIC proxy.example.org:70", TRAFFIC_ANNOTATION_FOR_TESTS);
MockQuicData mock_quic_data(version_);
@@ -8406,7 +8406,7 @@
session_params_.enable_quic = true;
session_params_.enable_quic_proxies_for_https_urls = true;
proxy_resolution_service_ =
- ConfiguredProxyResolutionService::CreateFixedFromPacResult(
+ ConfiguredProxyResolutionService::CreateFixedFromPacResultForTest(
"QUIC proxy.example.org:70", TRAFFIC_ANNOTATION_FOR_TESTS);
MockQuicData mock_quic_data(version_);
@@ -8458,7 +8458,7 @@
session_params_.enable_quic = true;
session_params_.enable_quic_proxies_for_https_urls = true;
proxy_resolution_service_ =
- ConfiguredProxyResolutionService::CreateFixedFromPacResult(
+ ConfiguredProxyResolutionService::CreateFixedFromPacResultForTest(
"QUIC proxy.example.org:70", TRAFFIC_ANNOTATION_FOR_TESTS);
const RequestPriority request_priority = MEDIUM;
@@ -8503,7 +8503,7 @@
session_params_.enable_quic = true;
session_params_.enable_quic_proxies_for_https_urls = true;
proxy_resolution_service_ =
- ConfiguredProxyResolutionService::CreateFixedFromPacResult(
+ ConfiguredProxyResolutionService::CreateFixedFromPacResultForTest(
"QUIC proxy.example.org:70", TRAFFIC_ANNOTATION_FOR_TESTS);
const RequestPriority kRequestPriority = MEDIUM;
@@ -8594,7 +8594,7 @@
session_params_.enable_quic = true;
session_params_.enable_quic_proxies_for_https_urls = true;
proxy_resolution_service_ =
- ConfiguredProxyResolutionService::CreateFixedFromPacResult(
+ ConfiguredProxyResolutionService::CreateFixedFromPacResultForTest(
"QUIC proxy.example.org:70", TRAFFIC_ANNOTATION_FOR_TESTS);
MockQuicData mock_quic_data(version_);
@@ -8965,7 +8965,7 @@
if (use_proxy) {
proxy_resolution_service_ =
- ConfiguredProxyResolutionService::CreateFixedFromPacResult(
+ ConfiguredProxyResolutionService::CreateFixedFromPacResultForTest(
"QUIC mail.example.org:443", TRAFFIC_ANNOTATION_FOR_TESTS);
} else {
proxy_resolution_service_ =
@@ -9256,7 +9256,7 @@
session_params_.enable_quic = true;
session_params_.enable_quic_proxies_for_https_urls = true;
proxy_resolution_service_ =
- ConfiguredProxyResolutionService::CreateFixedFromPacResult(
+ ConfiguredProxyResolutionService::CreateFixedFromPacResultForTest(
"QUIC proxy.example.org:70", TRAFFIC_ANNOTATION_FOR_TESTS);
const char kGetRequest[] =
