PlzNavigate: properly set the initiator of the navigation

content/browser/frame_host/navigation_request.cc

Index: content/browser/frame_host/navigation_request.cc
diff --git a/content/browser/frame_host/navigation_request.cc b/content/browser/frame_host/navigation_request.cc
index 16cb92373be9fb64b21773abf7a3ca6e8ae48daf..224bf85fb9886968ecdb95c9153869bd9aa6dd72 100644
--- a/content/browser/frame_host/navigation_request.cc
+++ b/content/browser/frame_host/navigation_request.cc
@@ -86,6 +86,10 @@ std::unique_ptr<NavigationRequest> NavigationRequest::CreateBrowserInitiated(
   if (frame_entry.method() == "POST")
     request_body = frame_entry.GetPostData();
 
+  url::Origin initiator =
+      frame_tree_node->IsMainFrame()
+          ? url::Origin(dest_url)

[nasko, 2016/06/28 18:32:22]

This just feels wrong. Why would the initiator be something we want to go to?!

[clamy, 2016/06/29 11:23:20]

I based myself on
https://cs.chromium.org/chromium/src/content/browser/loader/resource_dispatch...
which states "User-initiated top-level navigations have a first-party and
initiator that matches the URL to which they navigate."

This is the browser-initiated case, so I think this counts as user-initiated. On
top of that, it being the user-initiated case means that I don't have any
initiator info available (it's not in the NavigationEntry, and it's not in the
FrameNavigationEntry).

+          : 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,
@@ -94,7 +98,7 @@ std::unique_ptr<NavigationRequest> NavigationRequest::CreateBrowserInitiated(
                             LoadFlagFromNavigationType(navigation_type),
                             false,  // has_user_gestures
                             false,  // skip_service_worker
-                            REQUEST_CONTEXT_TYPE_LOCATION),
+                            REQUEST_CONTEXT_TYPE_LOCATION, initiator),
       entry.ConstructRequestNavigationParams(
           frame_entry, is_same_document_history_load,
           frame_tree_node->has_committed_real_load(),
@@ -188,8 +192,8 @@ NavigationRequest::NavigationRequest(
       false : frame_tree_node->parent()->IsMainFrame();
   info_.reset(new NavigationRequestInfo(
       common_params, begin_params, first_party_for_cookies,
-      frame_tree_node->current_origin(), frame_tree_node->IsMainFrame(),
-      parent_is_main_frame, frame_tree_node->frame_tree_node_id()));
+      frame_tree_node->IsMainFrame(), parent_is_main_frame,
+      frame_tree_node->frame_tree_node_id()));
 }
 
 NavigationRequest::~NavigationRequest() {