Merge r25564 and r26588 from the trunk....

net/http/http_auth_handler_ntlm.h

Index: net/http/http_auth_handler_ntlm.h
===================================================================
--- net/http/http_auth_handler_ntlm.h	(revision 28069)
+++ net/http/http_auth_handler_ntlm.h	(working copy)
@@ -5,20 +5,34 @@
 #ifndef NET_HTTP_HTTP_AUTH_HANDLER_NTLM_H_
 #define NET_HTTP_HTTP_AUTH_HANDLER_NTLM_H_
 
+#include "build/build_config.h"
+
+// This contains the portable and the SSPI implementations for NTLM.
+// We use NTLM_SSPI for Windows, and NTLM_PORTABLE for other platforms.
+#if defined(OS_WIN)
+#define NTLM_SSPI
+#else
+#define NTLM_PORTABLE
+#endif
+
+#if defined(NTLM_SSPI)
+#define SECURITY_WIN32 1
+#include <windows.h>
+#include <security.h>
+#endif
+
 #include <string>
 
 #include "base/basictypes.h"
-#include "base/scoped_ptr.h"
 #include "base/string16.h"
 #include "net/http/http_auth_handler.h"
 
 namespace net {
 
-class NTLMAuthModule;
-
 // Code for handling HTTP NTLM authentication.
 class HttpAuthHandlerNTLM : public HttpAuthHandler {
  public:
+#if defined(NTLM_PORTABLE)
   // A function that generates n random bytes in the output buffer.
   typedef void (*GenerateRandomProc)(uint8* output, size_t n);
 
@@ -45,6 +59,7 @@
     GenerateRandomProc old_random_proc_;
     HostNameProc old_host_name_proc_;
   };
+#endif
 
   HttpAuthHandlerNTLM();
 
@@ -52,6 +67,8 @@
 
   virtual bool NeedsIdentity();
 
+  virtual bool IsFinalRound();
+
   virtual std::string GenerateCredentials(const std::wstring& username,
                                           const std::wstring& password,
                                           const HttpRequestInfo* request,
@@ -63,11 +80,17 @@
     return ParseChallenge(challenge_begin, challenge_end);
   }
 
+  // This function acquires a credentials handle in the SSPI implementation.
+  // It does nothing in the portable implementation.
+  int InitializeBeforeFirstChallenge();
+
  private:
+#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.
@@ -81,8 +104,14 @@
                    void** out_token,
                    uint32* out_token_len);
 
+#if defined(NTLM_SSPI)
+  void ResetSecurityContext();
+#endif
+
+#if defined(NTLM_PORTABLE)
   static GenerateRandomProc generate_random_proc_;
   static HostNameProc get_host_name_proc_;
+#endif
 
   string16 domain_;
   string16 username_;
@@ -91,6 +120,12 @@
   // The base64-encoded string following "NTLM" in the "WWW-Authenticate" or
   // "Proxy-Authenticate" response header.
   std::string auth_data_;
+
+#if defined(NTLM_SSPI)
+  ULONG max_token_len_;
+  CredHandle cred_;
+  CtxtHandle ctxt_;
+#endif
 };
 
 }  // namespace net