Merge r25564 and r26588 from the trunk....

net/http/http_auth_handler_digest_unittest.cc

 // Copyright (c) 2006-2008 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.
 
 #include "testing/gtest/include/gtest/gtest.h"
 
 #include "base/basictypes.h"
 #include "net/http/http_auth_handler_digest.h"
 
 namespace net {
@@ skipping 217 matching lines @@
       "15c07961ed8575c4", // cnonce
       1, // nc
 
       // Authorization
       "Digest username=\"USER\", realm=\"Baztastic\", "
       "nonce=\"AAAAAAAA\", uri=\"/\", algorithm=MD5-sess, "
       "response=\"cbc1139821ee7192069580570c541a03\", "
       "qop=auth, nc=00000001, cnonce=\"15c07961ed8575c4\""
     }
   };
+  GURL origin("http://www.example.com");
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
     scoped_refptr<HttpAuthHandlerDigest> digest = new HttpAuthHandlerDigest;
     std::string challenge = tests[i].challenge;
     EXPECT_TRUE(digest->InitFromChallenge(
-        challenge.begin(), challenge.end(), HttpAuth::AUTH_SERVER));
+        challenge.begin(), challenge.end(), HttpAuth::AUTH_SERVER, origin));
 
     std::string creds = digest->AssembleCredentials(tests[i].req_method,
         tests[i].req_path, tests[i].username, tests[i].password,
         tests[i].cnonce, tests[i].nonce_count);
 
     EXPECT_STREQ(tests[i].expected_creds, creds.c_str());
   }
 }
 
 } // namespace net