diff options
| author | darin@google.com <darin@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-07-30 16:40:10 +0000 |
|---|---|---|
| committer | darin@google.com <darin@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-07-30 16:40:10 +0000 |
| commit | a9bb6f69b32018c245e05a79011114653fe8f5e0 (patch) | |
| tree | c4fe6b5db0e508f860c82feb44245bf549d608ff /net/url_request/url_request_inet_job.cc | |
| parent | f23423a1245dffc2a368708fafd2867d2cf3e0f8 (diff) | |
| download | chromium_src-a9bb6f69b32018c245e05a79011114653fe8f5e0.zip chromium_src-a9bb6f69b32018c245e05a79011114653fe8f5e0.tar.gz chromium_src-a9bb6f69b32018c245e05a79011114653fe8f5e0.tar.bz2 | |
Move some more classes from net/base into the net:: namespace.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/url_request/url_request_inet_job.cc')
| -rw-r--r-- | net/url_request/url_request_inet_job.cc | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/net/url_request/url_request_inet_job.cc b/net/url_request/url_request_inet_job.cc index ab4f91b..e2d80fd 100644 --- a/net/url_request/url_request_inet_job.cc +++ b/net/url_request/url_request_inet_job.cc @@ -141,17 +141,16 @@ void URLRequestInetJob::Kill() { void URLRequestInetJob::SetAuth(const wstring& username, const wstring& password) { - DCHECK((proxy_auth_ != NULL && proxy_auth_->state == AUTH_STATE_NEED_AUTH) || - (server_auth_ != NULL && - (server_auth_->state == AUTH_STATE_NEED_AUTH))); + DCHECK((proxy_auth_ && proxy_auth_->state == net::AUTH_STATE_NEED_AUTH) || + (server_auth_ && server_auth_->state == net::AUTH_STATE_NEED_AUTH)); // Proxy gets set first, then WWW. - AuthData* auth = - (proxy_auth_ != NULL && proxy_auth_->state == AUTH_STATE_NEED_AUTH ? + net::AuthData* auth = + (proxy_auth_ && proxy_auth_->state == net::AUTH_STATE_NEED_AUTH ? proxy_auth_.get() : server_auth_.get()); if (auth) { - auth->state = AUTH_STATE_HAVE_AUTH; + auth->state = net::AUTH_STATE_HAVE_AUTH; auth->username = username; auth->password = password; } @@ -165,17 +164,16 @@ void URLRequestInetJob::SetAuth(const wstring& username, } void URLRequestInetJob::CancelAuth() { - DCHECK((proxy_auth_ != NULL && proxy_auth_->state == AUTH_STATE_NEED_AUTH) || - (server_auth_ != NULL && - (server_auth_->state == AUTH_STATE_NEED_AUTH))); + DCHECK((proxy_auth_ && proxy_auth_->state == net::AUTH_STATE_NEED_AUTH) || + (server_auth_ && server_auth_->state == net::AUTH_STATE_NEED_AUTH)); // Proxy gets set first, then WWW. - AuthData* auth = - (proxy_auth_ != NULL && proxy_auth_->state == AUTH_STATE_NEED_AUTH ? + net::AuthData* auth = + (proxy_auth_ && proxy_auth_->state == net::AUTH_STATE_NEED_AUTH ? proxy_auth_.get() : server_auth_.get()); if (auth) { - auth->state = AUTH_STATE_CANCELED; + auth->state = net::AUTH_STATE_CANCELED; } // Once the auth is cancelled, we proceed with the request as though |