aboutsummaryrefslogtreecommitdiffstats
path: root/components/net/tests
diff options
context:
space:
mode:
authorGregory Terzian <gterzian@users.noreply.github.com>2020-02-13 00:18:14 +0800
committerGregory Terzian <gterzian@users.noreply.github.com>2020-02-21 14:26:45 +0800
commit895500e68cf62e53754fdb9f43c818e022bf0b47 (patch)
treee1ad6f68706f68d82024cbda15364fd2cf0fe712 /components/net/tests
parent4c5ec9da27b4ff1e7175d9f1e8994d7ba0922b3d (diff)
downloadservo-895500e68cf62e53754fdb9f43c818e022bf0b47.tar.gz
servo-895500e68cf62e53754fdb9f43c818e022bf0b47.zip
add a fetch token for blob urls
Diffstat (limited to 'components/net/tests')
-rw-r--r--components/net/tests/fetch.rs3
-rw-r--r--components/net/tests/filemanager_thread.rs2
-rw-r--r--components/net/tests/main.rs2
3 files changed, 5 insertions, 2 deletions
diff --git a/components/net/tests/fetch.rs b/components/net/tests/fetch.rs
index b936c70f3a5..4d338ce6391 100644
--- a/components/net/tests/fetch.rs
+++ b/components/net/tests/fetch.rs
@@ -29,6 +29,7 @@ use net::filemanager_thread::FileManager;
use net::hsts::HstsEntry;
use net::resource_thread::CoreResourceThreadPool;
use net::test::HttpState;
+use net_traits::filemanager_thread::FileTokenCheck;
use net_traits::request::{
Destination, Origin, RedirectMode, Referrer, Request, RequestBuilder, RequestMode,
};
@@ -683,6 +684,7 @@ fn test_fetch_with_hsts() {
user_agent: DEFAULT_USER_AGENT.into(),
devtools_chan: None,
filemanager: FileManager::new(create_embedder_proxy(), Weak::new()),
+ file_token: FileTokenCheck::NotRequired,
cancellation_listener: Arc::new(Mutex::new(CancellationListener::new(None))),
timing: ServoArc::new(Mutex::new(ResourceFetchTiming::new(
ResourceTimingType::Navigation,
@@ -735,6 +737,7 @@ fn test_load_adds_host_to_hsts_list_when_url_is_https() {
user_agent: DEFAULT_USER_AGENT.into(),
devtools_chan: None,
filemanager: FileManager::new(create_embedder_proxy(), Weak::new()),
+ file_token: FileTokenCheck::NotRequired,
cancellation_listener: Arc::new(Mutex::new(CancellationListener::new(None))),
timing: ServoArc::new(Mutex::new(ResourceFetchTiming::new(
ResourceTimingType::Navigation,
diff --git a/components/net/tests/filemanager_thread.rs b/components/net/tests/filemanager_thread.rs
index 9438fcc88ee..3cda5a2f2d1 100644
--- a/components/net/tests/filemanager_thread.rs
+++ b/components/net/tests/filemanager_thread.rs
@@ -59,7 +59,6 @@ fn test_filemanager() {
filemanager.handle(FileManagerThreadMsg::ReadFile(
tx2,
selected.id.clone(),
- false,
origin.clone(),
));
@@ -113,7 +112,6 @@ fn test_filemanager() {
filemanager.handle(FileManagerThreadMsg::ReadFile(
tx2,
selected.id.clone(),
- false,
origin.clone(),
));
diff --git a/components/net/tests/main.rs b/components/net/tests/main.rs
index 727403026de..5ad2c55f728 100644
--- a/components/net/tests/main.rs
+++ b/components/net/tests/main.rs
@@ -35,6 +35,7 @@ use net::fetch::methods::{self, CancellationListener, FetchContext};
use net::filemanager_thread::FileManager;
use net::resource_thread::CoreResourceThreadPool;
use net::test::HttpState;
+use net_traits::filemanager_thread::FileTokenCheck;
use net_traits::request::Request;
use net_traits::response::Response;
use net_traits::{FetchTaskTarget, ResourceFetchTiming, ResourceTimingType};
@@ -98,6 +99,7 @@ fn new_fetch_context(
user_agent: DEFAULT_USER_AGENT.into(),
devtools_chan: dc,
filemanager: FileManager::new(sender, pool_handle.unwrap_or_else(|| Weak::new())),
+ file_token: FileTokenCheck::NotRequired,
cancellation_listener: Arc::new(Mutex::new(CancellationListener::new(None))),
timing: ServoArc::new(Mutex::new(ResourceFetchTiming::new(
ResourceTimingType::Navigation,