diff options
| author | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-15 22:54:10 +0000 |
|---|---|---|
| committer | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-15 22:54:10 +0000 |
| commit | 930cc74958f742ff83f80d0c1798bfdbeb490daa (patch) | |
| tree | bf8e3f78cb60e2f060489c8bce63ac952d0d5418 /net/http | |
| parent | 5dabe432f517d15c2a478a568f12b3d6f1068eab (diff) | |
| download | chromium_src-930cc74958f742ff83f80d0c1798bfdbeb490daa.zip chromium_src-930cc74958f742ff83f80d0c1798bfdbeb490daa.tar.gz chromium_src-930cc74958f742ff83f80d0c1798bfdbeb490daa.tar.bz2 | |
Change HostResolver::RequestInfo to take a HostPortPair rather than naked host string + port.
Review URL: http://codereview.chromium.org/3420001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59577 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http')
| -rw-r--r-- | net/http/http_auth_handler_negotiate.cc | 2 | ||||
| -rw-r--r-- | net/http/http_network_transaction_unittest.cc | 4 | ||||
| -rw-r--r-- | net/http/http_proxy_client_socket_pool.cc | 3 |
3 files changed, 4 insertions, 5 deletions
diff --git a/net/http/http_auth_handler_negotiate.cc b/net/http/http_auth_handler_negotiate.cc index c66ea45..e6e226d 100644 --- a/net/http/http_auth_handler_negotiate.cc +++ b/net/http/http_auth_handler_negotiate.cc @@ -214,7 +214,7 @@ int HttpAuthHandlerNegotiate::DoResolveCanonicalName() { // TODO(cbentzel): Add reverse DNS lookup for numeric addresses. DCHECK(!single_resolve_.get()); - HostResolver::RequestInfo info(origin_.host(), 0); + HostResolver::RequestInfo info(HostPortPair(origin_.host(), 0)); info.set_host_resolver_flags(HOST_RESOLVER_CANONNAME); single_resolve_.reset(new SingleRequestHostResolver(resolver_)); return single_resolve_->Resolve(info, &address_list_, &io_callback_, diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc index c483000..47d4842 100644 --- a/net/http/http_network_transaction_unittest.cc +++ b/net/http/http_network_transaction_unittest.cc @@ -5006,7 +5006,7 @@ void BypassHostCacheOnRefreshHelper(int load_flags) { // a synchronous lookup.) AddressList addrlist; int rv = session_deps.host_resolver->Resolve( - HostResolver::RequestInfo("www.google.com", 80), &addrlist, + HostResolver::RequestInfo(HostPortPair("www.google.com", 80)), &addrlist, NULL, NULL, BoundNetLog()); EXPECT_EQ(OK, rv); @@ -5014,7 +5014,7 @@ void BypassHostCacheOnRefreshHelper(int load_flags) { // and confirming it completes synchronously. TestCompletionCallback resolve_callback; rv = session_deps.host_resolver->Resolve( - HostResolver::RequestInfo("www.google.com", 80), &addrlist, + HostResolver::RequestInfo(HostPortPair("www.google.com", 80)), &addrlist, &resolve_callback, NULL, BoundNetLog()); ASSERT_EQ(OK, rv); diff --git a/net/http/http_proxy_client_socket_pool.cc b/net/http/http_proxy_client_socket_pool.cc index b89e102..42722d2 100644 --- a/net/http/http_proxy_client_socket_pool.cc +++ b/net/http/http_proxy_client_socket_pool.cc @@ -201,8 +201,7 @@ int HttpProxyConnectJob::DoSSLConnectComplete(int result) { int HttpProxyConnectJob::DoHttpProxyConnect() { next_state_ = kStateHttpProxyConnectComplete; const HostResolver::RequestInfo& tcp_destination = params_->destination(); - HostPortPair proxy_server(tcp_destination.hostname(), - tcp_destination.port()); + const HostPortPair& proxy_server = tcp_destination.host_port_pair(); // Add a HttpProxy connection on top of the tcp socket. transport_socket_.reset( |