Persist prompt/block download limiter state on renderer-initiated loads.

content/browser/frame_host/navigator_impl.cc

Index: content/browser/frame_host/navigator_impl.cc
diff --git a/content/browser/frame_host/navigator_impl.cc b/content/browser/frame_host/navigator_impl.cc
index 6fcdb074b4a0f6badd1ea04256214a7e2223480d..9eb10a394a10b7e1983bed592ddcba821b5dcf1f 100644
--- a/content/browser/frame_host/navigator_impl.cc
+++ b/content/browser/frame_host/navigator_impl.cc
@@ -175,12 +175,19 @@ void NavigatorImpl::DidStartProvisionalLoad(
         std::unique_ptr<NavigationHandleImpl>());
   }
 
-  NavigationEntry* pending_entry = controller_->GetPendingEntry();
+  bool is_renderer_initiated = false;

[Charlie Reis, 2016/05/11 21:50:03]

Seems like we should default to true, with a comment about why.  Reasoning:

It's safer to assume a navigation is renderer-initiated unless we know
otherwise, since browser-initiated navigations are generally more powerful
(e.g., can go to chrome:// URLs).  Browser-initiated navigations should always
have a pending NavigationEntry, so we should be able to detect if that's the
case here.

(Can you add a test that would have failed with the way this is currently
written?  I bet it would classify a subframe navigation as browser-initiated.)

[dominickn, 2016/05/12 04:22:58]

Makes sense, done. The test I added with subframe navigations does indeed fail
with this set to false by default. :)

+  int pending_nav_entry_id = 0;
+  NavigationEntryImpl* pending_entry = controller_->GetPendingEntry();
+  if (pending_entry) {
+    is_renderer_initiated = pending_entry->is_renderer_initiated();
+    pending_nav_entry_id = pending_entry->GetUniqueID();
+  }
   render_frame_host->SetNavigationHandle(NavigationHandleImpl::Create(
       validated_url, render_frame_host->frame_tree_node(),
+      is_renderer_initiated,
       false,             // is_synchronous
       is_iframe_srcdoc,  // is_srcdoc
-      navigation_start, pending_entry ? pending_entry->GetUniqueID() : 0));
+      navigation_start, pending_nav_entry_id));
 }
 
 void NavigatorImpl::DidFailProvisionalLoadWithError(
@@ -895,7 +902,7 @@ void NavigatorImpl::OnBeginNavigation(
   // entry from the NavigationController.
   NavigationEntry* pending_entry = controller_->GetPendingEntry();
   navigation_request->CreateNavigationHandle(
-      pending_entry ? pending_entry->GetUniqueID() : 0);
+      true, pending_entry ? pending_entry->GetUniqueID() : 0);
   navigation_request->BeginNavigation();
 }
 
@@ -995,7 +1002,8 @@ void NavigatorImpl::RequestNavigation(
   if (!dest_url.SchemeIs(url::kJavaScriptScheme))
     frame_tree_node->CreatedNavigationRequest(std::move(scoped_request));
 
-  navigation_request->CreateNavigationHandle(entry.GetUniqueID());
+  navigation_request->CreateNavigationHandle(entry.is_renderer_initiated(),
+                                             entry.GetUniqueID());
 
   // Have the current renderer execute its beforeunload event if needed. If it
   // is not needed (when beforeunload dispatch is not needed or this navigation
@@ -1103,8 +1111,10 @@ void NavigatorImpl::DidStartMainFrameNavigation(
     // If there's a current NavigationHandle, update its pending NavEntry ID.
     // This is necessary for transfer navigations.  The handle may be null in
     // PlzNavigate.
-    if (navigation_handle)
+    if (navigation_handle) {
+      navigation_handle->set_is_renderer_initiated(true);
       navigation_handle->update_entry_id_for_transfer(entry->GetUniqueID());
+    }
 
     controller_->SetPendingEntry(std::move(entry));
     if (delegate_)