Fix for WebView accessible resources.

chrome/renderer/chrome_content_renderer_client.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/renderer/chrome_content_renderer_client.h"
 
 #include "base/command_line.h"
 #include "base/debug/crash_logging.h"
 #include "base/logging.h"
 #include "base/metrics/field_trial.h"
@@ skipping 386 matching lines @@
       new ChromeExtensionsDispatcherDelegate());
   // ChromeRenderViewTest::SetUp() creates its own ExtensionDispatcher and
   // injects it using SetExtensionDispatcher(). Don't overwrite it.
   if (!extension_dispatcher_) {
     extension_dispatcher_.reset(
         new extensions::Dispatcher(extension_dispatcher_delegate_.get()));
   }
   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
 
   prescient_networking_dispatcher_.reset(
       new network_hints::PrescientNetworkingDispatcher());
 #if defined(ENABLE_SPELLCHECK)
   // ChromeRenderViewTest::SetUp() creates a Spellcheck and injects it using
   // SetSpellcheck(). Don't overwrite it.
   if (!spellcheck_) {
@@ skipping 864 matching lines @@
 bool ChromeContentRendererClient::WillSendRequest(
     blink::WebFrame* frame,
     ui::PageTransition transition_type,
     const GURL& url,
     const GURL& first_party_for_cookies,
     GURL* new_url) {
   // Check whether the request should be allowed. If not allowed, we reset the
   // 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 be safer to use this check
anyways in case someone changes something in the future that makes it possible
to be null. I'll remove it though.

[not at google - send to devlin, 2015/09/08 20:10:24]

If somebody changes it to be null, they can deal with it (... and the crash it
will cause). By default nothing should be null.

+        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;
   }
 #endif
 
   const content::RenderView* render_view =
       content::RenderView::FromWebView(frame->view());
   SearchBox* search_box = SearchBox::Get(render_view);
   if (search_box && url.SchemeIs(chrome::kChromeSearchScheme)) {
     SearchBox::ImageSourceType type = SearchBox::NONE;
@@ skipping 331 matching lines @@
       context, url);
 #endif
 }
 
 void ChromeContentRendererClient::WillDestroyServiceWorkerContextOnWorkerThread(
     const GURL& url) {
 #if defined(ENABLE_EXTENSIONS)
   extensions::Dispatcher::WillDestroyServiceWorkerContextOnWorkerThread(url);
 #endif
 }