| Index: content/browser/worker_host/worker_message_filter.h
|
| diff --git a/content/browser/worker_host/worker_message_filter.h b/content/browser/worker_host/worker_message_filter.h
|
| index 3ffb2bb00a0923c69af460aa2921787dd6a8b86c..69f8008a7d4dfcd584a8cd09c5da4ec5a0286fa9 100644
|
| --- a/content/browser/worker_host/worker_message_filter.h
|
| +++ b/content/browser/worker_host/worker_message_filter.h
|
| @@ -8,11 +8,16 @@
|
| #include "base/callback.h"
|
| #include "content/browser/browser_message_filter.h"
|
|
|
| -class ResourceDispatcherHost;
|
| -
|
| +namespace content {
|
| +class ResourceContext;
|
| +class ResourceContextGetter;
|
| +} // namespace content
|
| namespace net {
|
| +class URLRequestContext;
|
| class URLRequestContextGetter;
|
| -}
|
| +} // namespace net
|
| +class ResourceDispatcherHost;
|
| +
|
|
|
| struct ViewHostMsg_CreateWorker_Params;
|
|
|
| @@ -22,7 +27,6 @@ class WorkerMessageFilter : public BrowserMessageFilter {
|
| // OnChannelClosing.
|
| WorkerMessageFilter(
|
| int render_process_id,
|
| - net::URLRequestContextGetter* request_context,
|
| ResourceDispatcherHost* resource_dispatcher_host,
|
| CallbackWithReturnValue<int>::Type* next_routing_id);
|
|
|
| @@ -31,6 +35,13 @@ class WorkerMessageFilter : public BrowserMessageFilter {
|
| virtual bool OnMessageReceived(const IPC::Message& message,
|
| bool* message_was_ok);
|
|
|
| + void Init(net::URLRequestContextGetter* request_context_getter,
|
| + content::ResourceContextGetter* resource_context_getter);
|
| +
|
| + void InitOnIOThread(
|
| + net::URLRequestContext* request_context,
|
| + const content::ResourceContext& resource_context);
|
| +
|
| int GetNextRoutingID();
|
| int render_process_id() const { return render_process_id_; }
|
| ResourceDispatcherHost* resource_dispatcher_host() const {
|
| @@ -52,8 +63,14 @@ class WorkerMessageFilter : public BrowserMessageFilter {
|
| void OnDocumentDetached(unsigned long long document_id);
|
| void OnCreateMessagePort(int* route_id, int* message_port_id);
|
|
|
| + net::URLRequestContext* request_context();
|
| + const content::ResourceContext& resource_context();
|
| +
|
| int render_process_id_;
|
| - scoped_refptr<net::URLRequestContextGetter> request_context_;
|
| + scoped_refptr<net::URLRequestContextGetter> request_context_getter_;
|
| + scoped_refptr<net::URLRequestContext> request_context_;
|
| + scoped_ptr<content::ResourceContextGetter> resource_context_getter_;
|
| + const content::ResourceContext* resource_context_;
|
| ResourceDispatcherHost* resource_dispatcher_host_;
|
|
|
| // This is guaranteed to be valid until OnChannelClosing is closed, and it's
|
|
|