PlzNavigate: Fix dynamic iframe back forward layout test failure

content/browser/frame_host/navigation_request.cc

 // Copyright 2014 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.
 
 #include "content/browser/frame_host/navigation_request.h"
 
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "content/browser/appcache/appcache_navigation_handle.h"
@@ skipping 188 matching lines @@
     const GURL& dest_url,
     const Referrer& dest_referrer,
     const FrameNavigationEntry& frame_entry,
     const NavigationEntryImpl& entry,
     FrameMsg_Navigate_Type::Value navigation_type,
     PreviewsState previews_state,
     bool is_same_document_history_load,
     bool is_history_navigation_in_new_child,
     const base::TimeTicks& navigation_start,
     NavigationControllerImpl* controller) {
-  // Fill POST data in the request body.
-  scoped_refptr<ResourceRequestBodyImpl> request_body;
-  if (frame_entry.method() == "POST")
-    request_body = frame_entry.GetPostData();
-
-  base::Optional<url::Origin> initiator =
-      frame_tree_node->IsMainFrame()
-          ? base::Optional<url::Origin>()
-          : base::Optional<url::Origin>(
-                frame_tree_node->frame_tree()->root()->current_origin());
-
   // While the navigation was started via the LoadURL path it may have come from
   // the renderer in the first place as part of OpenURL.
   bool browser_initiated = !entry.is_renderer_initiated();

[clamy, 2017/02/15 16:27:55]

Here we set whether the navigation was browser initiated or not. If I understand
the issue correctly, shouldn't we modify this so that it accurately reflects
that the history navigation was in fact renderer-initiated?

[ananta, 2017/02/15 23:45:02]

Thanks. Added code to set the flag for child frame navigations coming from the
renderer. Will look into doing this for all history navigations from the
renderer in a later patchset.

 
-  std::unique_ptr<NavigationRequest> navigation_request(new NavigationRequest(
-      frame_tree_node, entry.ConstructCommonNavigationParams(
-                           frame_entry, request_body, dest_url, dest_referrer,
-                           navigation_type, previews_state, navigation_start),
-      BeginNavigationParams(entry.extra_headers(), net::LOAD_NORMAL,
-                            false,  // has_user_gestures
-                            false,  // skip_service_worker
-                            REQUEST_CONTEXT_TYPE_LOCATION,
-                            blink::WebMixedContentContextType::Blockable,
-                            initiator),
-      entry.ConstructRequestNavigationParams(
-          frame_entry, is_history_navigation_in_new_child,
-          entry.GetSubframeUniqueNames(frame_tree_node),
-          frame_tree_node->has_committed_real_load(),
-          controller->GetPendingEntryIndex() == -1,
-          controller->GetIndexOfEntry(&entry),
-          controller->GetLastCommittedEntryIndex(),
-          controller->GetEntryCount()),
-      browser_initiated,
-      true,  // may_transfer
-      &frame_entry, &entry));
-  return navigation_request;
+  return CreateNavigationHelper(
+      frame_tree_node, dest_url, dest_referrer, frame_entry, entry,
+      navigation_type, previews_state, is_history_navigation_in_new_child,
+      false, browser_initiated, navigation_start, controller);
 }
 
 // static
 std::unique_ptr<NavigationRequest> NavigationRequest::CreateRendererInitiated(
     FrameTreeNode* frame_tree_node,
     const CommonNavigationParams& common_params,
     const BeginNavigationParams& begin_params,
     int current_history_list_offset,
     int current_history_list_length) {
   // Only normal navigations to a different document or reloads are expected.
   // - Renderer-initiated fragment-navigations never take place in the browser,
   //   even with PlzNavigate.
   // - Restore-navigations are always browser-initiated.
   // - History-navigations use the browser-initiated path, event the ones that
   //   are initiated by a javascript script, please see the IPC message
-  //   ViewHostMsg_GoToEntryAtOffset.
+  //   ViewHostMsg_GoToEntryAtOffset. Exceptions include child frames which are
+  //   navigated without user gesture.
   DCHECK(FrameMsg_Navigate_Type::IsReload(common_params.navigation_type) ||
          common_params.navigation_type ==
              FrameMsg_Navigate_Type::DIFFERENT_DOCUMENT);
 
   // TODO(clamy): See how we should handle override of the user agent when the
   // navigation may start in a renderer and commit in another one.
   // TODO(clamy): See if the navigation start time should be measured in the
   // renderer and sent to the browser instead of being measured here.
   // TODO(clamy): The pending history list offset should be properly set.
   RequestNavigationParams request_params(
       false,                          // is_overriding_user_agent
       std::vector<GURL>(),            // redirects
       false,                          // can_load_local_resources
       PageState(),                    // page_state
       0,                              // nav_entry_id
       false,                          // is_history_navigation_in_new_child
       std::map<std::string, bool>(),  // subframe_unique_names
       frame_tree_node->has_committed_real_load(),
       false,  // intended_as_new_entry
       -1,     // pending_history_list_offset
       current_history_list_offset, current_history_list_length,
       false,  // is_view_source
       false,  // should_clear_history_list
       begin_params.has_user_gesture);
+
   std::unique_ptr<NavigationRequest> navigation_request(new NavigationRequest(
       frame_tree_node, common_params, begin_params, request_params,
       false,  // browser_initiated
       false,  // may_transfer
       nullptr, nullptr));
   return navigation_request;
 }
 
