Add a function to add extra headers from NavigationThrottle

content/browser/loader/navigation_resource_throttle.cc

 // 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.
 
 #include "content/browser/loader/navigation_resource_throttle.h"
 
 #include "base/callback.h"
 #include "content/browser/frame_host/navigation_handle_impl.h"
 #include "content/browser/frame_host/render_frame_host_impl.h"
 #include "content/public/browser/resource_context.h"
 #include "content/public/browser/resource_controller.h"
 #include "content/public/browser/resource_request_info.h"
 #include "content/public/common/referrer.h"
 #include "net/url_request/redirect_info.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_job_factory.h"
 #include "ui/base/page_transition_types.h"
 
 namespace content {
 
 namespace {
-typedef base::Callback<void(NavigationThrottle::ThrottleCheckResult)>
+typedef base::Callback<void(
+    NavigationThrottle::ThrottleCheckResult,
+    const std::vector<std::pair<std::string, std::string>>&)>
     UIChecksPerformedCallback;
 
-void SendCheckResultToIOThread(UIChecksPerformedCallback callback,
-                               NavigationThrottle::ThrottleCheckResult result) {
+void SendCheckResultToIOThread(
+    UIChecksPerformedCallback callback,
+    NavigationThrottle::ThrottleCheckResult result,
+    const NavigationHandleImpl::ExtraHeadersList& extra_headers) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   CHECK(result != NavigationThrottle::DEFER);
   BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
-                          base::Bind(callback, result));
+                          base::Bind(callback, result, extra_headers));
 }
 
 void CheckWillStartRequestOnUIThread(UIChecksPerformedCallback callback,
                                      int render_process_id,
                                      int render_frame_host_id,
                                      bool is_post,
                                      const Referrer& sanitized_referrer,
                                      bool has_user_gesture,
                                      ui::PageTransition transition,
                                      bool is_external_protocol) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   RenderFrameHostImpl* render_frame_host =
       RenderFrameHostImpl::FromID(render_process_id, render_frame_host_id);
   if (!render_frame_host) {
-    SendCheckResultToIOThread(callback, NavigationThrottle::PROCEED);
+    SendCheckResultToIOThread(callback, NavigationThrottle::PROCEED,
+                              NavigationHandleImpl::ExtraHeadersList());
     return;
   }
 
   NavigationHandleImpl* navigation_handle =
       render_frame_host->navigation_handle();
   if (!navigation_handle) {
-    SendCheckResultToIOThread(callback, NavigationThrottle::PROCEED);
+    SendCheckResultToIOThread(callback, NavigationThrottle::PROCEED,
+                              NavigationHandleImpl::ExtraHeadersList());
     return;
   }
 
   navigation_handle->WillStartRequest(
       is_post, sanitized_referrer, has_user_gesture, transition,
       is_external_protocol, base::Bind(&SendCheckResultToIOThread, callback));
 }
 
 void CheckWillRedirectRequestOnUIThread(UIChecksPerformedCallback callback,
                                         int render_process_id,
                                         int render_frame_host_id,
                                         const GURL& new_url,
                                         bool new_method_is_post,
                                         const GURL& new_referrer_url,
                                         bool new_is_external_protocol) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   RenderFrameHostImpl* render_frame_host =
       RenderFrameHostImpl::FromID(render_process_id, render_frame_host_id);
   if (!render_frame_host) {
-    SendCheckResultToIOThread(callback, NavigationThrottle::PROCEED);
+    SendCheckResultToIOThread(callback, NavigationThrottle::PROCEED,
+                              NavigationHandleImpl::ExtraHeadersList());
     return;
   }
 
   NavigationHandleImpl* navigation_handle =
       render_frame_host->navigation_handle();
   if (!navigation_handle) {
-    SendCheckResultToIOThread(callback, NavigationThrottle::PROCEED);
+    SendCheckResultToIOThread(callback, NavigationThrottle::PROCEED,
+                              NavigationHandleImpl::ExtraHeadersList());
     return;
   }
 
   GURL new_validated_url(new_url);
   RenderProcessHost::FromID(render_process_id)
       ->FilterURL(false, &new_validated_url);
   navigation_handle->WillRedirectRequest(
       new_validated_url, new_method_is_post, new_referrer_url,
       new_is_external_protocol,
       base::Bind(&SendCheckResultToIOThread, callback));
@@ skipping 60 matching lines @@
                  redirect_info.new_method == "POST",
                  GURL(redirect_info.new_referrer), new_is_external_protocol));
   *defer = true;
 }
 
 const char* NavigationResourceThrottle::GetNameForLogging() const {
   return "NavigationResourceThrottle";
 }
 
 void NavigationResourceThrottle::OnUIChecksPerformed(
-    NavigationThrottle::ThrottleCheckResult result) {
+    NavigationThrottle::ThrottleCheckResult result,
+    const std::vector<std::pair<std::string, std::string>>& extra_headers) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   if (result == NavigationThrottle::CANCEL_AND_IGNORE) {
     controller()->CancelAndIgnore();
   } else if (result == NavigationThrottle::CANCEL) {
     controller()->Cancel();
   } else {
+    DCHECK(result == NavigationThrottle::PROCEED);
+    for (auto header : extra_headers) {
+      request_->SetExtraRequestHeaderByName(header.first, header.second, true);
+    }
     controller()->Resume();
   }
 }
 
 }  // namespace content