Merge r25564 and r26588 from the trunk....

net/http/http_auth_handler_basic_unittest.cc

Index: net/http/http_auth_handler_basic_unittest.cc
===================================================================
--- net/http/http_auth_handler_basic_unittest.cc	(revision 28069)
+++ net/http/http_auth_handler_basic_unittest.cc	(working copy)
@@ -23,11 +23,12 @@
     // Empty username and empty password.
     { L"", L"", "Basic Og==" },
   };
+  GURL origin("http://www.example.com");
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
     std::string challenge = "Basic realm=\"Atlantis\"";
     scoped_refptr<HttpAuthHandlerBasic> basic = new HttpAuthHandlerBasic;
     basic->InitFromChallenge(challenge.begin(), challenge.end(),
-                             HttpAuth::AUTH_SERVER);
+                             HttpAuth::AUTH_SERVER, origin);
     std::string credentials = basic->GenerateCredentials(tests[i].username,
                                                          tests[i].password,
                                                          NULL, NULL);