Cleanup: Use AUTH_SCHEME enum instead of a string.

net/http/http_auth_handler.cc

 // Copyright (c) 2010 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/logging.h"
 #include "net/base/net_errors.h"
 
 namespace net {
 
 HttpAuthHandler::HttpAuthHandler()
-    : auth_scheme_(AUTH_SCHEME_MAX),
+    : auth_scheme_(HttpAuth::AUTH_SCHEME_MAX),
       score_(-1),
       target_(HttpAuth::AUTH_NONE),
       properties_(-1),
       original_callback_(NULL),
       ALLOW_THIS_IN_INITIALIZER_LIST(
           wrapper_callback_(
               this, &HttpAuthHandler::OnGenerateAuthTokenComplete)) {
 }
 
 HttpAuthHandler::~HttpAuthHandler() {
 }
 
 bool HttpAuthHandler::InitFromChallenge(
     HttpAuth::ChallengeTokenizer* 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 || !scheme().empty());
   DCHECK(!ok || score_ != -1);
   DCHECK(!ok || properties_ != -1);
-  DCHECK(!ok || auth_scheme_ != AUTH_SCHEME_MAX);
+  DCHECK(!ok || auth_scheme_ != HttpAuth::AUTH_SCHEME_MAX);
 
   return ok;
 }
 
 namespace {
 
 NetLog::EventType EventTypeFromAuthTarget(HttpAuth::Target target) {
   switch (target) {
     case HttpAuth::AUTH_PROXY:
       return NetLog::TYPE_AUTH_PROXY;
@@ skipping 42 matching lines @@
     callback->Run(rv);
 }
 
 void HttpAuthHandler::FinishGenerateAuthToken() {
   // TOOD(cbentzel): Should this be done in OK case only?
   net_log_.EndEvent(EventTypeFromAuthTarget(target_), NULL);
   original_callback_ = NULL;
 }
 
 }  // namespace net