Allows webview to access extension resources.

chrome/browser/extensions/url_request_util.cc

Index: chrome/browser/extensions/url_request_util.cc
diff --git a/chrome/browser/extensions/url_request_util.cc b/chrome/browser/extensions/url_request_util.cc
index 1d3a84ccbf07dec15969e2db551addc59f5b814c..0d72f45a816ced849b0b64b422be275efbf04511 100644
--- a/chrome/browser/extensions/url_request_util.cc
+++ b/chrome/browser/extensions/url_request_util.cc
@@ -22,6 +22,7 @@
 #include "extensions/browser/extensions_browser_client.h"
 #include "extensions/browser/guest_view/web_view/web_view_renderer_state.h"
 #include "extensions/browser/info_map.h"
+#include "extensions/browser/url_request_util.h"
 #include "extensions/common/file_util.h"
 #include "extensions/common/manifest_handlers/icons_handler.h"
 #include "extensions/common/manifest_handlers/web_accessible_resources_info.h"
@@ -133,25 +134,19 @@ class URLRequestResourceBundleJob : public net::URLRequestSimpleJob {
 namespace extensions {
 namespace url_request_util {
 
-bool AllowCrossRendererResourceLoad(net::URLRequest* request,
-                                    bool is_incognito,
-                                    const Extension* extension,
-                                    InfoMap* extension_info_map) {
+bool ChromeAllowCrossRendererResourceLoad(net::URLRequest* request,
+                                          bool is_incognito,
+                                          const Extension* extension,
+                                          InfoMap* extension_info_map) {
   const content::ResourceRequestInfo* info =
       content::ResourceRequestInfo::ForRequest(request);
 
-  bool is_guest = false;
-
-  // Extensions with webview: allow loading certain resources by guest renderers
-  // with privileged partition IDs as specified in the manifest file.
-  WebViewRendererState* web_view_renderer_state =
-      WebViewRendererState::GetInstance();
   std::string partition_id;
-  is_guest = web_view_renderer_state->GetPartitionID(info->GetChildID(),
-                                                     &partition_id);
-  std::string resource_path = request->url().path();
-  if (is_guest && WebviewInfo::IsResourceWebviewAccessible(
-                      extension, partition_id, resource_path)) {
+  bool is_guest = WebViewRendererState::GetInstance()->GetPartitionID(
+      info->GetChildID(), &partition_id);
+
+  if (AllowCrossRendererResourceLoad(
+          request, is_incognito, extension, extension_info_map)) {
     return true;
   }
 
@@ -239,14 +234,5 @@ net::URLRequestJob* MaybeCreateURLRequestResourceBundleJob(
   return NULL;
 }
 
-bool IsWebViewRequest(net::URLRequest* request) {
-  const content::ResourceRequestInfo* info =
-      content::ResourceRequestInfo::ForRequest(request);
-  // |info| can be NULL sometimes: http://crbug.com/370070.
-  if (!info)
-    return false;
-  return WebViewRendererState::GetInstance()->IsGuest(info->GetChildID());
-}
-
 }  // namespace url_request_util
 }  // namespace extensions