+// static
+std::unique_ptr<NavigationRequest>
+NavigationRequest::CreateRendererInitiatedHistoryNavigation(
+    FrameTreeNode* frame_tree_node,
+    const GURL& dest_url,
+    const Referrer& dest_referrer,
+    const FrameNavigationEntry& frame_entry,
+    const NavigationEntryImpl& entry,
+    FrameMsg_Navigate_Type::Value navigation_type,
+    PreviewsState previews_state,
+    bool is_history_navigation_in_new_child,
+    bool has_user_gesture,
+    const base::TimeTicks& navigation_start,
+    NavigationControllerImpl* controller) {
+  DCHECK_EQ(true, is_history_navigation_in_new_child);
+
+  return CreateNavigationHelper(
+      frame_tree_node, dest_url, dest_referrer, frame_entry, entry,
+      navigation_type, previews_state, is_history_navigation_in_new_child,
+      has_user_gesture, false, navigation_start, controller);
+}
+
+std::unique_ptr<NavigationRequest> NavigationRequest::CreateNavigationHelper(
+    FrameTreeNode* frame_tree_node,
+    const GURL& dest_url,
+    const Referrer& dest_referrer,
+    const FrameNavigationEntry& frame_entry,
+    const NavigationEntryImpl& entry,
+    FrameMsg_Navigate_Type::Value navigation_type,
+    PreviewsState previews_state,
+    bool is_same_document_history_load,
+    bool is_history_navigation_in_new_child,
+    bool browser_initiated,
+    const base::TimeTicks& navigation_start,
+    NavigationControllerImpl* controller) {
+  // Fill POST data in the request body.
+  scoped_refptr<ResourceRequestBodyImpl> request_body;
+  if (frame_entry.method() == "POST")
+    request_body = frame_entry.GetPostData();
+
+  base::Optional<url::Origin> initiator =
+      frame_tree_node->IsMainFrame()
+          ? base::Optional<url::Origin>()
+          : base::Optional<url::Origin>(
+                frame_tree_node->frame_tree()->root()->current_origin());
+
+  std::unique_ptr<NavigationRequest> navigation_request(new NavigationRequest(
+      frame_tree_node, entry.ConstructCommonNavigationParams(
+                           frame_entry, request_body, dest_url, dest_referrer,
+                           navigation_type, previews_state, navigation_start),
+      BeginNavigationParams(entry.extra_headers(), net::LOAD_NORMAL,
+                            false,  // has_user_gestures
+                            false,  // skip_service_worker
+                            REQUEST_CONTEXT_TYPE_LOCATION,
+                            blink::WebMixedContentContextType::Blockable,
+                            initiator),
+      entry.ConstructRequestNavigationParams(
+          frame_entry, is_history_navigation_in_new_child,
+          entry.GetSubframeUniqueNames(frame_tree_node),
+          frame_tree_node->has_committed_real_load(),
+          controller->GetPendingEntryIndex() == -1,
+          controller->GetIndexOfEntry(&entry),
+          controller->GetLastCommittedEntryIndex(),
+          controller->GetEntryCount()),
+      browser_initiated,
+      true,  // may_transfer
+      &frame_entry, &entry));
+  return navigation_request;
+}
+
 NavigationRequest::NavigationRequest(
     FrameTreeNode* frame_tree_node,
     const CommonNavigationParams& common_params,
     const BeginNavigationParams& begin_params,
     const RequestNavigationParams& request_params,
     bool browser_initiated,
     bool may_transfer,
     const FrameNavigationEntry* frame_entry,
     const NavigationEntryImpl* entry)
     : frame_tree_node_(frame_tree_node),
@@ skipping 443 matching lines @@
   DCHECK_EQ(request_params_.has_user_gesture, begin_params_.has_user_gesture);
 
   render_frame_host->CommitNavigation(response_.get(), std::move(body_),
                                       common_params_, request_params_,
                                       is_view_source_);
 
   frame_tree_node_->ResetNavigationRequest(true);
 }
 
 }  // namespace content