PlzNavigate: transmit redirect info to the renderer side

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 203 matching lines @@
   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();
 
+  CommonNavigationParams common_params = entry.ConstructCommonNavigationParams(
+      frame_entry, request_body, dest_url, dest_referrer, navigation_type,
+      previews_state, navigation_start);
+
   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),
+      frame_tree_node, common_params,
       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,
+          frame_entry, common_params.url, common_params.method,
+          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;
@@ skipping 16 matching lines @@
   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,                // is_overriding_user_agent
+      std::vector<GURL>(),  // redirects
+      common_params.url, common_params.method,

[nasko, 2017/02/10 23:53:09]

nit: Put each argument on a separate line to be consistent with the rest.

[clamy, 2017/02/13 14:29:37]

Done.

       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
@@ skipping 156 matching lines @@
 
   // Mark time for the Navigation Timing API.
   if (request_params_.navigation_timing.redirect_start.is_null()) {
     request_params_.navigation_timing.redirect_start =
         request_params_.navigation_timing.fetch_start;
   }
   request_params_.navigation_timing.redirect_end = base::TimeTicks::Now();
   request_params_.navigation_timing.fetch_start = base::TimeTicks::Now();
 
   request_params_.redirect_response.push_back(response->head);
+  request_params_.redirect_infos.push_back(redirect_info);
 
   request_params_.redirects.push_back(common_params_.url);
   common_params_.url = redirect_info.new_url;
   common_params_.method = redirect_info.new_method;
   common_params_.referrer.url = GURL(redirect_info.new_referrer);
 
   // For non browser initiated navigations we need to check if the source has
   // access to the URL. We always allow browser initiated requests.
   // TODO(clamy): Kill the renderer if FilterURL fails?
   GURL url = common_params_.url;
@@ skipping 287 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