| Index: net/http/http_auth_handler.cc
|
| diff --git a/net/http/http_auth_handler.cc b/net/http/http_auth_handler.cc
|
| index 7369ea5425fd961e163839aed492bbe4db22650a..b43a005864bdddfa5f4511c230764cd0fe1aab00 100644
|
| --- a/net/http/http_auth_handler.cc
|
| +++ b/net/http/http_auth_handler.cc
|
| @@ -22,11 +22,10 @@ HttpAuthHandler::HttpAuthHandler()
|
| HttpAuthHandler::~HttpAuthHandler() {
|
| }
|
|
|
| -bool HttpAuthHandler::InitFromChallenge(
|
| - HttpAuthChallengeTokenizer* challenge,
|
| - HttpAuth::Target target,
|
| - const GURL& origin,
|
| - const BoundNetLog& net_log) {
|
| +bool HttpAuthHandler::InitFromChallenge(HttpAuthChallengeTokenizer* challenge,
|
| + HttpAuth::Target target,
|
| + const GURL& origin,
|
| + const BoundNetLog& net_log) {
|
| origin_ = origin;
|
| target_ = target;
|
| score_ = -1;
|
| @@ -61,9 +60,10 @@ NetLog::EventType EventTypeFromAuthTarget(HttpAuth::Target target) {
|
|
|
| } // namespace
|
|
|
| -int HttpAuthHandler::GenerateAuthToken(
|
| - const AuthCredentials* credentials, const HttpRequestInfo* request,
|
| - const CompletionCallback& callback, std::string* auth_token) {
|
| +int HttpAuthHandler::GenerateAuthToken(const AuthCredentials* credentials,
|
| + const HttpRequestInfo* request,
|
| + const CompletionCallback& callback,
|
| + std::string* auth_token) {
|
| // TODO(cbentzel): Enforce non-NULL callback after cleaning up SocketStream.
|
| DCHECK(request);
|
| DCHECK(credentials != NULL || AllowsDefaultCredentials());
|
| @@ -72,7 +72,8 @@ int HttpAuthHandler::GenerateAuthToken(
|
| callback_ = callback;
|
| net_log_.BeginEvent(EventTypeFromAuthTarget(target_));
|
| int rv = GenerateAuthTokenImpl(
|
| - credentials, request,
|
| + credentials,
|
| + request,
|
| base::Bind(&HttpAuthHandler::OnGenerateAuthTokenComplete,
|
| base::Unretained(this)),
|
| auth_token);
|
|
|