diff options
Diffstat (limited to 'chrome/common/net/url_fetcher.cc')
-rw-r--r-- | chrome/common/net/url_fetcher.cc | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/chrome/common/net/url_fetcher.cc b/chrome/common/net/url_fetcher.cc index 64a12f8..81b47cf 100644 --- a/chrome/common/net/url_fetcher.cc +++ b/chrome/common/net/url_fetcher.cc @@ -35,7 +35,7 @@ bool URLFetcher::g_interception_enabled = false; class URLFetcher::Core : public base::RefCountedThreadSafe<URLFetcher::Core>, - public URLRequest::Delegate { + public net::URLRequest::Delegate { public: // For POST requests, set |content_type| to the MIME type of the content // and set |content| to the data to upload. |flags| are flags to apply to @@ -61,9 +61,9 @@ class URLFetcher::Core // Reports that the received content was malformed. void ReceivedContentWasMalformed(); - // URLRequest::Delegate implementation. - virtual void OnResponseStarted(URLRequest* request); - virtual void OnReadCompleted(URLRequest* request, int bytes_read); + // Overridden from net::URLRequest::Delegate: + virtual void OnResponseStarted(net::URLRequest* request); + virtual void OnReadCompleted(net::URLRequest* request, int bytes_read); URLFetcher::Delegate* delegate() const { return delegate_; } @@ -117,7 +117,7 @@ class URLFetcher::Core scoped_refptr<base::MessageLoopProxy> io_message_loop_proxy_; // The message loop proxy for the thread // on which the request IO happens. - scoped_ptr<URLRequest> request_; // The actual request this wraps + scoped_ptr<net::URLRequest> request_; // The actual request this wraps int load_flags_; // Flags for the load operation int response_code_; // HTTP status code for the request std::string data_; // Results of the request @@ -273,7 +273,7 @@ void URLFetcher::Core::CancelAll() { g_registry.Get().CancelAll(); } -void URLFetcher::Core::OnResponseStarted(URLRequest* request) { +void URLFetcher::Core::OnResponseStarted(net::URLRequest* request) { DCHECK_EQ(request, request_.get()); DCHECK(io_message_loop_proxy_->BelongsToCurrentThread()); if (request_->status().is_success()) { @@ -291,7 +291,8 @@ void URLFetcher::Core::OnResponseStarted(URLRequest* request) { OnReadCompleted(request_.get(), bytes_read); } -void URLFetcher::Core::OnReadCompleted(URLRequest* request, int bytes_read) { +void URLFetcher::Core::OnReadCompleted(net::URLRequest* request, + int bytes_read) { DCHECK(request == request_); DCHECK(io_message_loop_proxy_->BelongsToCurrentThread()); @@ -337,7 +338,7 @@ void URLFetcher::Core::StartURLRequest() { DCHECK(!request_.get()); g_registry.Get().AddURLFetcherCore(this); - request_.reset(new URLRequest(original_url_, this)); + request_.reset(new net::URLRequest(original_url_, this)); int flags = request_->load_flags() | load_flags_; if (!g_interception_enabled) { flags = flags | net::LOAD_DISABLE_INTERCEPT; |