| Index: mojo/shell/url_request_context_getter.h
|
| diff --git a/mojo/shell/url_request_context_getter.h b/mojo/shell/url_request_context_getter.h
|
| index 67830e7c5c5e992e59ec714dbd7990d3f9c3c620..cc9125ddc66ca8bf628eab57bf5e05deeefc0fc4 100644
|
| --- a/mojo/shell/url_request_context_getter.h
|
| +++ b/mojo/shell/url_request_context_getter.h
|
| @@ -8,6 +8,7 @@
|
| #include "base/files/file_path.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/message_loop/message_loop_proxy.h"
|
| +#include "net/base/network_delegate.h"
|
| #include "net/url_request/url_request_context_getter.h"
|
| #include "net/url_request/url_request_context_storage.h"
|
|
|
| @@ -19,7 +20,9 @@ class URLRequestContextGetter : public net::URLRequestContextGetter {
|
| URLRequestContextGetter(
|
| base::FilePath base_path,
|
| base::SingleThreadTaskRunner* network_task_runner,
|
| - base::MessageLoopProxy* cache_task_runner);
|
| + base::SingleThreadTaskRunner* file_task_runner,
|
| + base::MessageLoopProxy* cache_task_runner,
|
| + scoped_ptr<net::NetworkDelegate> network_delegate);
|
|
|
| virtual net::URLRequestContext* GetURLRequestContext() OVERRIDE;
|
| virtual scoped_refptr<base::SingleThreadTaskRunner>
|
| @@ -30,8 +33,10 @@ class URLRequestContextGetter : public net::URLRequestContextGetter {
|
|
|
| private:
|
| base::FilePath base_path_;
|
| + scoped_refptr<base::SingleThreadTaskRunner> file_task_runner_;
|
| scoped_refptr<base::SingleThreadTaskRunner> network_task_runner_;
|
| scoped_refptr<base::MessageLoopProxy> cache_task_runner_;
|
| + scoped_ptr<net::NetworkDelegate> network_delegate_;
|
| scoped_ptr<net::NetLog> net_log_;
|
| scoped_ptr<net::URLRequestContextStorage> storage_;
|
| scoped_ptr<net::URLRequestContext> url_request_context_;
|
|
|