| Index: net/url_request/url_request_ftp_job.cc
|
| diff --git a/net/url_request/url_request_ftp_job.cc b/net/url_request/url_request_ftp_job.cc
|
| index 27021a33687bdad7255e681678f5e25f98de4f63..f7ccfe136233700d398e1ea8a2e0ae319612deb9 100644
|
| --- a/net/url_request/url_request_ftp_job.cc
|
| +++ b/net/url_request/url_request_ftp_job.cc
|
| @@ -117,9 +117,9 @@ void URLRequestFtpJob::OnStartCompleted(int result) {
|
| } else if (transaction_.get() &&
|
| transaction_->GetResponseInfo()->needs_auth) {
|
| GURL origin = request_->url().GetOrigin();
|
| - if (server_auth_ && server_auth_->state == AUTH_STATE_HAVE_AUTH) {
|
| + if (server_auth_.get() && server_auth_->state == AUTH_STATE_HAVE_AUTH) {
|
| ftp_auth_cache_->Remove(origin, server_auth_->credentials);
|
| - } else if (!server_auth_) {
|
| + } else if (!server_auth_.get()) {
|
| server_auth_ = new AuthData();
|
| }
|
| server_auth_->state = AUTH_STATE_NEED_AUTH;
|
| @@ -151,7 +151,7 @@ void URLRequestFtpJob::OnReadCompleted(int result) {
|
| }
|
|
|
| void URLRequestFtpJob::RestartTransactionWithAuth() {
|
| - DCHECK(server_auth_ && server_auth_->state == AUTH_STATE_HAVE_AUTH);
|
| + DCHECK(server_auth_.get() && server_auth_->state == AUTH_STATE_HAVE_AUTH);
|
|
|
| // No matter what, we want to report our status as IO pending since we will
|
| // be notifying our consumer asynchronously via OnStartCompleted.
|
| @@ -194,12 +194,12 @@ bool URLRequestFtpJob::NeedsAuth() {
|
| // requires auth (and not a proxy), because connecting to FTP via proxy
|
| // effectively means the browser communicates via HTTP, and uses HTTP's
|
| // Proxy-Authenticate protocol when proxy servers require auth.
|
| - return server_auth_ && server_auth_->state == AUTH_STATE_NEED_AUTH;
|
| + return server_auth_.get() && server_auth_->state == AUTH_STATE_NEED_AUTH;
|
| }
|
|
|
| void URLRequestFtpJob::GetAuthChallengeInfo(
|
| scoped_refptr<AuthChallengeInfo>* result) {
|
| - DCHECK((server_auth_ != NULL) &&
|
| + DCHECK((server_auth_.get() != NULL) &&
|
| (server_auth_->state == AUTH_STATE_NEED_AUTH));
|
| scoped_refptr<AuthChallengeInfo> auth_info(new AuthChallengeInfo);
|
| auth_info->is_proxy = false;
|
|
|