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

net/http/http_auth_handler.cc

 // Copyright (c) 2012 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_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_auth_challenge_tokenizer.h"
 
 namespace net {
 
-HttpAuthHandler::HttpAuthHandler() : target_(HttpAuth::AUTH_NONE) {}
+HttpAuthHandler::HttpAuthHandler(const std::string& scheme)
+    : auth_scheme_(scheme), target_(HttpAuth::AUTH_NONE) {}
 
 HttpAuthHandler::~HttpAuthHandler() {
 }
 
 int HttpAuthHandler::HandleInitialChallenge(
     const HttpAuthChallengeTokenizer& challenge,
     HttpAuth::Target target,
     const GURL& origin,
     const BoundNetLog& net_log) {
   origin_ = origin;
   target_ = target;
   net_log_ = net_log;
 
   auth_challenge_ = challenge.challenge_text();
-  int result = Init(challenge);
-
-  // Init() is expected to set the scheme, realm, score, and properties.  The
-  // realm may be empty.
-  DCHECK_IMPLIES(result == OK, HttpAuth::IsValidNormalizedScheme(auth_scheme_));
-
-  return result;
+  return Init(challenge);
 }
 
 namespace {
 
 NetLog::EventType EventTypeFromAuthTarget(HttpAuth::Target target) {
   switch (target) {
     case HttpAuth::AUTH_PROXY:
       return NetLog::TYPE_AUTH_PROXY;
     case HttpAuth::AUTH_SERVER:
       return NetLog::TYPE_AUTH_SERVER;
@@ skipping 44 matching lines @@
   callback.Run(rv);
 }
 
 void HttpAuthHandler::FinishGenerateAuthToken() {
   // TOOD(cbentzel): Should this be done in OK case only?
   net_log_.EndEvent(EventTypeFromAuthTarget(target_));
   callback_.Reset();
 }
 
 }  // namespace net