Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(325)

Unified Diff: net/http/http_auth_handler_negotiate.cc

Issue 2214693002: First step to remove SingleRequestHostResolver. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: single Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/http/http_auth_handler_negotiate.h ('k') | net/proxy/proxy_script_decider.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_auth_handler_negotiate.cc
diff --git a/net/http/http_auth_handler_negotiate.cc b/net/http/http_auth_handler_negotiate.cc
index ca1cddce9f80f9fa6a0b4cf77a8b80bdc44adf70..c9f35124e57f0ae0b01497d7724cf3568f187021 100644
--- a/net/http/http_auth_handler_negotiate.cc
+++ b/net/http/http_auth_handler_negotiate.cc
@@ -15,7 +15,6 @@
#include "net/base/net_errors.h"
#include "net/cert/x509_util.h"
#include "net/dns/host_resolver.h"
-#include "net/dns/single_request_host_resolver.h"
#include "net/http/http_auth_filter.h"
#include "net/http/http_auth_preferences.h"
#include "net/log/net_log.h"
@@ -41,7 +40,7 @@ std::unique_ptr<base::Value> NetLogParameterChannelBindings(
} // namespace
HttpAuthHandlerNegotiate::Factory::Factory()
- : resolver_(NULL),
+ : resolver_(nullptr),
#if defined(OS_WIN)
max_token_length_(0),
#endif
@@ -324,17 +323,12 @@ int HttpAuthHandlerNegotiate::DoResolveCanonicalName() {
return OK;
// TODO(cbentzel): Add reverse DNS lookup for numeric addresses.
- DCHECK(!single_resolve_.get());
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,
- DEFAULT_PRIORITY,
- &address_list_,
- base::Bind(&HttpAuthHandlerNegotiate::OnIOComplete,
- base::Unretained(this)),
- net_log_);
+ return resolver_->Resolve(info, DEFAULT_PRIORITY, &address_list_,
+ base::Bind(&HttpAuthHandlerNegotiate::OnIOComplete,
+ base::Unretained(this)),
+ &request_, net_log_);
}
int HttpAuthHandlerNegotiate::DoResolveCanonicalNameComplete(int rv) {
« no previous file with comments | « net/http/http_auth_handler_negotiate.h ('k') | net/proxy/proxy_script_decider.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698