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

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

Issue 1398473002: Revert the fix for 538784. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@no_isolate_apps3_fix_unittest
Patch Set: Change upstream. Created 5 years, 2 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 | « no previous file | content/browser/loader/cross_site_resource_handler_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/loader/cross_site_resource_handler.cc
diff --git a/content/browser/loader/cross_site_resource_handler.cc b/content/browser/loader/cross_site_resource_handler.cc
index 0b9e6a77aa1f38a0dd34b668a1681bedc5d9fcbe..4539735733a149c27124d14ce2d0e71f5f4d57ae 100644
--- a/content/browser/loader/cross_site_resource_handler.cc
+++ b/content/browser/loader/cross_site_resource_handler.cc
@@ -96,8 +96,10 @@ CheckNavigationPolicyOnUI(GURL real_url, int process_id, int render_frame_id) {
// Without a valid RFH against which to check, we must cancel the request,
// to prevent the resource at |url| from being delivered to a potentially
// unsuitable renderer process.
+ // TODO(nick): Switch this back to NavigationDecision::CANCEL once we fix
+ // existing transfer unittests that don't specify a valid rfh ID.
if (!rfh)
- return CrossSiteResourceHandler::NavigationDecision::CANCEL_REQUEST;
+ return CrossSiteResourceHandler::NavigationDecision::USE_EXISTING_RENDERER;
RenderFrameHostManager* manager = rfh->frame_tree_node()->render_manager();
if (manager->IsRendererTransferNeededForNavigation(rfh, real_url))
« no previous file with comments | « no previous file | content/browser/loader/cross_site_resource_handler_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698