Kerberos authentication backoff cleanup.

net/http/http_auth_controller.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_controller.h"
 
 #include "base/string_util.h"
 #include "net/base/host_resolver.h"
 #include "net/base/net_util.h"
 #include "net/http/http_auth_handler_factory.h"
@@ skipping 70 matching lines @@
   }
   DCHECK(auth_token_.empty());
   DCHECK(NULL == user_callback_);
   int rv = handler_->GenerateAuthToken(username,
                                        password,
                                        request,
                                        &io_callback_,
                                        &auth_token_);
   if (rv == ERR_IO_PENDING)
     user_callback_ = callback;
-  if (rv != ERR_IO_PENDING)
+  else
     OnIOComplete(rv);
   // This error occurs with GSSAPI, if the user has not already logged in.
   if (rv == ERR_MISSING_AUTH_CREDENTIALS)
     rv = OK;
   return rv;
 }
 
 bool HttpAuthController::SelectPreemptiveAuth(const BoundNetLog& net_log) {
   DCHECK(!HaveAuth());
   DCHECK(identity_.invalid);
@@ skipping 233 matching lines @@
   auth_info_->scheme = ASCIIToWide(handler_->scheme());
   // TODO(eroman): decode realm according to RFC 2047.
   auth_info_->realm = ASCIIToWide(handler_->realm());
 }
 
 void HttpAuthController::OnIOComplete(int result) {
   // This error occurs with GSSAPI, if the user has not already logged in.
   // In that case, disable the current scheme as it cannot succeed.
   if (result == ERR_MISSING_AUTH_CREDENTIALS) {
     DisableAuthScheme(handler_->scheme());
-    auth_token_.erase();
+    auth_token_.clear();
     result = OK;
   }
   if (user_callback_) {
     CompletionCallback* c = user_callback_;
     user_callback_ = NULL;
     c->Run(result);
   }
 }
 
 bool HttpAuthController::IsAuthSchemeDisabled(const std::string& scheme) const {
   return disabled_schemes_.find(scheme) != disabled_schemes_.end();
 }
 
 void HttpAuthController::DisableAuthScheme(const std::string& scheme) {
   disabled_schemes_.insert(scheme);
 }
 
 }  // namespace net