summaryrefslogtreecommitdiffstats
path: root/net/proxy/proxy_server.h
diff options
context:
space:
mode:
Diffstat (limited to 'net/proxy/proxy_server.h')
-rw-r--r--net/proxy/proxy_server.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/net/proxy/proxy_server.h b/net/proxy/proxy_server.h
index 18124fc..689fd6b 100644
--- a/net/proxy/proxy_server.h
+++ b/net/proxy/proxy_server.h
@@ -38,10 +38,7 @@ class ProxyServer {
// Constructs an invalid ProxyServer.
ProxyServer() : scheme_(SCHEME_INVALID) {}
- // TODO(thestig) Replace |host| and |port| with HostPortPair.
- // If |host| is an IPv6 literal address, it must include the square
- // brackets.
- ProxyServer(Scheme scheme, const std::string& host, int port);
+ ProxyServer(Scheme scheme, const HostPortPair& host_port_pair);
bool is_valid() const { return scheme_ != SCHEME_INVALID; }
@@ -108,7 +105,7 @@ class ProxyServer {
// Returns a ProxyServer representing DIRECT connections.
static ProxyServer Direct() {
- return ProxyServer(SCHEME_DIRECT, std::string(), -1);
+ return ProxyServer(SCHEME_DIRECT, HostPortPair());
}
#if defined(OS_MACOSX)