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

net/http/http_auth.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.
 
 #include "net/http/http_auth.h"
 
 #include <algorithm>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 90 matching lines @@
     // of equal priority, then the handler based on the earlier challenge wins.
     int cur_priority = GetSchemePriority(cur_auth_scheme);
     if (best.get() && best_priority >= cur_priority)
       continue;
 
     // Immediately trying to create a handler may be wasteful because we may see
     // a higher ranking challenge later on in the headers. However, this is
     // rare. Servers typically specify higher priority schemes before lower
     // priority schemes.
     scoped_ptr<HttpAuthHandler> current_handler;
-    int rv = http_auth_handler_factory->CreateAuthHandler(
-        challenge_tokenizer, target, origin,
-        HttpAuthHandlerFactory::CREATE_CHALLENGE, 1, net_log, &current_handler);
+    current_handler = http_auth_handler_factory->CreateAuthHandlerForScheme(
+        challenge_tokenizer.NormalizedScheme());
+    if (!current_handler) {
+      net_log.AddEvent(NetLog::TYPE_AUTH_HANDLER_CREATION_FAILURE,
+                       base::Bind(&AuthHandlerCreationFailureParams,
+                                  &cur_challenge, ERR_UNSUPPORTED_AUTH_SCHEME));
+      continue;
+    }
+    int rv = current_handler->HandleInitialChallenge(challenge_tokenizer,
+                                                     target, origin, net_log);
     if (rv != OK) {
       net_log.AddEvent(
           NetLog::TYPE_AUTH_HANDLER_CREATION_FAILURE,
           base::Bind(&AuthHandlerCreationFailureParams, &cur_challenge, rv));
       continue;
     }
     DCHECK(current_handler.get());
     DCHECK_EQ(cur_auth_scheme, current_handler->auth_scheme());
     best.swap(current_handler);
     best_priority = cur_priority;
@@ skipping 73 matching lines @@
   }
 }
 
 // static
 bool HttpAuth::IsValidNormalizedScheme(const std::string& scheme) {
   return HttpUtil::IsToken(scheme.begin(), scheme.end()) &&
          base::ToLowerASCII(scheme) == scheme;
 }
 
 }  // namespace net