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

content/browser/frame_host/navigation_handle_impl.h

 // Copyright 2015 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.
 
 #ifndef CONTENT_BROWSER_FRAME_HOST_NAVIGATION_HANDLE_IMPL_H_
 #define CONTENT_BROWSER_FRAME_HOST_NAVIGATION_HANDLE_IMPL_H_
 
 #include "content/public/browser/navigation_handle.h"
 
 #include <stddef.h>
@@ skipping 51 matching lines @@
 // the RenderFrameHost still apply.
 class CONTENT_EXPORT NavigationHandleImpl : public NavigationHandle {
  public:
   // |navigation_start| comes from the DidStartProvisionalLoad IPC, which tracks
   // both renderer-initiated and browser-initiated navigation start.
   // PlzNavigate: This value always comes from the CommonNavigationParams
   // associated with this navigation.
   static std::unique_ptr<NavigationHandleImpl> Create(
       const GURL& url,
       FrameTreeNode* frame_tree_node,
+      bool is_renderer_initiated,
       bool is_synchronous,
       bool is_srcdoc,
       const base::TimeTicks& navigation_start,
       int pending_nav_entry_id);
   ~NavigationHandleImpl() override;
 
   // NavigationHandle implementation:
   const GURL& GetURL() override;
   bool IsInMainFrame() override;
   bool IsParentMainFrame() override;
+  bool IsRendererInitiated() override;
   bool IsSynchronousNavigation() override;
   bool IsSrcdoc() override;
   bool WasServerRedirect() override;
   int GetFrameTreeNodeId() override;
   int GetParentFrameTreeNodeId() override;
   const base::TimeTicks& NavigationStart() override;
   bool IsPost() override;
   const Referrer& GetReferrer() override;
   bool HasUserGesture() override;
   ui::PageTransition GetPageTransition() override;
@@ skipping 21 matching lines @@
       bool new_is_external_protocol) override;
 
   NavigatorDelegate* GetDelegate() const;
 
   // Returns the response headers for the request or nullptr if there are none.
   // This should only be accessed after a redirect was encountered or after the
   // navigation is ready to commit. The headers returned should not be modified,
   // as modifications will not be reflected in the network stack.
   const net::HttpResponseHeaders* GetResponseHeaders();
 
+  // Update whether the current navigation is renderer-initiated. Currently
+  // required during transfer navigations.
+  // TODO(creis): Remove this when transfer navigations do not require pending
+  // entries. See https://crbug.com/495161.

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

Yikes, looks like most of this was copied from update_entry_id_for_transfer,
which has a stale comment.  I've recently fixed https://crbug.com/495161 and we
don't use a pending entry during transfer.  (I'll have to see if I can remove
update_entry_id_for_transfer now.)

I'm wondering if this is dead code as well.  I'll try to find time to
investigate if I can, but let me know if you're aware of a case this is needed
for.

[clamy, 2016/05/12 04:04:44]

Considering how the NavigationHandle is used (ie from start to stop), there
should be no reason to change is_renderer_initiated ever over the course of the
navigation. In transfer navigations we transfer the actual NavigationHandle, so
there's no need to update is_renderer_initiated.

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

I did just copy this from the update_entry_id_for_transfer; I don't really know
enough about the navigation process to say whether or not this case is needed.
Based on these comments I've removed the method and its caller.

+  void set_is_renderer_initiated(bool is_renderer_initiated) {
+    is_renderer_initiated_ = is_renderer_initiated;
+  }
+
   // Get the unique id from the NavigationEntry associated with this
   // NavigationHandle. Note that a synchronous, renderer-initiated navigation
   // will not have a NavigationEntry associated with it, and this will return 0.
   int pending_nav_entry_id() const { return pending_nav_entry_id_; }
 
   // Changes the pending NavigationEntry ID for this handle.  This is currently
   // required during transfer navigations.
   // TODO(creis): Remove this when transfer navigations do not require pending
   // entries.  See https://crbug.com/495161.
   void update_entry_id_for_transfer(int nav_entry_id) {
@@ skipping 91 matching lines @@
     CANCELING,
     WILL_PROCESS_RESPONSE,
     DEFERRING_RESPONSE,
     READY_TO_COMMIT,
     DID_COMMIT,
     DID_COMMIT_ERROR_PAGE,
   };
 
   NavigationHandleImpl(const GURL& url,
                        FrameTreeNode* frame_tree_node,
+                       bool is_renderer_initiated,
                        bool is_synchronous,
                        bool is_srcdoc,
                        const base::TimeTicks& navigation_start,
                        int pending_nav_entry_id);
 
   NavigationThrottle::ThrottleCheckResult CheckWillStartRequest();
   NavigationThrottle::ThrottleCheckResult CheckWillRedirectRequest();
   NavigationThrottle::ThrottleCheckResult CheckWillProcessResponse();
 
   // Helper function to run and reset the |complete_callback_|. This marks the
   // end of a round of NavigationThrottleChecks.
   void RunCompleteCallback(NavigationThrottle::ThrottleCheckResult result);
 
   // Used in tests.
   State state() const { return state_; }
 
   // See NavigationHandle for a description of those member variables.
   GURL url_;
   Referrer sanitized_referrer_;
   bool has_user_gesture_;
   ui::PageTransition transition_;
   bool is_external_protocol_;
   net::Error net_error_code_;
   RenderFrameHostImpl* render_frame_host_;
+  bool is_renderer_initiated_;

[clamy, 2016/05/12 04:04:44]

I don't see a good reason why this should change over the course of the
navigation. This should be const.

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

Done.

   bool is_same_page_;
   const bool is_synchronous_;
   const bool is_srcdoc_;
   bool was_redirected_;
   scoped_refptr<net::HttpResponseHeaders> response_headers_;
 
   // The HTTP method used for the navigation.
   std::string method_;
 
   // The state the navigation is in.
@@ skipping 25 matching lines @@
   // Manages the lifetime of a pre-created ServiceWorkerProviderHost until a
   // corresponding ServiceWorkerNetworkProvider is created in the renderer.
   std::unique_ptr<ServiceWorkerNavigationHandle> service_worker_handle_;
 
   DISALLOW_COPY_AND_ASSIGN(NavigationHandleImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_FRAME_HOST_NAVIGATION_HANDLE_IMPL_H_