Auto merge of #14496 - servo:option-refpol, r=KiChjang

Stop handling a None referrer policy in determine_request_referrer().

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/14496)
<!-- Reviewable:end -->

1 files changed, 3 insertions, 4 deletions

diff --git a/components/net/fetch/methods.rs b/components/net/fetch/methods.rs
index 97c6fc1d871..994f3d36702 100644
--- a/components/net/fetch/methods.rs
+++ b/components/net/fetch/methods.rs
@@ -150,9 +150,8 @@ pub fn main_fetch(request: Rc<Request>,
     // currently the clients themselves set referrer policy in RequestInit
 
     // Step 7
-    if request.referrer_policy.get().is_none() {
-        request.referrer_policy.set(Some(ReferrerPolicy::NoReferrerWhenDowngrade));
-    }
+    let referrer_policy = request.referrer_policy.get().unwrap_or(ReferrerPolicy::NoReferrerWhenDowngrade);
+    request.referrer_policy.set(Some(referrer_policy));
 
     // Step 8
     if *request.referrer.borrow() != Referrer::NoReferrer {
@@ -160,7 +159,7 @@ pub fn main_fetch(request: Rc<Request>,
         // this stops the assertion in determine_request_referrer from failing
         request.headers.borrow_mut().remove::<RefererHeader>();
         let referrer_url = determine_request_referrer(&mut *request.headers.borrow_mut(),
-                                                      request.referrer_policy.get(),
+                                                      referrer_policy,
                                                       request.referrer.borrow_mut().take(),
                                                       request.current_url().clone());
         *request.referrer.borrow_mut() = Referrer::from_url(referrer_url);