diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-22 22:20:35 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-22 22:20:35 +0000 |
| commit | 2fbaecf27edd63f4f760581b798a99dcdf78a5eb (patch) | |
| tree | a974662967015c83e63ccd7944aac2d2dc784b8f /net/socket_stream | |
| parent | a063c102fd36f61f4a0a01447f4b01ace4ffccdf (diff) | |
| download | chromium_src-2fbaecf27edd63f4f760581b798a99dcdf78a5eb.zip chromium_src-2fbaecf27edd63f4f760581b798a99dcdf78a5eb.tar.gz chromium_src-2fbaecf27edd63f4f760581b798a99dcdf78a5eb.tar.bz2 | |
Net: Get rid of ProxyServer::host_and_port() and friends.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/3032017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53403 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket_stream')
| -rw-r--r-- | net/socket_stream/socket_stream.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/net/socket_stream/socket_stream.cc b/net/socket_stream/socket_stream.cc index d1ead09..c1216d7 100644 --- a/net/socket_stream/socket_stream.cc +++ b/net/socket_stream/socket_stream.cc @@ -7,6 +7,7 @@ #include "net/socket_stream/socket_stream.h" +#include <set> #include <string> #include "base/compiler_specific.h" @@ -487,9 +488,9 @@ int SocketStream::DoResolveHost() { std::string host; int port; if (proxy_mode_ != kDirectConnection) { - ProxyServer proxy_server = proxy_info_.proxy_server(); - host = proxy_server.HostNoBrackets(); - port = proxy_server.port(); + HostPortPair host_port_pair = proxy_info_.proxy_server().host_port_pair(); + host = host_port_pair.host(); + port = host_port_pair.port(); } else { host = url_.HostNoBrackets(); port = url_.EffectiveIntPort(); @@ -715,7 +716,7 @@ int SocketStream::DoReadTunnelHeadersComplete(int result) { auth_info_ = new AuthChallengeInfo; auth_info_->is_proxy = true; auth_info_->host_and_port = - ASCIIToWide(proxy_info_.proxy_server().host_and_port()); + ASCIIToWide(proxy_info_.proxy_server().host_port_pair().ToString()); auth_info_->scheme = ASCIIToWide(auth_handler_->scheme()); auth_info_->realm = ASCIIToWide(auth_handler_->realm()); // Wait until RestartWithAuth or Close is called. @@ -885,7 +886,8 @@ int SocketStream::DoReadWrite(int result) { GURL SocketStream::ProxyAuthOrigin() const { DCHECK(!proxy_info_.is_empty()); - return GURL("http://" + proxy_info_.proxy_server().host_and_port()); + return GURL("http://" + + proxy_info_.proxy_server().host_port_pair().ToString()); } int SocketStream::HandleAuthChallenge(const HttpResponseHeaders* headers) { @@ -990,4 +992,3 @@ ProxyService* SocketStream::proxy_service() const { } } // namespace net - |