Index: net/http/http_auth_unittest.cc |
diff --git a/net/http/http_auth_unittest.cc b/net/http/http_auth_unittest.cc |
index c550803857b9974117f198a9a5badc548ff7b18c..6d8e864671815a9668533d79d2a44bc9c9659b80 100644 |
--- a/net/http/http_auth_unittest.cc |
+++ b/net/http/http_auth_unittest.cc |
@@ -18,6 +18,7 @@ |
#include "net/http/http_auth_handler_mock.h" |
#include "net/http/http_auth_scheme.h" |
#include "net/http/http_response_headers.h" |
+#include "net/http/http_response_info.h" |
#include "net/http/http_util.h" |
#include "net/http/mock_allow_http_auth_preferences.h" |
#include "testing/gtest/include/gtest/gtest.h" |
@@ -33,9 +34,9 @@ HttpAuthHandlerMock* CreateMockHandler(bool connection_based) { |
HttpAuthChallengeTokenizer challenge(challenge_text.begin(), |
challenge_text.end()); |
GURL origin("www.example.com"); |
- EXPECT_TRUE(auth_handler->InitFromChallenge(&challenge, |
- HttpAuth::AUTH_SERVER, |
- origin, |
+ HttpResponseInfo empty_response_info; |
+ EXPECT_TRUE(auth_handler->InitFromChallenge(&challenge, HttpAuth::AUTH_SERVER, |
+ empty_response_info, origin, |
BoundNetLog())); |
return auth_handler; |
} |
@@ -52,14 +53,11 @@ HttpAuth::AuthorizationResult HandleChallengeResponse( |
scoped_ptr<HttpAuthHandlerMock> mock_handler( |
CreateMockHandler(connection_based)); |
std::set<HttpAuth::Scheme> disabled_schemes; |
- scoped_refptr<HttpResponseHeaders> headers( |
- HeadersFromResponseText(headers_text)); |
- return HttpAuth::HandleChallengeResponse( |
- mock_handler.get(), |
- headers.get(), |
- HttpAuth::AUTH_SERVER, |
- disabled_schemes, |
- challenge_used); |
+ HttpResponseInfo response_info; |
+ response_info.headers = HeadersFromResponseText(headers_text); |
+ return HttpAuth::HandleChallengeResponse(mock_handler.get(), response_info, |
+ HttpAuth::AUTH_SERVER, |
+ disabled_schemes, challenge_used); |
} |
} // namespace |
@@ -133,17 +131,13 @@ TEST(HttpAuthTest, ChooseBestChallenge) { |
// Make a HttpResponseHeaders object. |
std::string headers_with_status_line("HTTP/1.1 401 Unauthorized\n"); |
headers_with_status_line += tests[i].headers; |
- scoped_refptr<HttpResponseHeaders> headers( |
- HeadersFromResponseText(headers_with_status_line)); |
+ HttpResponseInfo response_info; |
+ response_info.headers = HeadersFromResponseText(headers_with_status_line); |
scoped_ptr<HttpAuthHandler> handler; |
HttpAuth::ChooseBestChallenge(http_auth_handler_factory.get(), |
- headers.get(), |
- HttpAuth::AUTH_SERVER, |
- origin, |
- disabled_schemes, |
- BoundNetLog(), |
- &handler); |
+ response_info, HttpAuth::AUTH_SERVER, origin, |
+ disabled_schemes, BoundNetLog(), &handler); |
if (handler.get()) { |
EXPECT_EQ(tests[i].challenge_scheme, handler->auth_scheme()); |