diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-15 21:09:56 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-15 21:09:56 +0000 |
| commit | 07578ba5d0ee4653a6c22899c4991b4d20163388 (patch) | |
| tree | 4bb9cf3620bbf97597dee958614449c26a818fcf /chrome/browser/renderer_host/resource_dispatcher_host.cc | |
| parent | d906d5217d397250c6569ce93f9d1af80a407d0c (diff) | |
| download | chromium_src-07578ba5d0ee4653a6c22899c4991b4d20163388.zip chromium_src-07578ba5d0ee4653a6c22899c4991b4d20163388.tar.gz chromium_src-07578ba5d0ee4653a6c22899c4991b4d20163388.tar.bz2 | |
revert r16181 as it broke linux
TBR=jam
Review URL: http://codereview.chromium.org/115418
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16183 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/renderer_host/resource_dispatcher_host.cc')
| -rw-r--r-- | chrome/browser/renderer_host/resource_dispatcher_host.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/renderer_host/resource_dispatcher_host.cc b/chrome/browser/renderer_host/resource_dispatcher_host.cc index e091819..3f0075b 100644 --- a/chrome/browser/renderer_host/resource_dispatcher_host.cc +++ b/chrome/browser/renderer_host/resource_dispatcher_host.cc @@ -13,7 +13,6 @@ #include "base/stl_util-inl.h" #include "base/time.h" #include "chrome/browser/cert_store.h" -#include "chrome/browser/child_process_security_policy.h" #include "chrome/browser/cross_site_request_manager.h" #include "chrome/browser/download/download_file.h" #include "chrome/browser/download/download_manager.h" @@ -28,6 +27,7 @@ #include "chrome/browser/renderer_host/download_resource_handler.h" #include "chrome/browser/renderer_host/media_resource_handler.h" #include "chrome/browser/renderer_host/render_view_host.h" +#include "chrome/browser/renderer_host/renderer_security_policy.h" #include "chrome/browser/renderer_host/resource_request_details.h" #include "chrome/browser/renderer_host/safe_browsing_resource_handler.h" #include "chrome/browser/renderer_host/save_file_resource_handler.h" @@ -109,7 +109,7 @@ bool ShouldServiceRequest(ChildProcessInfo::ProcessType process_type, if (process_type != ChildProcessInfo::RENDER_PROCESS) return true; - ChildProcessSecurityPolicy* policy = ChildProcessSecurityPolicy::GetInstance(); + RendererSecurityPolicy* policy = RendererSecurityPolicy::GetInstance(); // Check if the renderer is permitted to request the requested URL. if (!policy->CanRequestURL(process_id, request_data.url)) { @@ -484,7 +484,7 @@ void ResourceDispatcherHost::BeginDownload(const GURL& url, return; // Check if the renderer is permitted to request the requested URL. - if (!ChildProcessSecurityPolicy::GetInstance()-> + if (!RendererSecurityPolicy::GetInstance()-> CanRequestURL(process_id, url)) { LOG(INFO) << "Denied unauthorized download request for " << url.possibly_invalid_spec(); @@ -821,7 +821,7 @@ void ResourceDispatcherHost::OnReceivedRedirect(URLRequest* request, DCHECK(request->status().is_success()); if (info->process_type == ChildProcessInfo::RENDER_PROCESS && - !ChildProcessSecurityPolicy::GetInstance()-> + !RendererSecurityPolicy::GetInstance()-> CanRequestURL(info->process_id, new_url)) { LOG(INFO) << "Denied unauthorized request for " << new_url.possibly_invalid_spec(); |