| Index: net/url_request/url_request_job.h
|
| diff --git a/net/url_request/url_request_job.h b/net/url_request/url_request_job.h
|
| index 239f5e9f935e60937a67cc9a4b87f83bc54fbdc6..ab5435429e7935f32780f591871cd5a7723e2d12 100644
|
| --- a/net/url_request/url_request_job.h
|
| +++ b/net/url_request/url_request_job.h
|
| @@ -65,9 +65,9 @@ class URLRequestJob : public base::RefCounted<URLRequestJob>,
|
|
|
| // This function MUST somehow call NotifyDone/NotifyCanceled or some requests
|
| // will get leaked. Certain callers use that message to know when they can
|
| - // delete their URLRequest object, even when doing a cancel. The default Kill
|
| - // implementation calls NotifyCanceled, so it is recommended that subclasses
|
| - // call URLRequestJob::Kill() after doing any additional work.
|
| + // delete their net::URLRequest object, even when doing a cancel. The default
|
| + // Kill implementation calls NotifyCanceled, so it is recommended that
|
| + // subclasses call URLRequestJob::Kill() after doing any additional work.
|
| //
|
| // The job should endeavor to stop working as soon as is convenient, but must
|
| // not send and complete notifications from inside this function. Instead,
|
| @@ -90,12 +90,12 @@ class URLRequestJob : public base::RefCounted<URLRequestJob>,
|
|
|
| // Called to read post-filtered data from this Job, returning the number of
|
| // bytes read, 0 when there is no more data, or -1 if there was an error.
|
| - // This is just the backend for URLRequest::Read, see that function for more
|
| - // info.
|
| + // This is just the backend for net::URLRequest::Read, see that function for
|
| + // more info.
|
| bool Read(net::IOBuffer* buf, int buf_size, int* bytes_read);
|
|
|
| // Stops further caching of this request, if any. For more info, see
|
| - // URLRequest::StopCaching().
|
| + // net::URLRequest::StopCaching().
|
| virtual void StopCaching();
|
|
|
| // Called to fetch the current load state for the job.
|
| @@ -157,8 +157,8 @@ class URLRequestJob : public base::RefCounted<URLRequestJob>,
|
|
|
| // Called to determine if it is okay to redirect this job to the specified
|
| // location. This may be used to implement protocol-specific restrictions.
|
| - // If this function returns false, then the URLRequest will fail reporting
|
| - // net::ERR_UNSAFE_REDIRECT.
|
| + // If this function returns false, then the net::URLRequest will fail
|
| + // reporting net::ERR_UNSAFE_REDIRECT.
|
| virtual bool IsSafeRedirect(const GURL& location);
|
|
|
| // Called to determine if this response is asking for authentication. Only
|
| @@ -240,8 +240,8 @@ class URLRequestJob : public base::RefCounted<URLRequestJob>,
|
| // that work.
|
| void CompleteNotifyDone();
|
|
|
| - // Used as an asynchronous callback for Kill to notify the URLRequest that
|
| - // we were canceled.
|
| + // Used as an asynchronous callback for Kill to notify the net::URLRequest
|
| + // that we were canceled.
|
| void NotifyCanceled();
|
|
|
| // Notifies the job the request should be restarted.
|
| @@ -256,7 +256,8 @@ class URLRequestJob : public base::RefCounted<URLRequestJob>,
|
| // If returning false, an error occurred or an async IO is now pending.
|
| // If async IO is pending, the status of the request will be
|
| // URLRequestStatus::IO_PENDING, and buf must remain available until the
|
| - // operation is completed. See comments on URLRequest::Read for more info.
|
| + // operation is completed. See comments on net::URLRequest::Read for more
|
| + // info.
|
| virtual bool ReadRawData(net::IOBuffer* buf, int buf_size, int *bytes_read);
|
|
|
| // Informs the filter that data has been read into its buffer
|
| @@ -298,9 +299,10 @@ class URLRequestJob : public base::RefCounted<URLRequestJob>,
|
| int prefilter_bytes_read_;
|
| // The number of bytes read after passing through the filter.
|
| int postfilter_bytes_read_;
|
| - // True when (we believe) the content in this URLRequest was compressible.
|
| + // True when (we believe) the content in this net::URLRequest was
|
| + // compressible.
|
| bool is_compressible_content_;
|
| - // True when the content in this URLRequest was compressed.
|
| + // True when the content in this net::URLRequest was compressed.
|
| bool is_compressed_;
|
|
|
| private:
|
|
|