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

net/http/http_auth_handler_factory.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_FACTORY_H_
 #define NET_HTTP_HTTP_AUTH_HANDLER_FACTORY_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "net/base/net_export.h"
 #include "net/http/http_auth.h"
+#include "net/http/http_auth_cache.h"
 #include "net/http/url_security_manager.h"
 
 class GURL;
 
 namespace net {
 
 class BoundNetLog;
 class HostResolver;
 class HttpAuthChallengeTokenizer;
 class HttpAuthHandler;
 class HttpAuthHandlerRegistryFactory;
 
 // An HttpAuthHandlerFactory is used to create HttpAuthHandler objects.
 // The HttpAuthHandlerFactory object _must_ outlive any of the HttpAuthHandler
 // objects that it creates.
 class NET_EXPORT HttpAuthHandlerFactory {
  public:
-  enum CreateReason {
-    CREATE_CHALLENGE,     // Create a handler in response to a challenge.
-    CREATE_PREEMPTIVE,    // Create a handler preemptively.
-  };
-
   HttpAuthHandlerFactory() : url_security_manager_(NULL) {}
   virtual ~HttpAuthHandlerFactory() {}
 
   // Sets an URL security manager.  HttpAuthHandlerFactory doesn't own the URL
   // security manager, and the URL security manager should outlive this object.
   void set_url_security_manager(URLSecurityManager* url_security_manager) {
     url_security_manager_ = url_security_manager;
   }
 
   // Retrieves the associated URL security manager.
@@ skipping 20 matching lines @@
   // |digest_nonce_count| is specifically intended for the Digest authentication
   // scheme, and indicates the number of handlers generated for a particular
   // server nonce challenge.
   //
   // For the NTLM and Negotiate handlers:
   // If |origin| does not match the authentication method's filters for
   // the specified |target|, ERR_INVALID_AUTH_CREDENTIALS is returned.
   // NOTE: This will apply to ALL |origin| values if the filters are empty.
   //
   // |*challenge| should not be reused after a call to |CreateAuthHandler()|,
-  virtual int CreateAuthHandler(const HttpAuthChallengeTokenizer& challenge,
-                                HttpAuth::Target target,
-                                const GURL& origin,
-                                CreateReason create_reason,
-                                int digest_nonce_count,
-                                const BoundNetLog& net_log,
-                                scoped_ptr<HttpAuthHandler>* handler) = 0;
+  // TODO(asanka): Update comment.
+  virtual scoped_ptr<HttpAuthHandler> CreateAuthHandlerForScheme(
+      const std::string& scheme) = 0;
 
   // Creates an HTTP authentication handler based on the authentication
   // challenge string |challenge|.
   // This is a convenience function which creates a ChallengeTokenizer for
   // |challenge| and calls |CreateAuthHandler|. See |CreateAuthHandler| for
   // more details on return values.
-  int CreateAuthHandlerFromString(const std::string& challenge,
-                                  HttpAuth::Target target,
-                                  const GURL& origin,
-                                  const BoundNetLog& net_log,
-                                  scoped_ptr<HttpAuthHandler>* handler);
-
-  // Creates an HTTP authentication handler based on the authentication
-  // challenge string |challenge|.
-  // This is a convenience function which creates a ChallengeTokenizer for
-  // |challenge| and calls |CreateAuthHandler|. See |CreateAuthHandler| for
-  // more details on return values.
-  int CreatePreemptiveAuthHandlerFromString(
-      const std::string& challenge,
+  // TODO(asanka): UPdate comment
+  virtual scoped_ptr<HttpAuthHandler> CreateAndInitPreemptiveAuthHandler(
+      HttpAuthCache::Entry* cache_entry,
+      const HttpAuthChallengeTokenizer& tokenizer,
       HttpAuth::Target target,
-      const GURL& origin,
-      int digest_nonce_count,
-      const BoundNetLog& net_log,
-      scoped_ptr<HttpAuthHandler>* handler);
+      const BoundNetLog& net_log) = 0;
 
   // Creates a standard HttpAuthHandlerRegistryFactory. The caller is
   // responsible for deleting the factory.
   // The default factory supports Basic, Digest, NTLM, and Negotiate schemes.
   //
   // |resolver| is used by the Negotiate authentication handler to perform
   // CNAME lookups to generate a Kerberos SPN for the server. It must be
   // non-NULL.  |resolver| must remain valid for the lifetime of the
   // HttpAuthHandlerRegistryFactory and any HttpAuthHandlers created by said
   // factory.
@@ skipping 54 matching lines @@
   // |gssapi_library_name| specifies the name of the GSSAPI library that will
   // be loaded on Posix platforms other than Android. |gssapi_library_name| is
   // ignored on Android and Windows.
   //
   // |auth_android_negotiate_account_type| is an Android account type, used to
   // find the appropriate authenticator service on Android. It is ignored on
   // non-Android platforms.
   //
   // |negotiate_disable_cname_lookup| and |negotiate_enable_port| both control
   // how Negotiate does SPN generation, by default these should be false.
+  // TODO(asanka): Update comment
   static HttpAuthHandlerRegistryFactory* Create(
       const std::vector<std::string>& supported_schemes,
       URLSecurityManager* security_manager,
       HostResolver* host_resolver,
       const std::string& gssapi_library_name,
       const std::string& auth_android_negotiate_account_type,
       bool negotiate_disable_cname_lookup,
       bool negotiate_enable_port);
 
+  scoped_ptr<HttpAuthHandler> CreateAuthHandlerForScheme(
+      const std::string& scheme) override;
+
   // Create an auth handler by dispatching the CreateAuthHandler() call to the
-  // factory registered to handle challenge->scheme().
-  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;
+  // factory registered to handle challenge->scheme().  TODO(asanka): Update
+  // comment
+  scoped_ptr<HttpAuthHandler> CreateAndInitPreemptiveAuthHandler(
+      HttpAuthCache::Entry* cache_entry,
+      const HttpAuthChallengeTokenizer& tokenizer,
+      HttpAuth::Target target,
+      const BoundNetLog& net_log) override;
 
  private:
   typedef std::map<std::string, HttpAuthHandlerFactory*> FactoryMap;
 
   FactoryMap factory_map_;
   DISALLOW_COPY_AND_ASSIGN(HttpAuthHandlerRegistryFactory);
 };
 
 }  // namespace net
 
 #endif  // NET_HTTP_HTTP_AUTH_HANDLER_FACTORY_H_