diff options
author | cbentzel@chromium.org <cbentzel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-28 16:22:01 +0000 |
---|---|---|
committer | cbentzel@chromium.org <cbentzel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-28 16:22:01 +0000 |
commit | 4d6a6d9441faebcb32e47a7e834b265d11227397 (patch) | |
tree | b2e3099b325e6eea30bab129d2b23dfc2dc6cefd /net/http/http_auth_unittest.cc | |
parent | fd7d031f16191a9c6d626a76dd704baf92df9a7a (diff) | |
download | chromium_src-4d6a6d9441faebcb32e47a7e834b265d11227397.zip chromium_src-4d6a6d9441faebcb32e47a7e834b265d11227397.tar.gz chromium_src-4d6a6d9441faebcb32e47a7e834b265d11227397.tar.bz2 |
Revert 60791 - HttpAuthHandlerFactory::CreateDefault requires a HostResolver argument.
Previously the default registry factory would crash if it saw a Negotiate header when trying to do a CNAME lookup because of a NULL resolver. Since then I've changed HttpAuthHandlerNegotiate to skip the CNAME lookup step when the resolver_ is NULL.
So, one option is to make CreateDefault accept an optional HostResolver argument. My concern is that since passing in NULL is the easier choice, people will do it and encounter user problems when going through a Negotiate proxy. Hence, I force the correct behavior.
BUG=56819
TEST=net_unittests, try fetch client through a Negotiate authenticating proxy.
Review URL: http://codereview.chromium.org/3447027
TBR=cbentzel@chromium.org
Review URL: http://codereview.chromium.org/3413039
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60795 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http/http_auth_unittest.cc')
-rw-r--r-- | net/http/http_auth_unittest.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/http/http_auth_unittest.cc b/net/http/http_auth_unittest.cc index cc62214..a3f2b28 100644 --- a/net/http/http_auth_unittest.cc +++ b/net/http/http_auth_unittest.cc @@ -8,7 +8,6 @@ #include "base/ref_counted.h" #include "base/scoped_ptr.h" #include "base/string_util.h" -#include "net/base/mock_host_resolver.h" #include "net/base/net_errors.h" #include "net/http/http_auth.h" #include "net/http/http_auth_filter.h" @@ -98,9 +97,8 @@ TEST(HttpAuthTest, ChooseBestChallenge) { GURL origin("http://www.example.com"); std::set<std::string> disabled_schemes; URLSecurityManagerAllow url_security_manager; - scoped_refptr<HostResolver> host_resolver(new MockHostResolver()); scoped_ptr<HttpAuthHandlerRegistryFactory> http_auth_handler_factory( - HttpAuthHandlerFactory::CreateDefault(host_resolver)); + HttpAuthHandlerFactory::CreateDefault()); http_auth_handler_factory->SetURLSecurityManager( "negotiate", &url_security_manager); |