| Index: net/url_request/url_fetcher_core.h
|
| diff --git a/net/url_request/url_fetcher_core.h b/net/url_request/url_fetcher_core.h
|
| index abf42b5248cea10a90bc7a2bcf7d6c8ecd229b8f..a5f27f59ecf6be380b624e78b54adb306de787e0 100644
|
| --- a/net/url_request/url_fetcher_core.h
|
| +++ b/net/url_request/url_fetcher_core.h
|
| @@ -36,9 +36,8 @@ class URLFetcherResponseWriter;
|
| class URLRequestContextGetter;
|
| class URLRequestThrottlerEntryInterface;
|
|
|
| -class URLFetcherCore
|
| - : public base::RefCountedThreadSafe<URLFetcherCore>,
|
| - public URLRequest::Delegate {
|
| +class URLFetcherCore : public base::RefCountedThreadSafe<URLFetcherCore>,
|
| + public URLRequest::Delegate {
|
| public:
|
| URLFetcherCore(URLFetcher* fetcher,
|
| const GURL& original_url,
|
| @@ -126,8 +125,7 @@ class URLFetcherCore
|
| const GURL& new_url,
|
| bool* defer_redirect) OVERRIDE;
|
| virtual void OnResponseStarted(URLRequest* request) OVERRIDE;
|
| - virtual void OnReadCompleted(URLRequest* request,
|
| - int bytes_read) OVERRIDE;
|
| + virtual void OnReadCompleted(URLRequest* request, int bytes_read) OVERRIDE;
|
| virtual void OnCertificateRequested(
|
| URLRequest* request,
|
| SSLCertRequestInfo* cert_request_info) OVERRIDE;
|
| @@ -151,9 +149,7 @@ class URLFetcherCore
|
|
|
| void CancelAll();
|
|
|
| - int size() const {
|
| - return fetchers_.size();
|
| - }
|
| + int size() const { return fetchers_.size(); }
|
|
|
| private:
|
| std::set<URLFetcherCore*> fetchers_;
|
| @@ -205,30 +201,30 @@ class URLFetcherCore
|
| void InformDelegateDownloadProgressInDelegateThread(int64 current,
|
| int64 total);
|
|
|
| - URLFetcher* fetcher_; // Corresponding fetcher object
|
| - GURL original_url_; // The URL we were asked to fetch
|
| - GURL url_; // The URL we eventually wound up at
|
| + URLFetcher* fetcher_; // Corresponding fetcher object
|
| + GURL original_url_; // The URL we were asked to fetch
|
| + GURL url_; // The URL we eventually wound up at
|
| URLFetcher::RequestType request_type_; // What type of request is this?
|
| - URLRequestStatus status_; // Status of the request
|
| - URLFetcherDelegate* delegate_; // Object to notify on completion
|
| + URLRequestStatus status_; // Status of the request
|
| + URLFetcherDelegate* delegate_; // Object to notify on completion
|
| // Task runner for the creating thread. Used to interact with the delegate.
|
| scoped_refptr<base::SingleThreadTaskRunner> delegate_task_runner_;
|
| // Task runner for network operations.
|
| scoped_refptr<base::SingleThreadTaskRunner> network_task_runner_;
|
| // Task runner for upload file access.
|
| scoped_refptr<base::TaskRunner> upload_file_task_runner_;
|
| - scoped_ptr<URLRequest> request_; // The actual request this wraps
|
| - int load_flags_; // Flags for the load operation
|
| - int response_code_; // HTTP status code for the request
|
| + scoped_ptr<URLRequest> request_; // The actual request this wraps
|
| + int load_flags_; // Flags for the load operation
|
| + int response_code_; // HTTP status code for the request
|
| scoped_refptr<IOBuffer> buffer_;
|
| - // Read buffer
|
| + // Read buffer
|
| scoped_refptr<URLRequestContextGetter> request_context_getter_;
|
| - // Cookie/cache info for the request
|
| - GURL first_party_for_cookies_; // The first party URL for the request
|
| + // Cookie/cache info for the request
|
| + GURL first_party_for_cookies_; // The first party URL for the request
|
| // The user data to add to each newly-created URLRequest.
|
| const void* url_request_data_key_;
|
| URLFetcher::CreateDataCallback url_request_create_data_callback_;
|
| - ResponseCookies cookies_; // Response cookies
|
| + ResponseCookies cookies_; // Response cookies
|
| HttpRequestHeaders extra_request_headers_;
|
| scoped_refptr<HttpResponseHeaders> response_headers_;
|
| bool was_fetched_via_proxy_;
|
| @@ -244,7 +240,7 @@ class URLFetcherCore
|
| std::string upload_content_type_; // MIME type of POST payload
|
| std::string referrer_; // HTTP Referer header value and policy
|
| URLRequest::ReferrerPolicy referrer_policy_;
|
| - bool is_chunked_upload_; // True if using chunked transfer encoding
|
| + bool is_chunked_upload_; // True if using chunked transfer encoding
|
|
|
| // Used to determine how long to wait before making a request or doing a
|
| // retry.
|
|
|