Add a function to add extra headers from NavigationThrottle

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 "content/browser/frame_host/frame_tree.h"
 #include "content/browser/frame_host/frame_tree_node.h"
 #include "content/browser/frame_host/navigation_controller_impl.h"
-#include "content/browser/frame_host/navigation_handle_impl.h"
 #include "content/browser/frame_host/navigation_request_info.h"
 #include "content/browser/frame_host/navigator.h"
 #include "content/browser/loader/navigation_url_loader.h"
 #include "content/browser/service_worker/service_worker_navigation_handle.h"
 #include "content/browser/site_instance_impl.h"
 #include "content/common/resource_request_body.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/stream_handle.h"
 #include "content/public/common/content_client.h"
 #include "net/base/load_flags.h"
@@ skipping 256 matching lines @@
   frame_tree_node_->navigator()->FailedNavigation(
       frame_tree_node_, has_stale_copy_in_cache, net_error);
 }
 
 void NavigationRequest::OnRequestStarted(base::TimeTicks timestamp) {
   frame_tree_node_->navigator()->LogResourceRequestTime(timestamp,
                                                         common_params_.url);
 }
 
 void NavigationRequest::OnStartChecksComplete(
-    NavigationThrottle::ThrottleCheckResult result) {
+    NavigationThrottle::ThrottleCheckResult result,
+    const NavigationHandleImpl::ExtraHeadersList& extra_headers_list) {
   CHECK(result != NavigationThrottle::DEFER);
 
   // Abort the request if needed. This will destroy the NavigationRequest.
   if (result == NavigationThrottle::CANCEL_AND_IGNORE ||
       result == NavigationThrottle::CANCEL) {
     // TODO(clamy): distinguish between CANCEL and CANCEL_AND_IGNORE.
     frame_tree_node_->ResetNavigationRequest(false);
     return;
   }
 
+  // Add extra headers to the request before sending it to the network stack.
+  net::HttpRequestHeaders headers;
+  headers.AddHeadersFromString(begin_params_.headers);
+  for (const auto& header : extra_headers_list)
+    headers.SetHeader(header.first, header.second);
+  begin_params_.headers = headers.ToString();
+  info_->begin_params.headers = headers.ToString();
+
   loader_ = NavigationURLLoader::Create(
       frame_tree_node_->navigator()->GetController()->GetBrowserContext(),
       info_.Pass(), navigation_handle_->service_worker_handle(), this);
 }
 
 void NavigationRequest::OnRedirectChecksComplete(
-    NavigationThrottle::ThrottleCheckResult result) {
+    NavigationThrottle::ThrottleCheckResult result,
+    const NavigationHandleImpl::ExtraHeadersList& extra_headers_list) {
   CHECK(result != NavigationThrottle::DEFER);
 
   // Abort the request if needed. This will destroy the NavigationRequest.
   if (result == NavigationThrottle::CANCEL_AND_IGNORE ||
       result == NavigationThrottle::CANCEL) {
     // TODO(clamy): distinguish between CANCEL and CANCEL_AND_IGNORE.
     frame_tree_node_->ResetNavigationRequest(false);
     return;
   }
 
-  loader_->FollowRedirect();
+  loader_->FollowRedirect(extra_headers_list);
   navigation_handle_->DidRedirectNavigation(common_params_.url);
 }
 
 }  // namespace content