diff options
author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-15 18:58:10 +0000 |
---|---|---|
committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-15 18:58:10 +0000 |
commit | e89b77dfdb077be0254ce8f0ca84ea536ab4d6e7 (patch) | |
tree | d5b6744a7feaa6249d049f58d29c42ea74bb7fc2 /chrome/browser/renderer_host | |
parent | e6b761eb74e0ac2909afca9e209de1ccdd2eb097 (diff) | |
download | chromium_src-e89b77dfdb077be0254ce8f0ca84ea536ab4d6e7.zip chromium_src-e89b77dfdb077be0254ce8f0ca84ea536ab4d6e7.tar.gz chromium_src-e89b77dfdb077be0254ce8f0ca84ea536ab4d6e7.tar.bz2 |
Create a content::ResourceContext.
Each Profile will have a ResourceContext which lives within the ProfileIOData on the IO thread, although it is created on the UI thread (since that's where the ProfileIOData is created).
Move webkit_database::DatabaseTracker into ResourceContext and out of ChromeURLRequestContext.
Fixed WorkerProcessHost to create its own ResourceMessageFilter that uses a URLRequestContextOverride pointing to its own URLRequestContext, rather than using the default request context.
BUG=78596
TEST=existing
Review URL: http://codereview.chromium.org/6825038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81774 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/renderer_host')
-rw-r--r-- | chrome/browser/renderer_host/browser_render_process_host.cc | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc index 951b5f7..6a5364d 100644 --- a/chrome/browser/renderer_host/browser_render_process_host.cc +++ b/chrome/browser/renderer_host/browser_render_process_host.cc @@ -465,6 +465,7 @@ void BrowserRenderProcessHost::CreateMessageFilters() { ResourceMessageFilter* resource_message_filter = new ResourceMessageFilter( id(), ChildProcessInfo::RENDER_PROCESS, + &profile()->GetResourceContext(), g_browser_process->resource_dispatcher_host()); resource_message_filter->set_url_request_context_override( url_request_context_override); @@ -507,12 +508,14 @@ void BrowserRenderProcessHost::CreateMessageFilters() { channel_->AddFilter(socket_stream_dispatcher_host); channel_->AddFilter(new SpellCheckMessageFilter()); - channel_->AddFilter(new WorkerMessageFilter( - id(), - profile()->GetRequestContext(), - g_browser_process->resource_dispatcher_host(), - NewCallbackWithReturnValue( - widget_helper_.get(), &RenderWidgetHelper::GetNextRoutingID))); + channel_->AddFilter( + new WorkerMessageFilter( + id(), + profile()->GetRequestContext(), + &profile()->GetResourceContext(), + g_browser_process->resource_dispatcher_host(), + NewCallbackWithReturnValue( + widget_helper_.get(), &RenderWidgetHelper::GetNextRoutingID))); if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableP2PApi)) channel_->AddFilter(new P2PSocketDispatcherHost()); |