Split ProxyServer PAC/URI conversion to a separate file
No functional change.
Helps simplify the ProxyServer class around its core purpose of
representing proxy servers for net stack connections, which will
make it easier to make upcoming refactors to both that and the
separated-off conversion functionality.
Bug: 1243398
Change-Id: I476656b709a3ed9d188244e36f8db8eb40755414
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3138601
Reviewed-by: Kyle Horimoto <[email protected]>
Reviewed-by: Pavol Marko <[email protected]>
Reviewed-by: Dominic Battré <[email protected]>
Reviewed-by: Andreea-Elena Costinas <[email protected]>
Reviewed-by: Robert Ogden <[email protected]>
Reviewed-by: Tom Sepez <[email protected]>
Reviewed-by: Matt Menke <[email protected]>
Commit-Queue: Eric Orth <[email protected]>
Cr-Commit-Position: refs/heads/main@{#924111}
diff --git a/net/proxy_resolution/proxy_config_unittest.cc b/net/proxy_resolution/proxy_config_unittest.cc
index ff1a7d7..a19b17b 100644
--- a/net/proxy_resolution/proxy_config_unittest.cc
+++ b/net/proxy_resolution/proxy_config_unittest.cc
@@ -6,6 +6,7 @@
#include "base/cxx17_backports.h"
#include "base/json/json_writer.h"
#include "base/values.h"
+#include "net/base/proxy_string_util.h"
#include "net/proxy_resolution/proxy_config_service_common_unittest.h"
#include "net/proxy_resolution/proxy_info.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -55,20 +56,20 @@
config2.proxy_rules().type = ProxyConfig::ProxyRules::Type::PROXY_LIST;
config2.proxy_rules().single_proxies.SetSingleProxyServer(
- ProxyServer::FromURI("myproxy:80", ProxyServer::SCHEME_HTTP));
+ ProxyUriToProxyServer("myproxy:80", ProxyServer::SCHEME_HTTP));
EXPECT_FALSE(config1.Equals(config2));
EXPECT_FALSE(config2.Equals(config1));
config1.proxy_rules().type = ProxyConfig::ProxyRules::Type::PROXY_LIST;
config1.proxy_rules().single_proxies.SetSingleProxyServer(
- ProxyServer::FromURI("myproxy:100", ProxyServer::SCHEME_HTTP));
+ ProxyUriToProxyServer("myproxy:100", ProxyServer::SCHEME_HTTP));
EXPECT_FALSE(config1.Equals(config2));
EXPECT_FALSE(config2.Equals(config1));
config1.proxy_rules().single_proxies.SetSingleProxyServer(
- ProxyServer::FromURI("myproxy", ProxyServer::SCHEME_HTTP));
+ ProxyUriToProxyServer("myproxy", ProxyServer::SCHEME_HTTP));
EXPECT_TRUE(config1.Equals(config2));
EXPECT_TRUE(config2.Equals(config1));
