Chromium Code Reviews| Index: chrome/renderer/chrome_content_renderer_client.cc |
| diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc |
| index 9991e3b306d86ba9722a1256efed2b1e9aa5daa7..33c1acde2e8fafa6a8e698e23781f971002362e7 100644 |
| --- a/chrome/renderer/chrome_content_renderer_client.cc |
| +++ b/chrome/renderer/chrome_content_renderer_client.cc |
| @@ -404,6 +404,8 @@ void ChromeContentRendererClient::RenderThreadStarted() { |
| permissions_policy_delegate_.reset( |
| new extensions::RendererPermissionsPolicyDelegate( |
| extension_dispatcher_.get())); |
| + resource_request_policy_.reset( |
| + new extensions::ResourceRequestPolicy(extension_dispatcher_.get())); |
| guest_view_container_dispatcher_.reset( |
| new extensions::ExtensionsGuestViewContainerDispatcher()); |
| #endif |
| @@ -1288,16 +1290,17 @@ bool ChromeContentRendererClient::WillSendRequest( |
| // URL to something invalid to prevent the request and cause an error. |
| #if defined(ENABLE_EXTENSIONS) |
| if (url.SchemeIs(extensions::kExtensionScheme) && |
| - !extensions::ResourceRequestPolicy::CanRequestResource(url, frame, |
| - transition_type)) { |
| + !(resource_request_policy_ && |
|
not at google - send to devlin
2015/09/03 20:17:53
I don't think it's possible for this to be null?
paulmeyer
2015/09/08 18:51:36
I didn't think so either, but I thought it would b
not at google - send to devlin
2015/09/08 20:10:24
If somebody changes it to be null, they can deal w
|
| + resource_request_policy_->CanRequestResource(url, frame, |
| + transition_type))) { |
| *new_url = GURL(chrome::kExtensionInvalidRequestURL); |
| return true; |
| } |
| if (url.SchemeIs(extensions::kExtensionResourceScheme) && |
| - !extensions::ResourceRequestPolicy::CanRequestExtensionResourceScheme( |
| - url, |
| - frame)) { |
| + !(resource_request_policy_ && |
| + resource_request_policy_->CanRequestExtensionResourceScheme(url, |
| + frame))) { |
| *new_url = GURL(chrome::kExtensionResourceInvalidRequestURL); |
| return true; |
| } |