Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(538)

Unified Diff: content/browser/worker_host/worker_message_filter.cc

Issue 6825038: Create a content::ResourceContext. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Own database_tracker. Created 9 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/worker_host/worker_message_filter.cc
diff --git a/content/browser/worker_host/worker_message_filter.cc b/content/browser/worker_host/worker_message_filter.cc
index 980f22c63c7b344724153f8c2d2ca7d89ef80b07..d1843745fa311732f446e6dd8d5807c386066070 100644
--- a/content/browser/worker_host/worker_message_filter.cc
+++ b/content/browser/worker_host/worker_message_filter.cc
@@ -5,6 +5,7 @@
#include "content/browser/worker_host/worker_message_filter.h"
#include "chrome/browser/net/chrome_url_request_context.h"
+#include "content/browser/resource_context.h"
#include "content/browser/worker_host/message_port_service.h"
#include "content/browser/worker_host/worker_service.h"
#include "content/common/view_messages.h"
@@ -13,16 +14,19 @@
WorkerMessageFilter::WorkerMessageFilter(
int render_process_id,
- net::URLRequestContextGetter* request_context,
+ net::URLRequestContextGetter* request_context_getter,
+ const content::ResourceContext& resource_context,
ResourceDispatcherHost* resource_dispatcher_host,
CallbackWithReturnValue<int>::Type* next_routing_id)
: render_process_id_(render_process_id),
- request_context_(request_context),
+ request_context_getter_(request_context_getter),
+ resource_context_(&resource_context),
eroman 2011/04/15 03:05:27 Same as my other comment -- I don't think it is ap
willchan no longer on Chromium 2011/04/15 16:58:02 Done.
resource_dispatcher_host_(resource_dispatcher_host),
next_routing_id_(next_routing_id) {
}
WorkerMessageFilter::~WorkerMessageFilter() {
+ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
}
void WorkerMessageFilter::OnChannelClosing() {
@@ -80,7 +84,7 @@ void WorkerMessageFilter::OnCreateWorker(
*route_id = params.route_id != MSG_ROUTING_NONE ?
params.route_id : next_routing_id_->Run();
WorkerService::GetInstance()->CreateWorker(
- params, *route_id, this, request_context_);
+ params, *route_id, this, request_context_getter_, *resource_context_);
}
void WorkerMessageFilter::OnLookupSharedWorker(
@@ -91,7 +95,7 @@ void WorkerMessageFilter::OnLookupSharedWorker(
*route_id = next_routing_id_->Run();
bool incognito = static_cast<ChromeURLRequestContext*>(
- request_context_->GetURLRequestContext())->is_incognito();
+ request_context_getter_->GetURLRequestContext())->is_incognito();
WorkerService::GetInstance()->LookupSharedWorker(
params, *route_id, this, incognito, exists, url_error);
}

Powered by Google App Engine
This is Rietveld 408576698