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

net/http/http_auth_handler_ntlm.h

Index: net/http/http_auth_handler_ntlm.h
diff --git a/net/http/http_auth_handler_ntlm.h b/net/http/http_auth_handler_ntlm.h
index d52585411a5ea9261c0d25bff4a33937f27879c8..67dee78a0f331db232ded0f3b6ca98dd7ce70b57 100644
--- a/net/http/http_auth_handler_ntlm.h
+++ b/net/http/http_auth_handler_ntlm.h
@@ -41,13 +41,14 @@ class NET_EXPORT_PRIVATE HttpAuthHandlerNTLM : public HttpAuthHandler {
     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
@@ -101,11 +102,11 @@ class NET_EXPORT_PRIVATE HttpAuthHandlerNTLM : public HttpAuthHandler {
   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;
 
@@ -114,16 +115,14 @@ class NET_EXPORT_PRIVATE HttpAuthHandlerNTLM : public HttpAuthHandler {
   // 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.