[net/http auth] Use strings to identify authentication schemes.

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()
-    : auth_scheme_(HttpAuth::AUTH_SCHEME_MAX),
-      score_(-1),
-      target_(HttpAuth::AUTH_NONE),
-      properties_(-1) {
-}
+HttpAuthHandler::HttpAuthHandler() : target_(HttpAuth::AUTH_NONE) {}
 
 HttpAuthHandler::~HttpAuthHandler() {
 }
 
 bool HttpAuthHandler::InitFromChallenge(
     HttpAuthChallengeTokenizer* challenge,
     HttpAuth::Target target,
     const GURL& origin,
     const BoundNetLog& net_log) {
   origin_ = origin;
   target_ = target;
-  score_ = -1;
-  properties_ = -1;
   net_log_ = net_log;
 
   auth_challenge_ = challenge->challenge_text();
   bool ok = Init(challenge);
 
-  // Init() is expected to set the scheme, realm, score, and properties.  The
-  // realm may be empty.
-  DCHECK(!ok || score_ != -1);
-  DCHECK(!ok || properties_ != -1);
-  DCHECK(!ok || auth_scheme_ != HttpAuth::AUTH_SCHEME_MAX);
-
+  // Init() is expected to set the scheme, realm, and properties. The realm may
+  // be empty.
+  DCHECK_IMPLIES(ok,
+                 HttpUtil::IsToken(auth_scheme_.begin(), auth_scheme_.end()) &&
+                     base::ToLowerASCII(auth_scheme_) == auth_scheme_);
   return ok;
 }
 
 namespace {
 
 NetLog::EventType EventTypeFromAuthTarget(HttpAuth::Target target) {
   switch (target) {
     case HttpAuth::AUTH_PROXY:
       return NetLog::TYPE_AUTH_PROXY;
     case HttpAuth::AUTH_SERVER:
@@ skipping 45 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