LoadURLParams::extra_headers should not apply to subresource requests.

content/renderer/render_frame_impl.cc

Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 88a5cd0dd296d70986ff181ec20396e4fa53c9fb..431d1f33ba6b756cf3ab639c56c062a8f7637c5d 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -4220,6 +4220,8 @@ void RenderFrameImpl::willSendRequest(blink::WebLocalFrame* frame,
       navigation_state->common_params().allow_download);
   extra_data->set_transition_type(transition_type);
   extra_data->set_should_replace_current_entry(should_replace_current_entry);
+  // TODO(lukasza): https://crbug.com/656179: Navigational things (e.g.
+  // StartNavigationParams) should not apply to subresource requests.
   extra_data->set_transferred_request_child_id(
       navigation_state->start_params().transferred_request_child_id);
   extra_data->set_transferred_request_request_id(
@@ -4254,7 +4256,8 @@ void RenderFrameImpl::willSendRequest(blink::WebLocalFrame* frame,
   request.setRequestorID(render_view_->GetRoutingID());
   request.setHasUserGesture(WebUserGestureIndicator::isProcessingUserGesture());
 
-  if (!navigation_state->start_params().extra_headers.empty()) {
+  if (!navigation_state->start_params().extra_headers.empty() &&
+      request.getFrameType() != WebURLRequest::FrameTypeNone) {

[Charlie Reis, 2016/10/17 22:46:18]

nit: Please add a comment here, similar to the TODO you added above.

[Łukasz Anforowicz, 2016/10/17 23:47:56]

Done.

     for (net::HttpUtil::HeadersIterator i(
              navigation_state->start_params().extra_headers.begin(),
              navigation_state->start_params().extra_headers.end(), "\n");