Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(295)

Unified Diff: content/browser/loader/resource_loader.cc

Issue 1241953009: Remove CanLoadPage; it's essentially unused, and not compatible with (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/child_process_security_policy_impl.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/loader/resource_loader.cc
diff --git a/content/browser/loader/resource_loader.cc b/content/browser/loader/resource_loader.cc
index 06d0363d7d0f68475233af1b4f0bb1baded8dd18..5c2b9b814c97f6b87ed5fcf805484c880f1fb92c 100644
--- a/content/browser/loader/resource_loader.cc
+++ b/content/browser/loader/resource_loader.cc
@@ -336,19 +336,6 @@ void ResourceLoader::OnResponseStarted(net::URLRequest* unused) {
progress_timer_.Stop();
- // The CanLoadPage check should take place after any server redirects have
- // finished, at the point in time that we know a page will commit in the
- // renderer process.
- ResourceRequestInfoImpl* info = GetRequestInfo();
- ChildProcessSecurityPolicyImpl* policy =
- ChildProcessSecurityPolicyImpl::GetInstance();
- if (!policy->CanLoadPage(info->GetChildID(),
- request_->url(),
- info->GetResourceType())) {
- Cancel();
- return;
- }
-
if (!request_->status().is_success()) {
ResponseCompleted();
return;
@@ -357,6 +344,7 @@ void ResourceLoader::OnResponseStarted(net::URLRequest* unused) {
// We want to send a final upload progress message prior to sending the
// response complete message even if we're waiting for an ack to to a
// previous upload progress message.
+ ResourceRequestInfoImpl* info = GetRequestInfo();
if (info->is_upload_progress_enabled()) {
waiting_for_upload_progress_ack_ = false;
ReportUploadProgress();
« no previous file with comments | « content/browser/child_process_security_policy_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698