Fix multi-round authentication....

net/socket_stream/socket_stream.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.
 //
 // TODO(ukai): code is similar with http_network_transaction.cc.  We should
 //   think about ways to share code, if possible.
 
 #include "net/socket_stream/socket_stream.h"
 
 #include <set>
@@ skipping 912 matching lines @@
   DCHECK(!proxy_info_.is_empty());
   return GURL("http://" +
               proxy_info_.proxy_server().host_port_pair().ToString());
 }
 
 int SocketStream::HandleAuthChallenge(const HttpResponseHeaders* headers) {
   GURL auth_origin(ProxyAuthOrigin());
 
   LOG(INFO) << "The proxy " << auth_origin << " requested auth";
 
-  // The auth we tried just failed, hence it can't be valid.
-  // Remove it from the cache so it won't be used again.
-  if (auth_handler_.get() && !auth_identity_.invalid &&
-      auth_handler_->IsFinalRound()) {
+  // TODO(cbentzel): Since SocketStream only suppports basic authentication
+  // right now, another challenge is always treated as a rejection.
+  // Ultimately this should be converted to use HttpAuthController like the
+  // HttpNetworkTransaction has.
+  if (auth_handler_.get() && !auth_identity_.invalid) {
     if (auth_identity_.source != HttpAuth::IDENT_SRC_PATH_LOOKUP)
       auth_cache_.Remove(auth_origin,
                          auth_handler_->realm(),
                          auth_handler_->scheme(),
                          auth_identity_.username,
                          auth_identity_.password);
     auth_handler_.reset();
     auth_identity_ = HttpAuth::Identity();
   }
 
@@ skipping 73 matching lines @@
 
 SSLConfigService* SocketStream::ssl_config_service() const {
   return context_->ssl_config_service();
 }
 
 ProxyService* SocketStream::proxy_service() const {
   return context_->proxy_service();
 }
 
 }  // namespace net