Allows webview to access extension resources.

chrome/browser/extensions/url_request_util.cc

 // Copyright 2014 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/browser/extensions/url_request_util.h"
 
 #include <string>
 
 #include "base/files/file_path.h"
 #include "base/memory/weak_ptr.h"
 #include "base/path_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/task_runner_util.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/manifest_url_handler.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/resource_request_info.h"
 #include "extensions/browser/component_extension_resource_manager.h"
 #include "extensions/browser/extension_protocols.h"
 #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"
 #include "extensions/common/manifest_handlers/webview_info.h"
 #include "net/base/mime_util.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_request_headers.h"
 #include "net/http/http_response_headers.h"
 #include "net/http/http_response_info.h"
 #include "net/url_request/url_request.h"
@@ skipping 91 matching lines @@
   net::HttpResponseInfo response_info_;
 
   mutable base::WeakPtrFactory<URLRequestResourceBundleJob> weak_factory_;
 };
 
 }  // namespace
 
 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;
+  std::string partition_id;
+  bool is_guest = WebViewRendererState::GetInstance()->GetPartitionID(
+      info->GetChildID(), &partition_id);
 
-  // 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)) {
+  if (AllowCrossRendererResourceLoad(
+          request, is_incognito, extension, extension_info_map)) {
     return true;
   }
 
   // If the request is for navigations outside of webviews, then it should be
   // allowed. The navigation logic in CrossSiteResourceHandler will properly
   // transfer the navigation to a privileged process before it commits.
   if (content::IsResourceTypeFrame(info->GetResourceType()) && !is_guest)

[Fady Samuel, 2014/09/15 19:54:43]

It seems to me that if we move this part into AllowCrossRendererResourceLoad as
well, then we don't need to access WebViewRendererState here at all.

[lfg, 2014/09/15 20:13:20]

Done.

     return true;
 
   if (!content::PageTransitionIsWebTriggerable(info->GetPageTransition()))
     return false;
 
   // The following checks require that we have an actual extension object. If we
   // don't have it, allow the request handling to continue with the rest of the
   // checks.
   if (!extension)
     return true;
@@ skipping 60 matching lines @@
                                              network_delegate,
                                              relative_path,
                                              resource_id,
                                              content_security_policy,
                                              send_cors_header);
     }
   }
   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