Make url for "client" referrer mandatory

6 files changed, 219 insertions, 101 deletions

diff --git a/components/net/fetch/methods.rs b/components/net/fetch/methods.rs
index 1aabb545354..41b804fb7fc 100644
--- a/components/net/fetch/methods.rs
+++ b/components/net/fetch/methods.rs
@@ -239,13 +239,7 @@ pub fn main_fetch(
     {
         let referrer_url = match mem::replace(&mut request.referrer, Referrer::NoReferrer) {
             Referrer::NoReferrer => None,
-            Referrer::Client => {
-                // FIXME(#14507): We should never get this value here; it should
-                //                already have been handled in the script thread.
-                request.headers.remove(header::REFERER);
-                None
-            },
-            Referrer::ReferrerUrl(url) => {
+            Referrer::ReferrerUrl(url) | Referrer::Client(url) => {
                 request.headers.remove(header::REFERER);
                 let current_url = request.current_url();
                 determine_request_referrer(
diff --git a/components/net/http_loader.rs b/components/net/http_loader.rs
index 33a6e4415e3..eaed2ff1989 100644
--- a/components/net/http_loader.rs
+++ b/components/net/http_loader.rs
@@ -1141,7 +1141,8 @@ fn http_network_or_cache_fetch(
     // Step 5.9
     match http_request.referrer {
         Referrer::NoReferrer => (),
-        Referrer::ReferrerUrl(ref http_request_referrer) => {
+        Referrer::ReferrerUrl(ref http_request_referrer) |
+        Referrer::Client(ref http_request_referrer) => {
             if let Ok(referer) = http_request_referrer.to_string().parse::<Referer>() {
                 http_request.headers.typed_insert(referer);
             } else {
@@ -1151,12 +1152,6 @@ fn http_network_or_cache_fetch(
                 error!("Failed to parse {} as referer", http_request_referrer);
             }
         },
-        Referrer::Client =>
-        // it should be impossible for referrer to be anything else during fetching
-        // https://fetch.spec.whatwg.org/#concept-request-referrer
-        {
-            unreachable!()
-        },
     };
 
     // Step 5.10
@@ -1938,7 +1933,7 @@ fn cors_preflight_fetch(
     context: &FetchContext,
 ) -> Response {
     // Step 1
-    let mut preflight = RequestBuilder::new(request.current_url())
+    let mut preflight = RequestBuilder::new(request.current_url(), request.referrer.clone())
         .method(Method::OPTIONS)
         .origin(match &request.origin {
             Origin::Client => {
@@ -1949,7 +1944,6 @@ fn cors_preflight_fetch(
         .pipeline_id(request.pipeline_id)
         .initiator(request.initiator.clone())
         .destination(request.destination.clone())
-        .referrer(Some(request.referrer.clone()))
         .referrer_policy(request.referrer_policy)
         .build();
 
diff --git a/components/net/tests/data_loader.rs b/components/net/tests/data_loader.rs
index 3e7cde682f4..aa985a17d2b 100644
--- a/components/net/tests/data_loader.rs
+++ b/components/net/tests/data_loader.rs
@@ -6,7 +6,7 @@ use crate::fetch;
 use headers::{ContentType, HeaderMapExt};
 use hyper_serde::Serde;
 use mime::{self, Mime};
-use net_traits::request::{Origin, Request};
+use net_traits::request::{Origin, Referrer, Request};
 use net_traits::response::{HttpsState, ResponseBody};
 use net_traits::{FetchMetadata, FilteredMetadata, NetworkError};
 use servo_url::ServoUrl;
@@ -21,7 +21,13 @@ fn assert_parse(
 ) {
     let url = ServoUrl::parse(url).unwrap();
     let origin = Origin::Origin(url.origin());
-    let mut request = Request::new(url, Some(origin), None, HttpsState::None);
+    let mut request = Request::new(
+        url,
+        Some(origin),
+        Referrer::NoReferrer,
+        None,
+        HttpsState::None,
+    );
 
     let response = fetch(&mut request, None);
 
diff --git a/components/net/tests/fetch.rs b/components/net/tests/fetch.rs
index dc4c0f032c0..821e81a00c2 100644
--- a/components/net/tests/fetch.rs
+++ b/components/net/tests/fetch.rs
@@ -59,8 +59,13 @@ fn test_fetch_response_is_not_network_error() {
     let (server, url) = make_server(handler);
 
     let origin = Origin::Origin(url.origin());
-    let mut request = Request::new(url, Some(origin), None, HttpsState::None);
-    request.referrer = Referrer::NoReferrer;
+    let mut request = Request::new(
+        url,
+        Some(origin),
+        Referrer::NoReferrer,
+        None,
+        HttpsState::None,
+    );
     let fetch_response = fetch(&mut request, None);
     let _ = server.close();
 
@@ -73,8 +78,13 @@ fn test_fetch_response_is_not_network_error() {
 fn test_fetch_on_bad_port_is_network_error() {
     let url = ServoUrl::parse("http://www.example.org:6667").unwrap();
     let origin = Origin::Origin(url.origin());
-    let mut request = Request::new(url, Some(origin), None, HttpsState::None);
-    request.referrer = Referrer::NoReferrer;
+    let mut request = Request::new(
+        url,
+        Some(origin),
+        Referrer::NoReferrer,
+        None,
+        HttpsState::None,
+    );
     let fetch_response = fetch(&mut request, None);
     assert!(fetch_response.is_network_error());
     let fetch_error = fetch_response.get_network_error().unwrap();
@@ -93,8 +103,13 @@ fn test_fetch_response_body_matches_const_message() {
     let (server, url) = make_server(handler);
 
     let origin = Origin::Origin(url.origin());
-    let mut request = Request::new(url, Some(origin), None, HttpsState::None);
-    request.referrer = Referrer::NoReferrer;
+    let mut request = Request::new(
+        url,
+        Some(origin),
+        Referrer::NoReferrer,
+        None,
+        HttpsState::None,
+    );
     let fetch_response = fetch(&mut request, None);
     let _ = server.close();
 
@@ -113,8 +128,13 @@ fn test_fetch_response_body_matches_const_message() {
 fn test_fetch_aboutblank() {
     let url = ServoUrl::parse("about:blank").unwrap();
     let origin = Origin::Origin(url.origin());
-    let mut request = Request::new(url, Some(origin), None, HttpsState::None);
-    request.referrer = Referrer::NoReferrer;
+    let mut request = Request::new(
+        url,
+        Some(origin),
+        Referrer::NoReferrer,
+        None,
+        HttpsState::None,
+    );
 
     let fetch_response = fetch(&mut request, None);
     // We should see an opaque-filtered response.
@@ -177,6 +197,7 @@ fn test_fetch_blob() {
     let mut request = Request::new(
         url,
         Some(Origin::Origin(origin.origin())),
+        Referrer::NoReferrer,
         None,
         HttpsState::None,
     );
@@ -220,7 +241,13 @@ fn test_file() {
     let url = ServoUrl::from_file_path(path.clone()).unwrap();
 
     let origin = Origin::Origin(url.origin());
-    let mut request = Request::new(url, Some(origin), None, HttpsState::None);
+    let mut request = Request::new(
+        url,
+        Some(origin),
+        Referrer::NoReferrer,
+        None,
+        HttpsState::None,
+    );
 
     let pool = CoreResourceThreadPool::new(1);
     let pool_handle = Arc::new(pool);
@@ -262,8 +289,13 @@ fn test_file() {
 fn test_fetch_ftp() {
     let url = ServoUrl::parse("ftp://not-supported").unwrap();
     let origin = Origin::Origin(url.origin());
-    let mut request = Request::new(url, Some(origin), None, HttpsState::None);
-    request.referrer = Referrer::NoReferrer;
+    let mut request = Request::new(
+        url,
+        Some(origin),
+        Referrer::NoReferrer,
+        None,
+        HttpsState::None,
+    );
     let fetch_response = fetch(&mut request, None);
     assert!(fetch_response.is_network_error());
 }
@@ -272,8 +304,13 @@ fn test_fetch_ftp() {
 fn test_fetch_bogus_scheme() {
     let url = ServoUrl::parse("bogus://whatever").unwrap();
     let origin = Origin::Origin(url.origin());
-    let mut request = Request::new(url, Some(origin), None, HttpsState::None);
-    request.referrer = Referrer::NoReferrer;
+    let mut request = Request::new(
+        url,
+        Some(origin),
+        Referrer::NoReferrer,
+        None,
+        HttpsState::None,
+    );
     let fetch_response = fetch(&mut request, None);
     assert!(fetch_response.is_network_error());
 }
@@ -319,8 +356,13 @@ fn test_cors_preflight_fetch() {
     let target_url = url.clone().join("a.html").unwrap();
 
     let origin = Origin::Origin(ImmutableOrigin::new_opaque());
-    let mut request = Request::new(url.clone(), Some(origin), None, HttpsState::None);
-    request.referrer = Referrer::ReferrerUrl(target_url);
+    let mut request = Request::new(
+        url.clone(),
+        Some(origin),
+        Referrer::ReferrerUrl(target_url),
+        None,
+        HttpsState::None,
+    );
     request.referrer_policy = Some(ReferrerPolicy::Origin);
     request.use_cors_preflight = true;
     request.mode = RequestMode::CorsMode;
@@ -371,8 +413,13 @@ fn test_cors_preflight_cache_fetch() {
     let (server, url) = make_server(handler);
 
     let origin = Origin::Origin(ImmutableOrigin::new_opaque());
-    let mut request = Request::new(url.clone(), Some(origin.clone()), None, HttpsState::None);
-    request.referrer = Referrer::NoReferrer;
+    let mut request = Request::new(
+        url.clone(),
+        Some(origin.clone()),
+        Referrer::NoReferrer,
+        None,
+        HttpsState::None,
+    );
     request.use_cors_preflight = true;
     request.mode = RequestMode::CorsMode;
     let mut wrapped_request0 = request.clone();
@@ -433,9 +480,14 @@ fn test_cors_preflight_fetch_network_error() {
     let (server, url) = make_server(handler);
 
     let origin = Origin::Origin(ImmutableOrigin::new_opaque());
-    let mut request = Request::new(url, Some(origin), None, HttpsState::None);
+    let mut request = Request::new(
+        url,
+        Some(origin),
+        Referrer::NoReferrer,
+        None,
+        HttpsState::None,
+    );
     request.method = Method::from_bytes(b"CHICKEN").unwrap();
-    request.referrer = Referrer::NoReferrer;
     request.use_cors_preflight = true;
     request.mode = RequestMode::CorsMode;
     let fetch_response = fetch(&mut request, None);
@@ -462,8 +514,13 @@ fn test_fetch_response_is_basic_filtered() {
     let (server, url) = make_server(handler);
 
     let origin = Origin::Origin(url.origin());
-    let mut request = Request::new(url, Some(origin), None, HttpsState::None);
-    request.referrer = Referrer::NoReferrer;
+    let mut request = Request::new(
+        url,
+        Some(origin),
+        Referrer::NoReferrer,
+        None,
+        HttpsState::None,
+    );
     let fetch_response = fetch(&mut request, None);
     let _ = server.close();
 
@@ -525,8 +582,13 @@ fn test_fetch_response_is_cors_filtered() {
 
     // an origin mis-match will stop it from defaulting to a basic filtered response
     let origin = Origin::Origin(ImmutableOrigin::new_opaque());
-    let mut request = Request::new(url, Some(origin), None, HttpsState::None);
-    request.referrer = Referrer::NoReferrer;
+    let mut request = Request::new(
+        url,
+        Some(origin),
+        Referrer::NoReferrer,
+        None,
+        HttpsState::None,
+    );
     request.mode = RequestMode::CorsMode;
     let fetch_response = fetch(&mut request, None);
     let _ = server.close();
@@ -559,8 +621,13 @@ fn test_fetch_response_is_opaque_filtered() {
 
     // an origin mis-match will fall through to an Opaque filtered response
     let origin = Origin::Origin(ImmutableOrigin::new_opaque());
-    let mut request = Request::new(url, Some(origin), None, HttpsState::None);
-    request.referrer = Referrer::NoReferrer;
+    let mut request = Request::new(
+        url,
+        Some(origin),
+        Referrer::NoReferrer,
+        None,
+        HttpsState::None,
+    );
     let fetch_response = fetch(&mut request, None);
     let _ = server.close();
 
@@ -607,8 +674,13 @@ fn test_fetch_response_is_opaque_redirect_filtered() {
     let (server, url) = make_server(handler);
 
     let origin = Origin::Origin(url.origin());
-    let mut request = Request::new(url, Some(origin), None, HttpsState::None);
-    request.referrer = Referrer::NoReferrer;
+    let mut request = Request::new(
+        url,
+        Some(origin),
+        Referrer::NoReferrer,
+        None,
+        HttpsState::None,
+    );
     request.redirect_mode = RedirectMode::Manual;
     let fetch_response = fetch(&mut request, None);
     let _ = server.close();
@@ -641,8 +713,13 @@ fn test_fetch_with_local_urls_only() {
 
     let do_fetch = |url: ServoUrl| {
         let origin = Origin::Origin(url.origin());
-        let mut request = Request::new(url, Some(origin), None, HttpsState::None);
-        request.referrer = Referrer::NoReferrer;
+        let mut request = Request::new(
+            url,
+            Some(origin),
+            Referrer::NoReferrer,
+            None,
+            HttpsState::None,
+        );
 
         // Set the flag.
         request.local_urls_only = true;
@@ -708,8 +785,13 @@ fn test_fetch_with_hsts() {
         );
     }
     let origin = Origin::Origin(url.origin());
-    let mut request = Request::new(url, Some(origin), None, HttpsState::None);
-    request.referrer = Referrer::NoReferrer;
+    let mut request = Request::new(
+        url,
+        Some(origin),
+        Referrer::NoReferrer,
+        None,
+        HttpsState::None,
+    );
     // Set the flag.
     request.local_urls_only = false;
     let response = fetch_with_context(&mut request, &mut context);
@@ -759,7 +841,7 @@ fn test_load_adds_host_to_hsts_list_when_url_is_https() {
         ))),
     };
 
-    let mut request = RequestBuilder::new(url.clone())
+    let mut request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
         .method(Method::GET)
         .body(None)
         .destination(Destination::Document)
@@ -824,7 +906,7 @@ fn test_fetch_self_signed() {
         ))),
     };
 
-    let mut request = RequestBuilder::new(url.clone())
+    let mut request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
         .method(Method::GET)
         .body(None)
         .destination(Destination::Document)
@@ -850,7 +932,7 @@ fn test_fetch_self_signed() {
     let (server, mut url) = make_ssl_server(handler, cert_path.clone(), key_path.clone());
     url.as_mut_url().set_scheme("https").unwrap();
 
-    let mut request = RequestBuilder::new(url.clone())
+    let mut request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
         .method(Method::GET)
         .body(None)
         .destination(Destination::Document)
@@ -874,8 +956,13 @@ fn test_fetch_with_sri_network_error() {
     let (server, url) = make_server(handler);
 
     let origin = Origin::Origin(url.origin());
-    let mut request = Request::new(url, Some(origin), None, HttpsState::None);
-    request.referrer = Referrer::NoReferrer;
+    let mut request = Request::new(
+        url,
+        Some(origin),
+        Referrer::NoReferrer,
+        None,
+        HttpsState::None,
+    );
     // To calulate hash use :
     // echo -n "alert('Hello, Network Error');" | openssl dgst -sha384 -binary | openssl base64 -A
     request.integrity_metadata =
@@ -898,8 +985,13 @@ fn test_fetch_with_sri_sucess() {
     let (server, url) = make_server(handler);
 
     let origin = Origin::Origin(url.origin());
-    let mut request = Request::new(url, Some(origin), None, HttpsState::None);
-    request.referrer = Referrer::NoReferrer;
+    let mut request = Request::new(
+        url,
+        Some(origin),
+        Referrer::NoReferrer,
+        None,
+        HttpsState::None,
+    );
     // To calulate hash use :
     // echo -n "alert('Hello, Network Error');" | openssl dgst -sha384 -binary | openssl base64 -A
     request.integrity_metadata =
@@ -938,7 +1030,13 @@ fn test_fetch_blocked_nosniff() {
         let (server, url) = make_server(handler);
 
         let origin = Origin::Origin(url.origin());
-        let mut request = Request::new(url, Some(origin), None, HttpsState::None);
+        let mut request = Request::new(
+            url,
+            Some(origin),
+            Referrer::NoReferrer,
+            None,
+            HttpsState::None,
+        );
         request.destination = destination;
         let fetch_response = fetch(&mut request, None);
         let _ = server.close();
@@ -982,8 +1080,13 @@ fn setup_server_and_fetch(message: &'static [u8], redirect_cap: u32) -> Response
     let (server, url) = make_server(handler);
 
     let origin = Origin::Origin(url.origin());
-    let mut request = Request::new(url, Some(origin), None, HttpsState::None);
-    request.referrer = Referrer::NoReferrer;
+    let mut request = Request::new(
+        url,
+        Some(origin),
+        Referrer::NoReferrer,
+        None,
+        HttpsState::None,
+    );
     let fetch_response = fetch(&mut request, None);
     let _ = server.close();
     fetch_response
@@ -1070,8 +1173,13 @@ fn test_fetch_redirect_updates_method_runner(
     let (server, url) = make_server(handler);
 
     let origin = Origin::Origin(url.origin());
-    let mut request = Request::new(url, Some(origin), None, HttpsState::None);
-    request.referrer = Referrer::NoReferrer;
+    let mut request = Request::new(
+        url,
+        Some(origin),
+        Referrer::NoReferrer,
+        None,
+        HttpsState::None,
+    );
     request.method = method;
 
     let _ = fetch(&mut request, None);
@@ -1153,8 +1261,13 @@ fn test_fetch_async_returns_complete_response() {
     let (server, url) = make_server(handler);
 
     let origin = Origin::Origin(url.origin());
-    let mut request = Request::new(url, Some(origin), None, HttpsState::None);
-    request.referrer = Referrer::NoReferrer;
+    let mut request = Request::new(
+        url,
+        Some(origin),
+        Referrer::NoReferrer,
+        None,
+        HttpsState::None,
+    );
 
     let fetch_response = fetch(&mut request, None);
 
@@ -1172,8 +1285,13 @@ fn test_opaque_filtered_fetch_async_returns_complete_response() {
 
     // an origin mis-match will fall through to an Opaque filtered response
     let origin = Origin::Origin(ImmutableOrigin::new_opaque());
-    let mut request = Request::new(url, Some(origin), None, HttpsState::None);
-    request.referrer = Referrer::NoReferrer;
+    let mut request = Request::new(
+        url,
+        Some(origin),
+        Referrer::NoReferrer,
+        None,
+        HttpsState::None,
+    );
 
     let fetch_response = fetch(&mut request, None);
 
@@ -1208,8 +1326,13 @@ fn test_opaque_redirect_filtered_fetch_async_returns_complete_response() {
     let (server, url) = make_server(handler);
 
     let origin = Origin::Origin(url.origin());
-    let mut request = Request::new(url, Some(origin), None, HttpsState::None);
-    request.referrer = Referrer::NoReferrer;
+    let mut request = Request::new(
+        url,
+        Some(origin),
+        Referrer::NoReferrer,
+        None,
+        HttpsState::None,
+    );
     request.redirect_mode = RedirectMode::Manual;
 
     let fetch_response = fetch(&mut request, None);
@@ -1233,10 +1356,10 @@ fn test_fetch_with_devtools() {
     let mut request = Request::new(
         url.clone(),
         Some(origin),
+        Referrer::NoReferrer,
         Some(TEST_PIPELINE_ID),
         HttpsState::None,
     );
-    request.referrer = Referrer::NoReferrer;
 
     let (devtools_chan, devtools_port) = unbounded();
 
diff --git a/components/net/tests/http_cache.rs b/components/net/tests/http_cache.rs
index c56f4c59d72..6d2cd50ce47 100644
--- a/components/net/tests/http_cache.rs
+++ b/components/net/tests/http_cache.rs
@@ -7,7 +7,7 @@ use http::header::{HeaderValue, EXPIRES};
 use http::StatusCode;
 use msg::constellation_msg::TEST_PIPELINE_ID;
 use net::http_cache::HttpCache;
-use net_traits::request::{Origin, Request};
+use net_traits::request::{Origin, Referrer, Request};
 use net_traits::response::{HttpsState, Response, ResponseBody};
 use net_traits::{ResourceFetchTiming, ResourceTimingType};
 use servo_url::ServoUrl;
@@ -23,6 +23,7 @@ fn test_refreshing_resource_sets_done_chan_the_appropriate_value() {
     let request = Request::new(
         url.clone(),
         Some(Origin::Origin(url.clone().origin())),
+        Referrer::NoReferrer,
         Some(TEST_PIPELINE_ID),
         HttpsState::None,
     );
diff --git a/components/net/tests/http_loader.rs b/components/net/tests/http_loader.rs
index 48f18560d54..f5b5a82cb5a 100644
--- a/components/net/tests/http_loader.rs
+++ b/components/net/tests/http_loader.rs
@@ -33,7 +33,7 @@ use net::http_loader::determine_request_referrer;
 use net::resource_thread::AuthCacheEntry;
 use net::test::replace_host_table;
 use net_traits::request::{
-    BodyChunkRequest, BodyChunkResponse, BodySource, CredentialsMode, Destination, RequestBody,
+    BodyChunkRequest, BodyChunkResponse, BodySource, CredentialsMode, Destination, RequestBody, Referrer
     RequestBuilder, RequestMode,
 };
 use net_traits::response::{HttpsState, ResponseBody};
@@ -159,7 +159,7 @@ fn test_check_default_headers_loaded_in_every_request() {
     *expected_headers.lock().unwrap() = Some(headers.clone());
 
     // Testing for method.GET
-    let mut request = RequestBuilder::new(url.clone())
+    let mut request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
         .method(Method::GET)
         .destination(Destination::Document)
         .origin(url.clone().origin())
@@ -186,7 +186,7 @@ fn test_check_default_headers_loaded_in_every_request() {
         HeaderValue::from_str(&url_str[..url_str.len() - 1]).unwrap(),
     );
     *expected_headers.lock().unwrap() = Some(post_headers);
-    let mut request = RequestBuilder::new(url.clone())
+    let mut request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
         .method(Method::POST)
         .destination(Destination::Document)
         .origin(url.clone().origin())
@@ -216,7 +216,7 @@ fn test_load_when_request_is_not_get_or_head_and_there_is_no_body_content_length
     };
     let (server, url) = make_server(handler);
 
-    let mut request = RequestBuilder::new(url.clone())
+    let mut request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
         .method(Method::POST)
         .body(None)
         .destination(Destination::Document)
@@ -248,7 +248,7 @@ fn test_request_and_response_data_with_network_messages() {
 
     let mut request_headers = HeaderMap::new();
     request_headers.typed_insert(Host::from("bar.foo".parse::<Authority>().unwrap()));
-    let mut request = RequestBuilder::new(url.clone())
+    let mut request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
         .method(Method::GET)
         .headers(request_headers)
         .body(None)
@@ -343,7 +343,7 @@ fn test_request_and_response_message_from_devtool_without_pipeline_id() {
     };
     let (server, url) = make_server(handler);
 
-    let mut request = RequestBuilder::new(url.clone())
+    let mut request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
         .method(Method::GET)
         .destination(Destination::Document)
         .origin(mock_origin())
@@ -385,7 +385,7 @@ fn test_redirected_request_to_devtools() {
     };
     let (pre_server, pre_url) = make_server(pre_handler);
 
-    let mut request = RequestBuilder::new(pre_url.clone())
+    let mut request = RequestBuilder::new(pre_url.clone(), Referrer::NoReferrer)
         .method(Method::POST)
         .destination(Destination::Document)
         .pipeline_id(Some(TEST_PIPELINE_ID))
@@ -434,7 +434,7 @@ fn test_load_when_redirecting_from_a_post_should_rewrite_next_request_as_get() {
     };
     let (pre_server, pre_url) = make_server(pre_handler);
 
-    let mut request = RequestBuilder::new(pre_url.clone())
+    let mut request = RequestBuilder::new(pre_url.clone(), Referrer::NoReferrer)
         .method(Method::POST)
         .destination(Destination::Document)
         .origin(mock_origin())
@@ -464,7 +464,7 @@ fn test_load_should_decode_the_response_as_deflate_when_response_headers_have_co
     };
     let (server, url) = make_server(handler);
 
-    let mut request = RequestBuilder::new(url.clone())
+    let mut request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
         .method(Method::GET)
         .body(None)
         .destination(Destination::Document)
@@ -497,7 +497,7 @@ fn test_load_should_decode_the_response_as_gzip_when_response_headers_have_conte
     };
     let (server, url) = make_server(handler);
 
-    let mut request = RequestBuilder::new(url.clone())
+    let mut request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
         .method(Method::GET)
         .body(None)
         .destination(Destination::Document)
@@ -552,7 +552,7 @@ fn test_load_doesnt_send_request_body_on_any_redirect() {
     let content = b"Body on POST!";
     let request_body = create_request_body_with_content(content.to_vec());
 
-    let mut request = RequestBuilder::new(pre_url.clone())
+    let mut request = RequestBuilder::new(pre_url.clone(), Referrer::NoReferrer)
         .body(Some(request_body))
         .method(Method::POST)
         .destination(Destination::Document)
@@ -580,7 +580,7 @@ fn test_load_doesnt_add_host_to_hsts_list_when_url_is_http_even_if_hsts_headers_
     };
     let (server, url) = make_server(handler);
 
-    let mut request = RequestBuilder::new(url.clone())
+    let mut request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
         .method(Method::GET)
         .body(None)
         .destination(Destination::Document)
@@ -626,7 +626,7 @@ fn test_load_sets_cookies_in_the_resource_manager_when_it_get_set_cookie_header_
 
     assert_cookie_for_domain(&context.state.cookie_jar, url.as_str(), None);
 
-    let mut request = RequestBuilder::new(url.clone())
+    let mut request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
         .method(Method::GET)
         .body(None)
         .destination(Destination::Document)
@@ -678,7 +678,7 @@ fn test_load_sets_requests_cookies_header_for_url_by_getting_cookies_from_the_re
         cookie_jar.push(cookie, &url, CookieSource::HTTP);
     }
 
-    let mut request = RequestBuilder::new(url.clone())
+    let mut request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
         .method(Method::GET)
         .body(None)
         .destination(Destination::Document)
@@ -724,7 +724,7 @@ fn test_load_sends_cookie_if_nonhttp() {
         cookie_jar.push(cookie, &url, CookieSource::HTTP);
     }
 
-    let mut request = RequestBuilder::new(url.clone())
+    let mut request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
         .method(Method::GET)
         .body(None)
         .destination(Destination::Document)
@@ -761,7 +761,7 @@ fn test_cookie_set_with_httponly_should_not_be_available_using_getcookiesforurl(
 
     assert_cookie_for_domain(&context.state.cookie_jar, url.as_str(), None);
 
-    let mut request = RequestBuilder::new(url.clone())
+    let mut request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
         .method(Method::GET)
         .body(None)
         .destination(Destination::Document)
@@ -808,7 +808,7 @@ fn test_when_cookie_received_marked_secure_is_ignored_for_http() {
 
     assert_cookie_for_domain(&context.state.cookie_jar, url.as_str(), None);
 
-    let mut request = RequestBuilder::new(url.clone())
+    let mut request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
         .method(Method::GET)
         .body(None)
         .destination(Destination::Document)
@@ -847,7 +847,7 @@ fn test_load_sets_content_length_to_length_of_request_body() {
 
     let request_body = create_request_body_with_content(content.to_vec());
 
-    let mut request = RequestBuilder::new(url.clone())
+    let mut request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
         .method(Method::POST)
         .body(Some(request_body))
         .destination(Destination::Document)
@@ -886,7 +886,7 @@ fn test_load_uses_explicit_accept_from_headers_in_load_data() {
 
     let mut accept_headers = HeaderMap::new();
     accept_headers.insert(header::ACCEPT, HeaderValue::from_static("text/html"));
-    let mut request = RequestBuilder::new(url.clone())
+    let mut request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
         .method(Method::GET)
         .headers(accept_headers)
         .destination(Destination::Document)
@@ -923,7 +923,7 @@ fn test_load_sets_default_accept_to_html_xhtml_xml_and_then_anything_else() {
     };
     let (server, url) = make_server(handler);
 
-    let mut request = RequestBuilder::new(url.clone())
+    let mut request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
         .method(Method::GET)
         .destination(Destination::Document)
         .origin(mock_origin())
@@ -961,7 +961,7 @@ fn test_load_uses_explicit_accept_encoding_from_load_data_headers() {
 
     let mut accept_encoding_headers = HeaderMap::new();
     accept_encoding_headers.insert(header::ACCEPT_ENCODING, HeaderValue::from_static("chunked"));
-    let mut request = RequestBuilder::new(url.clone())
+    let mut request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
         .method(Method::GET)
         .headers(accept_encoding_headers)
         .destination(Destination::Document)
@@ -998,7 +998,7 @@ fn test_load_sets_default_accept_encoding_to_gzip_and_deflate() {
     };
     let (server, url) = make_server(handler);
 
-    let mut request = RequestBuilder::new(url.clone())
+    let mut request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
         .method(Method::GET)
         .destination(Destination::Document)
         .origin(mock_origin())
@@ -1051,7 +1051,7 @@ fn test_load_errors_when_there_a_redirect_loop() {
 
     *url_b_for_a.lock().unwrap() = Some(url_b.clone());
 
-    let mut request = RequestBuilder::new(url_a.clone())
+    let mut request = RequestBuilder::new(url_a.clone(), Referrer::NoReferrer)
         .method(Method::GET)
         .destination(Destination::Document)
         .origin(mock_origin())
@@ -1107,7 +1107,7 @@ fn test_load_succeeds_with_a_redirect_loop() {
 
     *url_b_for_a.lock().unwrap() = Some(url_b.clone());
 
-    let mut request = RequestBuilder::new(url_a.clone())
+    let mut request = RequestBuilder::new(url_a.clone(), Referrer::NoReferrer)
         .method(Method::GET)
         .destination(Destination::Document)
         .origin(mock_origin())
@@ -1146,7 +1146,7 @@ fn test_load_follows_a_redirect() {
     };
     let (pre_server, pre_url) = make_server(pre_handler);
 
-    let mut request = RequestBuilder::new(pre_url.clone())
+    let mut request = RequestBuilder::new(pre_url.clone(), Referrer::NoReferrer)
         .method(Method::GET)
         .destination(Destination::Document)
         .origin(mock_origin())
@@ -1229,7 +1229,7 @@ fn test_redirect_from_x_to_y_provides_y_cookies_from_y() {
         cookie_jar.push(cookie_y, &url_y, CookieSource::HTTP);
     }
 
-    let mut request = RequestBuilder::new(url_x.clone())
+    let mut request = RequestBuilder::new(url_x.clone(), Referrer::NoReferrer)
         .method(Method::GET)
         .destination(Destination::Document)
         .origin(mock_origin())
@@ -1278,7 +1278,7 @@ fn test_redirect_from_x_to_x_provides_x_with_cookie_from_first_response() {
 
     let url = url.join("/initial/").unwrap();
 
-    let mut request = RequestBuilder::new(url.clone())
+    let mut request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
         .method(Method::GET)
         .destination(Destination::Document)
         .origin(mock_origin())
@@ -1309,7 +1309,7 @@ fn test_if_auth_creds_not_in_url_but_in_cache_it_sets_it() {
     };
     let (server, url) = make_server(handler);
 
-    let mut request = RequestBuilder::new(url.clone())
+    let mut request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
         .method(Method::GET)
         .body(None)
         .destination(Destination::Document)
@@ -1353,7 +1353,7 @@ fn test_auth_ui_needs_www_auth() {
     };
     let (server, url) = make_server(handler);
 
-    let mut request = RequestBuilder::new(url.clone())
+    let mut request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
         .method(Method::GET)
         .body(None)
         .destination(Destination::Document)
@@ -1390,7 +1390,7 @@ fn test_origin_set() {
     let mut origin =
         Origin::try_from_parts(url.scheme(), url.host_str().unwrap(), url.port()).unwrap();
     *origin_header_clone.lock().unwrap() = Some(origin.clone());
-    let mut request = RequestBuilder::new(url.clone())
+    let mut request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
         .method(Method::POST)
         .body(None)
         .origin(url.clone().origin())
@@ -1409,7 +1409,7 @@ fn test_origin_set() {
     origin =
         Origin::try_from_parts(origin_url.scheme(), origin_url.host_str().unwrap(), None).unwrap();
     // Test Origin header is set on Get request with CORS mode
-    let mut request = RequestBuilder::new(url.clone())
+    let mut request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
         .method(Method::GET)
         .mode(RequestMode::CorsMode)
         .body(None)
@@ -1427,7 +1427,7 @@ fn test_origin_set() {
         .is_success());
 
     // Test Origin header is not set on method Head
-    let mut request = RequestBuilder::new(url.clone())
+    let mut request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
         .method(Method::HEAD)
         .body(None)
         .origin(url.clone().origin())