| Index: chrome/browser/net/chrome_network_delegate.cc
|
| diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/chrome_network_delegate.cc
|
| index 9348cef93a3ee3ca9c641bd4eb4e504d006de7cd..cb468cdcbc167843324f9defa507b4aa0a3f4a31 100644
|
| --- a/chrome/browser/net/chrome_network_delegate.cc
|
| +++ b/chrome/browser/net/chrome_network_delegate.cc
|
| @@ -377,9 +377,18 @@ int ChromeNetworkDelegate::OnBeforeURLRequest(
|
| // TODO(joaodasilva): This prevents extensions from seeing URLs that are
|
| // blocked. However, an extension might redirect the request to another URL,
|
| // which is not blocked.
|
| +
|
| + bool is_request_for_frame = false;
|
| + const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request);
|
| + if (info) {
|
| + is_request_for_frame =
|
| + content::IsResourceTypeFrame(info->GetResourceType());
|
| + }
|
| +
|
| int error = net::ERR_BLOCKED_BY_ADMINISTRATOR;
|
| if (url_blacklist_manager_ &&
|
| - url_blacklist_manager_->IsRequestBlocked(*request, &error)) {
|
| + url_blacklist_manager_->IsRequestBlocked(
|
| + request->url(), is_request_for_frame, &error)) {
|
| // URL access blocked by policy.
|
| request->net_log().AddEvent(
|
| net::NetLog::TYPE_CHROME_POLICY_ABORTED_REQUEST,
|
|
|