| Index: net/http/http_auth_handler_ntlm_win.cc
|
| diff --git a/net/http/http_auth_handler_ntlm_win.cc b/net/http/http_auth_handler_ntlm_win.cc
|
| index acc6fc15e2ea62b54549e088918dcb6475182296..170d4679a1a59ebab8b701647d8e940670c72601 100644
|
| --- a/net/http/http_auth_handler_ntlm_win.cc
|
| +++ b/net/http/http_auth_handler_ntlm_win.cc
|
| @@ -20,7 +20,8 @@
|
| namespace net {
|
|
|
| HttpAuthHandlerNTLM::HttpAuthHandlerNTLM(
|
| - SSPILibrary* sspi_library, ULONG max_token_length,
|
| + SSPILibrary* sspi_library,
|
| + ULONG max_token_length,
|
| URLSecurityManager* url_security_manager)
|
| : auth_sspi_(sspi_library, "NTLM", NTLMSP_NAME, max_token_length),
|
| url_security_manager_(url_security_manager) {
|
| @@ -43,9 +44,7 @@ bool HttpAuthHandlerNTLM::AllowsDefaultCredentials() {
|
| }
|
|
|
| HttpAuthHandlerNTLM::Factory::Factory()
|
| - : max_token_length_(0),
|
| - first_creation_(true),
|
| - is_unsupported_(false) {
|
| + : max_token_length_(0), first_creation_(true), is_unsupported_(false) {
|
| }
|
|
|
| HttpAuthHandlerNTLM::Factory::~Factory() {
|
| @@ -62,8 +61,8 @@ int HttpAuthHandlerNTLM::Factory::CreateAuthHandler(
|
| if (is_unsupported_ || reason == CREATE_PREEMPTIVE)
|
| return ERR_UNSUPPORTED_AUTH_SCHEME;
|
| if (max_token_length_ == 0) {
|
| - int rv = DetermineMaxTokenLength(sspi_library_.get(), NTLMSP_NAME,
|
| - &max_token_length_);
|
| + int rv = DetermineMaxTokenLength(
|
| + sspi_library_.get(), NTLMSP_NAME, &max_token_length_);
|
| if (rv == ERR_UNSUPPORTED_AUTH_SCHEME)
|
| is_unsupported_ = true;
|
| if (rv != OK)
|
| @@ -71,9 +70,8 @@ int HttpAuthHandlerNTLM::Factory::CreateAuthHandler(
|
| }
|
| // TODO(cbentzel): Move towards model of parsing in the factory
|
| // method and only constructing when valid.
|
| - scoped_ptr<HttpAuthHandler> tmp_handler(
|
| - new HttpAuthHandlerNTLM(sspi_library_.get(), max_token_length_,
|
| - url_security_manager()));
|
| + scoped_ptr<HttpAuthHandler> tmp_handler(new HttpAuthHandlerNTLM(
|
| + sspi_library_.get(), max_token_length_, url_security_manager()));
|
| if (!tmp_handler->InitFromChallenge(challenge, target, origin, net_log))
|
| return ERR_INVALID_RESPONSE;
|
| handler->swap(tmp_handler);
|
|
|