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

chrome/browser/extensions/navigation_observer.cc

Index: chrome/browser/extensions/navigation_observer.cc
diff --git a/chrome/browser/extensions/navigation_observer.cc b/chrome/browser/extensions/navigation_observer.cc
index 730ddcdbeee52c7758411e9d5c0acd5131a8254b..0640c7133acec17ce6fb7be5adc69b9bba4383a0 100644
--- a/chrome/browser/extensions/navigation_observer.cc
+++ b/chrome/browser/extensions/navigation_observer.cc
@@ -69,7 +69,16 @@ void NavigationObserver::PromptToEnableExtensionIfNecessary(
   if (!nav_entry)
     return;
 
-  const GURL& url = nav_entry->GetURL();
+  // With a disabled extension, the navigation is blocked, which results in
+  // an error page and NavigationEntry with "about:blank" URL. In this case,
+  // the virtual URL is the real URL the user navigated to, so if this is the
+  // case, use it instead.
+  const GURL& url = (nav_entry->GetPageType() == content::PAGE_TYPE_ERROR &&
+                     nav_entry->GetURL() == url::kAboutBlankURL &&
+                     nav_entry->GetVirtualURL().SchemeIs(kExtensionScheme))
+                        ? nav_entry->GetVirtualURL()
+                        : nav_entry->GetURL();
+
   // NOTE: We only consider chrome-extension:// urls, and deliberately don't
   // consider hosted app urls. This is because it's really annoying to visit the
   // site associated with a hosted app (like calendar.google.com or