Merge r25564 and r26588 from the trunk....

net/http/http_auth.h

Index: net/http/http_auth.h
===================================================================
--- net/http/http_auth.h	(revision 28069)
+++ net/http/http_auth.h	(working copy)
@@ -75,6 +75,7 @@
   // |*handler| is set to NULL.
   static void CreateAuthHandler(const std::string& challenge,
                                 Target target,
+                                const GURL& origin,
                                 scoped_refptr<HttpAuthHandler>* handler);
 
   // Iterate through the challenge headers, and pick the best one that
@@ -84,11 +85,15 @@
   // |*handler| is unchanged. If no supported challenge was found, |*handler|
   // is set to NULL.
   //
+  // |origin| is used by the NTLM authentication scheme to construct the
+  // service principal name.  It is ignored by other schemes.
+  //
   // TODO(wtc): Continuing to use the existing handler in |*handler| (for
   // NTLM) is new behavior.  Rename ChooseBestChallenge to fully encompass
   // what it does now.
   static void ChooseBestChallenge(const HttpResponseHeaders* headers,
                                   Target target,
+                                  const GURL& origin,
                                   scoped_refptr<HttpAuthHandler>* handler);
 
   // ChallengeTokenizer breaks up a challenge string into the the auth scheme