[net/http auth] Split HttpAuthHandler creation from initialization.

net/http/http_auth_handler_ntlm_win.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // See "SSPI Sample Application" at
 // http://msdn.microsoft.com/en-us/library/aa918273.aspx
 // and "NTLM Security Support Provider" at
 // http://msdn.microsoft.com/en-us/library/aa923611.aspx.
 
 #include "net/http/http_auth_handler_ntlm.h"
 
 #include "base/strings/string_util.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
 #include "net/http/http_auth_sspi_win.h"
 #include "net/http/url_security_manager.h"
 
 #pragma comment(lib, "secur32.lib")
 
 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) {
-}
+    : HttpAuthHandler("ntlm"),
+      auth_sspi_(sspi_library, "NTLM", NTLMSP_NAME, max_token_length),
+      url_security_manager_(url_security_manager) {}
 
-HttpAuthHandlerNTLM::~HttpAuthHandlerNTLM() {
-}
+HttpAuthHandlerNTLM::~HttpAuthHandlerNTLM() {}
 
 // Require identity on first pass instead of second.
 bool HttpAuthHandlerNTLM::NeedsIdentity() {
   return auth_sspi_.NeedsIdentity();
 }
 
 bool HttpAuthHandlerNTLM::AllowsDefaultCredentials() {
   if (target_ == HttpAuth::AUTH_PROXY)
     return true;
   if (!url_security_manager_)
     return false;
   return url_security_manager_->CanUseDefaultCredentials(origin_);
 }
 
 HttpAuthHandlerNTLM::Factory::Factory()
     : max_token_length_(0),
       is_unsupported_(false) {
 }
 
 HttpAuthHandlerNTLM::Factory::~Factory() {
 }
 
-int HttpAuthHandlerNTLM::Factory::CreateAuthHandler(
-    const HttpAuthChallengeTokenizer& challenge,
-    HttpAuth::Target target,
-    const GURL& origin,
-    CreateReason reason,
-    int digest_nonce_count,
-    const BoundNetLog& net_log,
-    scoped_ptr<HttpAuthHandler>* handler) {
-  if (is_unsupported_ || reason == CREATE_PREEMPTIVE)
-    return ERR_UNSUPPORTED_AUTH_SCHEME;
+scoped_ptr<HttpAuthHandler>
+HttpAuthHandlerNTLM::Factory::CreateAuthHandlerForScheme(
+    const std::string& scheme) {
+  DCHECK(HttpAuth::IsValidNormalizedScheme(scheme));
+  if (scheme != "ntlm" || is_unsupported_)
+    return scoped_ptr<HttpAuthHandler>();
   if (max_token_length_ == 0) {
     int rv = DetermineMaxTokenLength(sspi_library_.get(), NTLMSP_NAME,
                                      &max_token_length_);
     if (rv == ERR_UNSUPPORTED_AUTH_SCHEME)
       is_unsupported_ = true;
     if (rv != OK)
-      return rv;
+      return scoped_ptr<HttpAuthHandler>();
   }
   // 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()));
-  int result =
-      tmp_handler->HandleInitialChallenge(challenge, target, origin, net_log);
-  if (result == OK)
-    handler->swap(tmp_handler);
-  return result;
+  return make_scoped_ptr(new HttpAuthHandlerNTLM(
+      sspi_library_.get(), max_token_length_, url_security_manager()));
 }
 
 }  // namespace net