| Index: net/http/http_auth_handler_basic.cc
|
| diff --git a/net/http/http_auth_handler_basic.cc b/net/http/http_auth_handler_basic.cc
|
| index fd900a42512cfd95ba2ece01156f9b5ba921d5a5..d4cc408c3e7d51f77e5d435bafacb472f35c47a3 100644
|
| --- a/net/http/http_auth_handler_basic.cc
|
| +++ b/net/http/http_auth_handler_basic.cc
|
| @@ -54,7 +54,17 @@ bool ParseRealm(const HttpAuthChallengeTokenizer& tokenizer,
|
|
|
| } // namespace
|
|
|
| -int HttpAuthHandlerBasic::Init(const HttpAuthChallengeTokenizer& challenge) {
|
| +int HttpAuthHandlerBasic::InitializeFromChallengeInternal(
|
| + const HttpAuthChallengeTokenizer& challenge,
|
| + const HttpResponseInfo&,
|
| + const CompletionCallback&) {
|
| + return ParseChallenge(challenge);
|
| +}
|
| +
|
| +int HttpAuthHandlerBasic::InitializeFromCacheEntryInternal(
|
| + HttpAuthCache::Entry* cache_entry) {
|
| + HttpAuthChallengeTokenizer challenge(cache_entry->auth_challenge().begin(),
|
| + cache_entry->auth_challenge().end());
|
| return ParseChallenge(challenge);
|
| }
|
|
|
| @@ -121,14 +131,12 @@ HttpAuthHandlerBasic::Factory::CreateAuthHandlerForScheme(
|
| scoped_ptr<HttpAuthHandler>
|
| HttpAuthHandlerBasic::Factory::CreateAndInitPreemptiveAuthHandler(
|
| HttpAuthCache::Entry* cache_entry,
|
| - const HttpAuthChallengeTokenizer& tokenizer,
|
| HttpAuth::Target target,
|
| const BoundNetLog& net_log) {
|
| if (cache_entry->scheme() != kBasicSchemeName)
|
| return scoped_ptr<HttpAuthHandler>();
|
| scoped_ptr<HttpAuthHandler> handler(new HttpAuthHandlerBasic());
|
| - int rv = handler->HandleInitialChallenge(tokenizer, target,
|
| - cache_entry->origin(), net_log);
|
| + int rv = handler->InitializeFromCacheEntry(cache_entry, target, net_log);
|
| if (rv == OK)
|
| return handler;
|
| return scoped_ptr<HttpAuthHandler>();
|
|
|