| Index: content/common/net/url_fetcher_core.h
|
| diff --git a/content/common/net/url_fetcher_core.h b/content/common/net/url_fetcher_core.h
|
| index e02ef27651684e0b5e47a415a0e4d300175eaa94..9694a83dbe78428e7c5b54ceb82807be47669381 100644
|
| --- a/content/common/net/url_fetcher_core.h
|
| +++ b/content/common/net/url_fetcher_core.h
|
| @@ -34,14 +34,13 @@ class MessageLoopProxy;
|
| namespace net {
|
| class HttpResponseHeaders;
|
| class IOBuffer;
|
| +class URLFetcherDelegate;
|
| class URLRequestContextGetter;
|
| class URLRequestThrottlerEntryInterface;
|
| } // namespace net
|
|
|
| namespace content {
|
|
|
| -class URLFetcherDelegate;
|
| -
|
| class URLFetcherCore
|
| : public base::RefCountedThreadSafe<URLFetcherCore>,
|
| public net::URLRequest::Delegate {
|
| @@ -49,7 +48,7 @@ class URLFetcherCore
|
| URLFetcherCore(URLFetcher* fetcher,
|
| const GURL& original_url,
|
| URLFetcher::RequestType request_type,
|
| - URLFetcherDelegate* d);
|
| + net::URLFetcherDelegate* d);
|
|
|
| // 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
|
| @@ -125,7 +124,7 @@ class URLFetcherCore
|
| virtual void OnReadCompleted(
|
| net::URLRequest* request, int bytes_read) OVERRIDE;
|
|
|
| - URLFetcherDelegate* delegate() const { return delegate_; }
|
| + net::URLFetcherDelegate* delegate() const { return delegate_; }
|
| static void CancelAll();
|
| static int GetNumFetcherCores();
|
| static void SetEnableInterceptionForTests(bool enabled);
|
| @@ -300,7 +299,7 @@ class URLFetcherCore
|
| GURL url_; // The URL we eventually wound up at
|
| URLFetcher::RequestType request_type_; // What type of request is this?
|
| net::URLRequestStatus status_; // Status of the request
|
| - URLFetcherDelegate* delegate_; // Object to notify on completion
|
| + net::URLFetcherDelegate* delegate_; // Object to notify on completion
|
| scoped_refptr<base::MessageLoopProxy> delegate_loop_proxy_;
|
| // Message loop proxy of the creating
|
| // thread.
|
|
|