| Index: net/url_request/url_request.h
|
| diff --git a/net/url_request/url_request.h b/net/url_request/url_request.h
|
| index 091f23f2e8d7976c235ada1c52eb59a7254535d7..4a2a2e442a481e860ab32cbb4cb241bf95c1d292 100644
|
| --- a/net/url_request/url_request.h
|
| +++ b/net/url_request/url_request.h
|
| @@ -312,11 +312,17 @@ class NET_EXPORT URLRequest : NON_EXPORTED_BASE(public base::NonThreadSafe),
|
| virtual ~Delegate() {}
|
| };
|
|
|
| + // TODO(shalev): Get rid of this constructor in favour of the one below it.
|
| // Initialize an URL request.
|
| URLRequest(const GURL& url,
|
| Delegate* delegate,
|
| const URLRequestContext* context);
|
|
|
| + URLRequest(const GURL& url,
|
| + Delegate* delegate,
|
| + const URLRequestContext* context,
|
| + NetworkDelegate* network_delegate);
|
| +
|
| // If destroyed after Start() has been called but while IO is pending,
|
| // then the request will be effectively canceled and the delegate
|
| // will not have any more of its methods called.
|
| @@ -734,11 +740,13 @@ class NET_EXPORT URLRequest : NON_EXPORTED_BASE(public base::NonThreadSafe),
|
| void SetBlockedOnDelegate();
|
| void SetUnblockedOnDelegate();
|
|
|
| - // Contextual information used for this request (can be NULL). This contains
|
| + // Contextual information used for this request. Cannot be NULL. This contains
|
| // most of the dependencies which are shared between requests (disk cache,
|
| // cookie store, socket pool, etc.)
|
| const URLRequestContext* context_;
|
|
|
| + NetworkDelegate* network_delegate_;
|
| +
|
| // Tracks the time spent in various load states throughout this request.
|
| BoundNetLog net_log_;
|
|
|
|
|