Don't try to guess the referrer policy, but use the one associated with the request

webkit/child/weburlloader_impl.cc

 // Copyright (c) 2012 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.
 
 // An implementation of WebURLLoader in terms of ResourceLoaderBridge.
 
 #include "webkit/child/weburlloader_impl.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
@@ skipping 373 matching lines @@
   request_info.requestor_pid = request.requestorProcessID();
   request_info.request_type =
       ResourceType::FromTargetType(request.targetType());
   request_info.priority =
       ConvertWebKitPriorityToNetPriority(request.priority());
   request_info.appcache_host_id = request.appCacheHostID();
   request_info.routing_id = request.requestorID();
   request_info.download_to_file = request.downloadToFile();
   request_info.has_user_gesture = request.hasUserGesture();
   request_info.extra_data = request.extraData();
-  if (request.extraData()) {
-    referrer_policy_ = static_cast<WebURLRequestExtraDataImpl*>(
-        request.extraData())->referrer_policy();
-    request_info.referrer_policy = referrer_policy_;
-  }
+  referrer_policy_ = request.referrerPolicy();
+  request_info.referrer_policy = request.referrerPolicy();
   bridge_.reset(platform->CreateResourceLoader(request_info));
 
   if (!request.httpBody().isNull()) {
     // GET and HEAD requests shouldn't have http bodies.
     DCHECK(method != "GET" && method != "HEAD");
     const WebHTTPBody& httpBody = request.httpBody();
     size_t i = 0;
     WebHTTPBody::Element element;
     scoped_refptr<ResourceRequestBody> request_body = new ResourceRequestBody;
     while (httpBody.elementAt(i++, element)) {
@@ skipping 74 matching lines @@
   WebURLRequest new_request(new_url);
   new_request.setFirstPartyForCookies(request_.firstPartyForCookies());
   new_request.setDownloadToFile(request_.downloadToFile());
 
   WebString referrer_string = WebString::fromUTF8("Referer");
   WebString referrer = WebSecurityPolicy::generateReferrerHeader(
       referrer_policy_,
       new_url,
       request_.httpHeaderField(referrer_string));
   if (!referrer.isEmpty())
-    new_request.setHTTPHeaderField(referrer_string, referrer);
+    new_request.setHTTPReferrer(referrer, referrer_policy_);
 
   std::string new_method = net::URLRequest::ComputeMethodForRedirect(
              request_.httpMethod().utf8(), response.httpStatusCode());
   new_request.setHTTPMethod(WebString::fromUTF8(new_method));
 
   client_->willSendRequest(loader_, new_request, response);
   request_ = new_request;
   *has_new_first_party_for_cookies = true;
   *new_first_party_for_cookies = request_.firstPartyForCookies();
 
@@ skipping 349 matching lines @@
 
 void WebURLLoaderImpl::setDefersLoading(bool value) {
   context_->SetDefersLoading(value);
 }
 
 void WebURLLoaderImpl::didChangePriority(WebURLRequest::Priority new_priority) {
   context_->DidChangePriority(new_priority);
 }
 
 }  // namespace webkit_glue