| Index: chrome/browser/net/url_fetcher.h
|
| ===================================================================
|
| --- chrome/browser/net/url_fetcher.h (revision 9942)
|
| +++ chrome/browser/net/url_fetcher.h (working copy)
|
| @@ -7,16 +7,23 @@
|
| // reading. This is useful for callers who simply want to get the data from a
|
| // URL and don't care about all the nitty-gritty details.
|
|
|
| -#ifndef CHROME_BROWSER_URL_FETCHER_H__
|
| -#define CHROME_BROWSER_URL_FETCHER_H__
|
| +#ifndef CHROME_BROWSER_URL_FETCHER_H_
|
| +#define CHROME_BROWSER_URL_FETCHER_H_
|
|
|
| #include "base/message_loop.h"
|
| #include "base/ref_counted.h"
|
| #include "chrome/browser/net/url_fetcher_protect.h"
|
| -#include "net/url_request/url_request.h"
|
|
|
| +class GURL;
|
| +typedef std::vector<std::string> ResponseCookies;
|
| +class URLFetcher;
|
| class URLRequestContext;
|
| +class URLRequestStatus;
|
|
|
| +namespace net {
|
| +class HttpResponseHeaders;
|
| +}
|
| +
|
| // To use this class, create an instance with the desired URL and a pointer to
|
| // the object to be notified when the URL has been loaded:
|
| // URLFetcher* fetcher = new URLFetcher("http://www.google.com", this);
|
| @@ -74,60 +81,45 @@
|
| // |d| the object that will receive the callback on fetch completion.
|
| URLFetcher(const GURL& url, RequestType request_type, Delegate* d);
|
|
|
| + ~URLFetcher();
|
| +
|
| // This should only be used by unittests, where g_browser_process->io_thread()
|
| // does not exist and we must specify an alternate loop. Unfortunately, we
|
| // can't put it under #ifdef UNIT_TEST since some callers (which themselves
|
| // should only be reached in unit tests) use this. See
|
| // chrome/browser/feeds/feed_manager.cc.
|
| - void set_io_loop(MessageLoop* io_loop) {
|
| - core_->io_loop_ = io_loop;
|
| - }
|
| + void set_io_loop(MessageLoop* io_loop);
|
|
|
| // Sets data only needed by POSTs. All callers making POST requests should
|
| // call this before the request is started. |upload_content_type| is the MIME
|
| // type of the content, while |upload_content| is the data to be sent (the
|
| // Content-Length header value will be set to the length of this data).
|
| void set_upload_data(const std::string& upload_content_type,
|
| - const std::string& upload_content) {
|
| - core_->upload_content_type_ = upload_content_type;
|
| - core_->upload_content_ = upload_content;
|
| - }
|
| + const std::string& upload_content);
|
|
|
| // Set one or more load flags as defined in net/base/load_flags.h. Must be
|
| // called before the request is started.
|
| - void set_load_flags(int load_flags) {
|
| - core_->load_flags_ = load_flags;
|
| - }
|
| + void set_load_flags(int load_flags);
|
|
|
| // Set extra headers on the request. Must be called before the request
|
| // is started.
|
| - void set_extra_request_headers(const std::string& extra_request_headers) {
|
| - core_->extra_request_headers_ = extra_request_headers;
|
| - }
|
| + void set_extra_request_headers(const std::string& extra_request_headers);
|
|
|
| // Set the URLRequestContext on the request. Must be called before the
|
| // request is started.
|
| - void set_request_context(URLRequestContext* request_context) {
|
| - core_->request_context_ = request_context;
|
| - }
|
| + void set_request_context(URLRequestContext* request_context);
|
|
|
| // Retrieve the response headers from the request. Must only be called after
|
| // the OnURLFetchComplete callback has run.
|
| - net::HttpResponseHeaders* response_headers() const {
|
| - return core_->response_headers_;
|
| - }
|
| + net::HttpResponseHeaders* response_headers() const;
|
|
|
| // Start the request. After this is called, you may not change any other
|
| // settings.
|
| - void Start() { core_->Start(); }
|
| + void Start();
|
|
|
| // Return the URL that this fetcher is processing.
|
| - const GURL& url() const {
|
| - return core_->url_;
|
| - }
|
| + const GURL& url() const;
|
|
|
| - ~URLFetcher();
|
| -
|
| private:
|
| // This class is the real guts of URLFetcher.
|
| //
|
| @@ -137,84 +129,11 @@
|
| // thread (since that class is not currently threadsafe and relies on
|
| // underlying Microsoft APIs that we don't know to be threadsafe), while
|
| // keeping the delegate callback on the delegate's thread.
|
| - class Core : public base::RefCountedThreadSafe<URLFetcher::Core>,
|
| - public 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
|
| - // the load operation--these should be one or more of the LOAD_* flags
|
| - // defined in url_request.h.
|
| - Core(URLFetcher* fetcher,
|
| - const GURL& original_url,
|
| - RequestType request_type,
|
| - URLFetcher::Delegate* d);
|
| + class Core;
|
|
|
| - // Starts the load. It's important that this not happen in the constructor
|
| - // because it causes the IO thread to begin AddRef()ing and Release()ing
|
| - // us. If our caller hasn't had time to fully construct us and take a
|
| - // reference, the IO thread could interrupt things, run a task, Release()
|
| - // us, and destroy us, leaving the caller with an already-destroyed object
|
| - // when construction finishes.
|
| - void Start();
|
| -
|
| - // Stops any in-progress load and ensures no callback will happen. It is
|
| - // safe to call this multiple times.
|
| - void Stop();
|
| -
|
| - // URLRequest::Delegate implementations
|
| - virtual void OnReceivedRedirect(URLRequest* request,
|
| - const GURL& new_url) { }
|
| - virtual void OnResponseStarted(URLRequest* request);
|
| - virtual void OnReadCompleted(URLRequest* request, int bytes_read);
|
| -
|
| - private:
|
| - // Wrapper functions that allow us to ensure actions happen on the right
|
| - // thread.
|
| - void StartURLRequest();
|
| - void CancelURLRequest();
|
| - void OnCompletedURLRequest(const URLRequestStatus& status);
|
| -
|
| - URLFetcher* fetcher_; // Corresponding fetcher object
|
| - GURL original_url_; // The URL we were asked to fetch
|
| - GURL url_; // The URL we eventually wound up at
|
| - RequestType request_type_; // What type of request is this?
|
| - URLFetcher::Delegate* delegate_; // Object to notify on completion
|
| - MessageLoop* delegate_loop_; // Message loop of the creating thread
|
| - MessageLoop* io_loop_; // Message loop of the IO thread
|
| - 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
|
| - scoped_refptr<net::IOBuffer> buffer_;
|
| - // Read buffer
|
| - scoped_refptr<URLRequestContext> request_context_;
|
| - // Cookie/cache info for the request
|
| - ResponseCookies cookies_; // Response cookies
|
| - std::string extra_request_headers_;// Extra headers for the request, if any
|
| - scoped_refptr<net::HttpResponseHeaders> response_headers_;
|
| -
|
| - std::string upload_content_; // HTTP POST payload
|
| - std::string upload_content_type_; // MIME type of POST payload
|
| -
|
| - // The overload protection entry for this URL. This is used to
|
| - // incrementally back off how rapidly we'll send requests to a particular
|
| - // URL, to avoid placing too much demand on the remote resource. We update
|
| - // this with the status of all requests as they return, and in turn use it
|
| - // to determine how long to wait before making another request.
|
| - URLFetcherProtectEntry* protect_entry_;
|
| - // |num_retries_| indicates how many times we've failed to successfully
|
| - // fetch this URL. Once this value exceeds the maximum number of retries
|
| - // specified by the protection manager, we'll give up.
|
| - int num_retries_;
|
| -
|
| - friend class URLFetcher;
|
| - DISALLOW_EVIL_CONSTRUCTORS(Core);
|
| - };
|
| -
|
| scoped_refptr<Core> core_;
|
|
|
| DISALLOW_EVIL_CONSTRUCTORS(URLFetcher);
|
| };
|
|
|
| -#endif // CHROME_BROWSER_URL_FETCHER_H__
|
| -
|
| +#endif // CHROME_BROWSER_URL_FETCHER_H_
|
|
|