Fix multi-round authentication....

net/http/http_auth_handler_ntlm.h

 // 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.
 
 #ifndef NET_HTTP_HTTP_AUTH_HANDLER_NTLM_H_
 #define NET_HTTP_HTTP_AUTH_HANDLER_NTLM_H_
 #pragma once
 
 #include "build/build_config.h"
 
@@ skipping 90 matching lines @@
 #if defined(NTLM_PORTABLE)
   HttpAuthHandlerNTLM();
 #endif
 #if defined(NTLM_SSPI)
   HttpAuthHandlerNTLM(SSPILibrary* sspi_library, ULONG max_token_length,
                       URLSecurityManager* url_security_manager);
 #endif
 
   virtual bool NeedsIdentity();
 
-  virtual bool IsFinalRound();
-
   virtual bool AllowsDefaultCredentials();
 
+  virtual HttpAuth::AuthorizationResult HandleAnotherChallenge(
+      HttpAuth::ChallengeTokenizer* challenge);
+
  protected:
-  virtual bool Init(HttpAuth::ChallengeTokenizer* tok) {
-    return ParseChallenge(tok);
-  }
+  virtual bool Init(HttpAuth::ChallengeTokenizer* tok);
 
   virtual int GenerateAuthTokenImpl(const string16* username,
                                     const string16* password,
                                     const HttpRequestInfo* request,
                                     CompletionCallback* callback,
                                     std::string* auth_token);
 
   // This function acquires a credentials handle in the SSPI implementation.
   // It does nothing in the portable implementation.
   int InitializeBeforeFirstChallenge();
 
  private:
   ~HttpAuthHandlerNTLM();
 
 #if defined(NTLM_PORTABLE)
   // For unit tests to override the GenerateRandom and GetHostName functions.
   // Returns the old function.
   static GenerateRandomProc SetGenerateRandomProc(GenerateRandomProc proc);
   static HostNameProc SetHostNameProc(HostNameProc proc);
 #endif
 
   // Parse the challenge, saving the results into this instance.
-  // Returns true on success.
-  bool ParseChallenge(HttpAuth::ChallengeTokenizer* tok);
+  HttpAuth::AuthorizationResult ParseChallenge(
+      HttpAuth::ChallengeTokenizer* tok, bool initial_challenge);
 
   // Given an input token received from the server, generate the next output
   // token to be sent to the server.
   int GetNextToken(const void* in_token,
                    uint32 in_token_len,
                    void** out_token,
                    uint32* out_token_len);
 
   // Create an NTLM SPN to identify the |origin| server.
   static std::wstring CreateSPN(const GURL& origin);
@@ skipping 16 matching lines @@
   std::string auth_data_;
 
 #if defined(NTLM_SSPI)
   URLSecurityManager* url_security_manager_;
 #endif
 };
 
 }  // namespace net
 
 #endif  // NET_HTTP_HTTP_AUTH_HANDLER_NTLM_H_