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

net/http/http_auth_handler_ntlm.h

 // 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.
 
 #ifndef NET_HTTP_HTTP_AUTH_HANDLER_NTLM_H_
 #define NET_HTTP_HTTP_AUTH_HANDLER_NTLM_H_
 
 #include "build/build_config.h"
 
 // This contains the portable and the SSPI implementations for NTLM.
@@ skipping 23 matching lines @@
 class URLSecurityManager;
 
 // Code for handling HTTP NTLM authentication.
 class NET_EXPORT_PRIVATE HttpAuthHandlerNTLM : public HttpAuthHandler {
  public:
   class Factory : public HttpAuthHandlerFactory {
    public:
     Factory();
     ~Factory() override;
 
-    int CreateAuthHandler(const HttpAuthChallengeTokenizer& challenge,
-                          HttpAuth::Target target,
-                          const GURL& origin,
-                          CreateReason reason,
-                          int digest_nonce_count,
-                          const BoundNetLog& net_log,
-                          scoped_ptr<HttpAuthHandler>* handler) override;
+    // HttpAuthHandlerFactory
+    scoped_ptr<HttpAuthHandler> CreateAuthHandlerForScheme(
+        const std::string& scheme) override;
+    scoped_ptr<HttpAuthHandler> CreateAndInitPreemptiveAuthHandler(
+        HttpAuthCache::Entry* cache_entry,
+        const HttpAuthChallengeTokenizer& tokenizer,
+        HttpAuth::Target target,
+        const BoundNetLog& net_log) override;
 #if defined(NTLM_SSPI)
     // Set the SSPILibrary to use. Typically the only callers which need to use
     // this are unit tests which pass in a mocked-out version of the SSPI
     // library.  After the call |sspi_library| will be owned by this Factory and
     // will be destroyed when the Factory is destroyed.
     void set_sspi_library(SSPILibrary* sspi_library) {
       sspi_library_.reset(sspi_library);
     }
 #endif  // defined(NTLM_SSPI)
    private:
@@ skipping 33 matching lines @@
   };
 #endif
 
 #if defined(NTLM_PORTABLE)
   HttpAuthHandlerNTLM();
 #endif
 #if defined(NTLM_SSPI)
   HttpAuthHandlerNTLM(SSPILibrary* sspi_library, ULONG max_token_length,
                       URLSecurityManager* url_security_manager);
 #endif
+  ~HttpAuthHandlerNTLM() override;
 
+  // HttpAuthHandler
   bool NeedsIdentity() override;
-
   bool AllowsDefaultCredentials() override;
-
   HttpAuth::AuthorizationResult HandleAnotherChallenge(
       const HttpAuthChallengeTokenizer& challenge) override;
 
  protected:
   // This function acquires a credentials handle in the SSPI implementation.
   // It does nothing in the portable implementation.
   int InitializeBeforeFirstChallenge();
 
+  // HttpAuthHandler
   int Init(const HttpAuthChallengeTokenizer& tok) override;
-
   int GenerateAuthTokenImpl(const AuthCredentials* credentials,
                             const HttpRequestInfo& request,
                             const CompletionCallback& callback,
                             std::string* auth_token) override;
 
  private:
-  ~HttpAuthHandlerNTLM() override;
-
 #if defined(NTLM_PORTABLE)
   // For unit tests to override the GenerateRandom and GetHostName functions.
   // Returns the old function.
   static GenerateRandomProc SetGenerateRandomProc(GenerateRandomProc proc);
   static HostNameProc SetHostNameProc(HostNameProc proc);
 #endif
 
   // Parse the challenge, saving the results into this instance.
   HttpAuth::AuthorizationResult ParseChallenge(
       const HttpAuthChallengeTokenizer& tok,
@@ skipping 26 matching lines @@
   std::string auth_data_;
 
 #if defined(NTLM_SSPI)
   URLSecurityManager* url_security_manager_;
 #endif
 };
 
 }  // namespace net
 
 #endif  // NET_HTTP_HTTP_AUTH_HANDLER_NTLM_H_