Merge r25564 and r26588 from the trunk....

net/http/http_auth_handler.h

Index: net/http/http_auth_handler.h
===================================================================
--- net/http/http_auth_handler.h	(revision 28069)
+++ net/http/http_auth_handler.h	(working copy)
@@ -26,7 +26,8 @@
   // Initialize the handler by parsing a challenge string.
   bool InitFromChallenge(std::string::const_iterator begin,
                          std::string::const_iterator end,
-                         HttpAuth::Target target);
+                         HttpAuth::Target target,
+                         const GURL& origin);
 
   // Lowercase name of the auth scheme
   const std::string& scheme() const {
@@ -68,6 +69,11 @@
   // sequence used by a connection-based authentication scheme.
   virtual bool NeedsIdentity() { return true; }
 
+  // Returns true if this is the final round of the authentication sequence.
+  // For Basic and Digest, the method always returns true because they are
+  // single-round schemes.
+  virtual bool IsFinalRound() { return true; }
+
   // Generate the Authorization header value.
   virtual std::string GenerateCredentials(const std::wstring& username,
                                           const std::wstring& password,
@@ -89,9 +95,13 @@
   // The lowercase auth-scheme {"basic", "digest", "ntlm", ...}
   std::string scheme_;
 
-  // The realm.
+  // The realm.  Used by "basic" and "digest".
   std::string realm_;
 
+  // The {scheme, host, port} for the authentication target.  Used by "ntlm"
+  // to construct the service principal name.
+  GURL origin_;
+
   // The score for this challenge. Higher numbers are better.
   int score_;