summaryrefslogtreecommitdiffstats
path: root/content/browser/worker_host
diff options
context:
space:
mode:
authormichaeln@google.com <michaeln@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-04 21:16:19 +0000
committermichaeln@google.com <michaeln@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-04 21:16:19 +0000
commitf49c0bb7c10c7905812c71ff849b25d00d681ce1 (patch)
tree84378b79f60a432c8d87f80e6751f1dd5ddcc65d /content/browser/worker_host
parent6c5b9b59bd5be7652134bda94dc75ef505adc1b1 (diff)
downloadchromium_src-f49c0bb7c10c7905812c71ff849b25d00d681ce1.zip
chromium_src-f49c0bb7c10c7905812c71ff849b25d00d681ce1.tar.gz
chromium_src-f49c0bb7c10c7905812c71ff849b25d00d681ce1.tar.bz2
Fix an AppCache crash due to a dangling ResourceContext ptr.
- add GetAppCacheService() to the content::BrowserContext interface - no longer depend on ResourceContext to retrieve the AppCacheService reference in AppCacheDispatcherHost Also treat the FileSystemContext / FileSytemDispatcherHost in the same way. BUG=95118 Review URL: http://codereview.chromium.org/7832012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99611 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/worker_host')
-rw-r--r--content/browser/worker_host/worker_process_host.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/content/browser/worker_host/worker_process_host.cc b/content/browser/worker_host/worker_process_host.cc
index 2639771..e8dbb67 100644
--- a/content/browser/worker_host/worker_process_host.cc
+++ b/content/browser/worker_host/worker_process_host.cc
@@ -253,12 +253,13 @@ void WorkerProcessHost::CreateMessageFilters(int render_process_id) {
NewCallbackWithReturnValue(
WorkerService::GetInstance(), &WorkerService::next_worker_route_id));
AddFilter(worker_message_filter_);
- AddFilter(new AppCacheDispatcherHost(resource_context_, id()));
+ AddFilter(new AppCacheDispatcherHost(
+ resource_context_->appcache_service(), id()));
AddFilter(new FileSystemDispatcherHost(
request_context, resource_context_->file_system_context()));
AddFilter(new FileUtilitiesMessageFilter(id()));
- AddFilter(
- new BlobMessageFilter(id(), resource_context_->blob_storage_context()));
+ AddFilter(new BlobMessageFilter(
+ id(), resource_context_->blob_storage_context()));
AddFilter(new MimeRegistryMessageFilter());
AddFilter(new DatabaseMessageFilter(
resource_context_->database_tracker()));