Make url for "client" referrer mandatory

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();