diff options
author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-30 21:34:02 +0000 |
---|---|---|
committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-30 21:34:02 +0000 |
commit | 6981d96328621a75557dbf843c5aab83bf4f55a3 (patch) | |
tree | 8a95daea7aad9b8bce1ced62fda4068ed296125a /net/proxy/proxy_script_fetcher_impl.cc | |
parent | d4e04a67c7f529bc8137c2dc5618e5a8c2123a13 (diff) | |
download | chromium_src-6981d96328621a75557dbf843c5aab83bf4f55a3.zip chromium_src-6981d96328621a75557dbf843c5aab83bf4f55a3.tar.gz chromium_src-6981d96328621a75557dbf843c5aab83bf4f55a3.tar.bz2 |
net: Remove typedef net::URLRequest URLRequest;
BUG=64263
TEST=compiled locally, trybots
Review URL: http://codereview.chromium.org/5384002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67762 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy/proxy_script_fetcher_impl.cc')
-rw-r--r-- | net/proxy/proxy_script_fetcher_impl.cc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/net/proxy/proxy_script_fetcher_impl.cc b/net/proxy/proxy_script_fetcher_impl.cc index 221e5c0..0a54046 100644 --- a/net/proxy/proxy_script_fetcher_impl.cc +++ b/net/proxy/proxy_script_fetcher_impl.cc @@ -86,7 +86,7 @@ ProxyScriptFetcherImpl::ProxyScriptFetcherImpl( } ProxyScriptFetcherImpl::~ProxyScriptFetcherImpl() { - // The URLRequest's destructor will cancel the outstanding request, and + // The net::URLRequest's destructor will cancel the outstanding request, and // ensure that the delegate (this) is not called again. } @@ -99,7 +99,7 @@ int ProxyScriptFetcherImpl::Fetch(const GURL& url, DCHECK(callback); DCHECK(text); - cur_request_.reset(new URLRequest(url, this)); + cur_request_.reset(new net::URLRequest(url, this)); cur_request_->set_context(url_request_context_); cur_request_->set_method("GET"); @@ -129,7 +129,7 @@ int ProxyScriptFetcherImpl::Fetch(const GURL& url, } void ProxyScriptFetcherImpl::Cancel() { - // ResetCurRequestState will free the URLRequest, which will cause + // ResetCurRequestState will free the net::URLRequest, which will cause // cancellation. ResetCurRequestState(); } @@ -138,7 +138,7 @@ URLRequestContext* ProxyScriptFetcherImpl::GetRequestContext() { return url_request_context_; } -void ProxyScriptFetcherImpl::OnAuthRequired(URLRequest* request, +void ProxyScriptFetcherImpl::OnAuthRequired(net::URLRequest* request, AuthChallengeInfo* auth_info) { DCHECK_EQ(request, cur_request_.get()); // TODO(eroman): @@ -147,7 +147,7 @@ void ProxyScriptFetcherImpl::OnAuthRequired(URLRequest* request, request->CancelAuth(); } -void ProxyScriptFetcherImpl::OnSSLCertificateError(URLRequest* request, +void ProxyScriptFetcherImpl::OnSSLCertificateError(net::URLRequest* request, int cert_error, X509Certificate* cert) { DCHECK_EQ(request, cur_request_.get()); @@ -157,7 +157,7 @@ void ProxyScriptFetcherImpl::OnSSLCertificateError(URLRequest* request, request->Cancel(); } -void ProxyScriptFetcherImpl::OnResponseStarted(URLRequest* request) { +void ProxyScriptFetcherImpl::OnResponseStarted(net::URLRequest* request) { DCHECK_EQ(request, cur_request_.get()); if (!request->status().is_success()) { @@ -191,7 +191,7 @@ void ProxyScriptFetcherImpl::OnResponseStarted(URLRequest* request) { ReadBody(request); } -void ProxyScriptFetcherImpl::OnReadCompleted(URLRequest* request, +void ProxyScriptFetcherImpl::OnReadCompleted(net::URLRequest* request, int num_bytes) { DCHECK_EQ(request, cur_request_.get()); if (ConsumeBytesRead(request, num_bytes)) { @@ -200,7 +200,7 @@ void ProxyScriptFetcherImpl::OnReadCompleted(URLRequest* request, } } -void ProxyScriptFetcherImpl::OnResponseCompleted(URLRequest* request) { +void ProxyScriptFetcherImpl::OnResponseCompleted(net::URLRequest* request) { DCHECK_EQ(request, cur_request_.get()); // Use |result_code_| as the request's error if we have already set it to @@ -211,7 +211,7 @@ void ProxyScriptFetcherImpl::OnResponseCompleted(URLRequest* request) { FetchCompleted(); } -void ProxyScriptFetcherImpl::ReadBody(URLRequest* request) { +void ProxyScriptFetcherImpl::ReadBody(net::URLRequest* request) { // Read as many bytes as are available synchronously. while (true) { int num_bytes; @@ -226,7 +226,7 @@ void ProxyScriptFetcherImpl::ReadBody(URLRequest* request) { } } -bool ProxyScriptFetcherImpl::ConsumeBytesRead(URLRequest* request, +bool ProxyScriptFetcherImpl::ConsumeBytesRead(net::URLRequest* request, int num_bytes) { if (num_bytes <= 0) { // Error while reading, or EOF. @@ -277,7 +277,7 @@ void ProxyScriptFetcherImpl::ResetCurRequestState() { } void ProxyScriptFetcherImpl::OnTimeout(int id) { - // Timeout tasks may outlive the URLRequest they reference. Make sure it + // Timeout tasks may outlive the net::URLRequest they reference. Make sure it // is still applicable. if (cur_request_id_ != id) return; |