Whitelist all content for various internal schemes.

BUG=34805
TEST=New Tab page should still work if you disable script + images
Review URL: http://codereview.chromium.org/588011

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38536 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 3 deletions

diff --git a/chrome/browser/renderer_host/async_resource_handler.cc b/chrome/browser/renderer_host/async_resource_handler.cc
index 6cba3f4..da1a74e 100644
--- a/chrome/browser/renderer_host/async_resource_handler.cc
+++ b/chrome/browser/renderer_host/async_resource_handler.cc
@@ -109,13 +109,15 @@ bool AsyncResourceHandler::OnResponseStarted(int request_id,
       GlobalRequestID(process_id_, request_id));
   ResourceDispatcherHostRequestInfo* info = rdh_->InfoForRequest(request);
   if (info->resource_type() == ResourceType::MAIN_FRAME) {
-    std::string host(request->url().host());
+    GURL request_url(request->url());
+    std::string host(request_url.host());
     ChromeURLRequestContext* context =
         static_cast<ChromeURLRequestContext*>(request->context());
     if (!host.empty() && context) {
       receiver_->Send(new ViewMsg_SetContentSettingsForLoadingHost(
-            info->route_id(), host,
-            context->host_content_settings_map()->GetContentSettings(host)));
+          info->route_id(), host,
+          context->host_content_settings_map()->GetContentSettings(
+              request_url)));
       receiver_->Send(new ViewMsg_SetZoomLevelForLoadingHost(info->route_id(),
           host, context->host_zoom_map()->GetZoomLevel(host)));
     }