Change NavigationEntry to use virtual URL in error pages for blocked navigations

content/browser/frame_host/navigation_controller_impl.cc

 // Copyright 2013 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.
 
 /*
  * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
  *     (http://www.torchmobile.com/)
  *
@@ skipping 144 matching lines @@
     return true;
   }
 
   if (ui::PageTransitionCoreTypeIs(entry->GetTransitionType(),
                                    ui::PAGE_TRANSITION_LINK)) {
     return true;
   }
   return false;
 }
 
+bool IsBlockedNavigation(net::Error error_code) {

[Charlie Reis, 2017/05/24 16:42:11]

Can we include a comment here with some context?  Something about how this is an
imperfect way to infer whether a navigation was blocked or not, and these error
codes are just the ones that are most clearly blocked cases?  We could probably
include a TODO to more formally identify this as well.

[nasko, 2017/05/24 20:46:29]

Done.

+  switch (error_code) {
+    case net::ERR_BLOCKED_BY_CLIENT:
+    case net::ERR_BLOCKED_BY_RESPONSE:
+    case net::ERR_BLOCKED_BY_XSS_AUDITOR:
+    case net::ERR_UNSAFE_REDIRECT:
+      return true;
+    default:
+      return false;
+  }
+}
+
 }  // namespace
 
 // NavigationControllerImpl ----------------------------------------------------
 
 const size_t kMaxEntryCountForTestingNotSet = static_cast<size_t>(-1);
 
 // static
 size_t NavigationControllerImpl::max_entry_count_for_testing_ =
     kMaxEntryCountForTestingNotSet;
 
@@ skipping 751 matching lines @@
   FrameNavigationEntry* frame_entry =
       active_entry->GetFrameEntry(rfh->frame_tree_node());
   // Update the frame-specific PageState and RedirectChain
   // We may not find a frame_entry in some cases; ignore the PageState if so.
   // TODO(creis): Remove the "if" once https://crbug.com/522193 is fixed.
   if (frame_entry) {
     frame_entry->SetPageState(params.page_state);
     frame_entry->set_redirect_chain(params.redirects);
   }
 
+  // When a navigation in the main frame is blocked, it will display an error
+  // page. To avoid loading the blocked URL on back/forward/reload navigations,
+  // do not store it in the FrameNavigationEntry's URL or PageState. Instead,
+  // make it visible to the user as the virtual URL. Store a safe URL
+  // (about:blank) as the one to load if the entry is revisited.
+  // TODO(nasko): Consider supporting similar behavior for subframe
+  // navigatios, including AUTO_SUBFRAME.

[Charlie Reis, 2017/05/24 16:42:11]

nit: navigations

+  if (!rfh->GetParent() &&
+      IsBlockedNavigation(navigation_handle->GetNetErrorCode())) {
+    DCHECK(params.url_is_unreachable);
+    active_entry->SetURL(GURL(url::kAboutBlankURL));
+    active_entry->SetVirtualURL(params.url);
+    if (frame_entry) {
+      frame_entry->SetPageState(
+          PageState::CreateFromURL(active_entry->GetURL()));
+    }
+  }
+
   // Use histogram to track memory impact of redirect chain because it's now
   // not cleared for committed entries.
   size_t redirect_chain_size = 0;
   for (size_t i = 0; i < params.redirects.size(); ++i) {
     redirect_chain_size += params.redirects[i].spec().length();
   }
   UMA_HISTOGRAM_COUNTS("Navigation.RedirectChainSize", redirect_chain_size);
 
   // Once it is committed, we no longer need to track several pieces of state on
   // the entry.
@@ skipping 1247 matching lines @@
   DCHECK(pending_entry_index_ == -1 ||
          pending_entry_ == GetEntryAtIndex(pending_entry_index_));
 }
 
 void NavigationControllerImpl::SetGetTimestampCallbackForTest(
     const base::Callback<base::Time()>& get_timestamp_callback) {
   get_timestamp_callback_ = get_timestamp_callback;
 }
 
 }  // namespace content