summaryrefslogtreecommitdiff
path: root/chromium/third_party/blink/renderer/core/loader/modulescript/module_script_loader_test.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/third_party/blink/renderer/core/loader/modulescript/module_script_loader_test.cc')
-rw-r--r--chromium/third_party/blink/renderer/core/loader/modulescript/module_script_loader_test.cc91
1 files changed, 47 insertions, 44 deletions
diff --git a/chromium/third_party/blink/renderer/core/loader/modulescript/module_script_loader_test.cc b/chromium/third_party/blink/renderer/core/loader/modulescript/module_script_loader_test.cc
index 51b7edf1713..c2097c241be 100644
--- a/chromium/third_party/blink/renderer/core/loader/modulescript/module_script_loader_test.cc
+++ b/chromium/third_party/blink/renderer/core/loader/modulescript/module_script_loader_test.cc
@@ -90,7 +90,8 @@ class ModuleScriptLoaderTestModulator final : public DummyModulator {
void SetModuleRequests(const Vector<String>& requests) {
requests_.clear();
for (const String& request : requests) {
- requests_.emplace_back(request, TextPosition::MinimumPosition());
+ requests_.emplace_back(request, TextPosition::MinimumPosition(),
+ Vector<ImportAssertion>());
}
}
Vector<ModuleRequest> ModuleRequestsFromModuleRecord(
@@ -100,7 +101,7 @@ class ModuleScriptLoaderTestModulator final : public DummyModulator {
ModuleScriptFetcher* CreateModuleScriptFetcher(
ModuleScriptCustomFetchType custom_fetch_type,
- util::PassKey<ModuleScriptLoader> pass_key) override {
+ base::PassKey<ModuleScriptLoader> pass_key) override {
auto* execution_context = ExecutionContext::From(script_state_);
if (auto* scope = DynamicTo<WorkletGlobalScope>(execution_context)) {
EXPECT_EQ(ModuleScriptCustomFetchType::kWorkletAddModule,
@@ -189,13 +190,14 @@ void ModuleScriptLoaderTest::InitializeForDocument() {
auto* fetch_context = MakeGarbageCollected<MockFetchContext>();
auto* properties =
MakeGarbageCollected<TestResourceFetcherProperties>(security_origin_);
- fetcher_ = MakeGarbageCollected<ResourceFetcher>(ResourceFetcherInit(
- properties->MakeDetachable(), fetch_context,
- base::MakeRefCounted<scheduler::FakeTaskRunner>(),
- base::MakeRefCounted<scheduler::FakeTaskRunner>(),
- MakeGarbageCollected<TestLoaderFactory>(
- platform_->GetURLLoaderMockFactory()),
- MakeGarbageCollected<MockContextLifecycleNotifier>()));
+ fetcher_ = MakeGarbageCollected<ResourceFetcher>(
+ ResourceFetcherInit(properties->MakeDetachable(), fetch_context,
+ base::MakeRefCounted<scheduler::FakeTaskRunner>(),
+ base::MakeRefCounted<scheduler::FakeTaskRunner>(),
+ MakeGarbageCollected<TestLoaderFactory>(
+ platform_->GetURLLoaderMockFactory()),
+ MakeGarbageCollected<MockContextLifecycleNotifier>(),
+ nullptr /* back_forward_cache_loader_helper */));
modulator_ = MakeGarbageCollected<ModuleScriptLoaderTestModulator>(
ToScriptStateForMainWorld(&GetFrame()));
}
@@ -204,19 +206,21 @@ void ModuleScriptLoaderTest::InitializeForWorklet() {
auto* fetch_context = MakeGarbageCollected<MockFetchContext>();
auto* properties =
MakeGarbageCollected<TestResourceFetcherProperties>(security_origin_);
- fetcher_ = MakeGarbageCollected<ResourceFetcher>(ResourceFetcherInit(
- properties->MakeDetachable(), fetch_context,
- base::MakeRefCounted<scheduler::FakeTaskRunner>(),
- base::MakeRefCounted<scheduler::FakeTaskRunner>(),
- MakeGarbageCollected<TestLoaderFactory>(
- platform_->GetURLLoaderMockFactory()),
- MakeGarbageCollected<MockContextLifecycleNotifier>()));
+ fetcher_ = MakeGarbageCollected<ResourceFetcher>(
+ ResourceFetcherInit(properties->MakeDetachable(), fetch_context,
+ base::MakeRefCounted<scheduler::FakeTaskRunner>(),
+ base::MakeRefCounted<scheduler::FakeTaskRunner>(),
+ MakeGarbageCollected<TestLoaderFactory>(
+ platform_->GetURLLoaderMockFactory()),
+ MakeGarbageCollected<MockContextLifecycleNotifier>(),
+ nullptr /* back_forward_cache_loader_helper */));
reporting_proxy_ = std::make_unique<MockWorkerReportingProxy>();
auto creation_params = std::make_unique<GlobalScopeCreationParams>(
url_, mojom::blink::ScriptType::kModule, "GlobalScopeName", "UserAgent",
UserAgentMetadata(), nullptr /* web_worker_fetch_context */,
- Vector<CSPHeaderAndType>(), network::mojom::ReferrerPolicy::kDefault,
- security_origin_.get(), true /* is_secure_context */, HttpsState::kModern,
+ Vector<network::mojom::blink::ContentSecurityPolicyPtr>(),
+ network::mojom::ReferrerPolicy::kDefault, security_origin_.get(),
+ true /* is_secure_context */, HttpsState::kModern,
nullptr /* worker_clients */, nullptr /* content_settings_client */,
network::mojom::IPAddressSpace::kLocal, nullptr /* origin_trial_token */,
base::UnguessableToken::Create(), nullptr /* worker_settings */,
@@ -225,8 +229,7 @@ void ModuleScriptLoaderTest::InitializeForWorklet() {
mojo::NullRemote() /* browser_interface_broker */,
BeginFrameProviderParams(), nullptr /* parent_feature_policy */,
base::UnguessableToken::Create() /* agent_cluster_id */);
- creation_params->parent_context_token =
- LocalFrameToken(GetFrame().GetFrameToken());
+ creation_params->parent_context_token = GetFrame().GetLocalFrameToken();
global_scope_ = MakeGarbageCollected<FakeWorkletGlobalScope>(
std::move(creation_params), *reporting_proxy_, &GetFrame(),
false /* create_microtask_queue */);
@@ -241,10 +244,10 @@ void ModuleScriptLoaderTest::TestFetchDataURL(
TestModuleScriptLoaderClient* client) {
auto* registry = MakeGarbageCollected<ModuleScriptLoaderRegistry>();
KURL url("data:text/javascript,export default 'grapes';");
- ModuleScriptLoader::Fetch(ModuleScriptFetchRequest::CreateForTest(url),
- fetcher_, ModuleGraphLevel::kTopLevelModuleFetch,
- GetModulator(), custom_fetch_type, registry,
- client);
+ ModuleScriptLoader::Fetch(
+ ModuleScriptFetchRequest::CreateForTest(url, ModuleType::kJavaScript),
+ fetcher_, ModuleGraphLevel::kTopLevelModuleFetch, GetModulator(),
+ custom_fetch_type, registry, client);
}
void ModuleScriptLoaderTest::TestFetchDataURLJSONModule(
@@ -255,10 +258,10 @@ void ModuleScriptLoaderTest::TestFetchDataURLJSONModule(
"data:application/"
"json,{\"1\":{\"name\":\"MIKE\",\"surname\":\"TAYLOR\"},\"2\":{\"name\":"
"\"TOM\",\"surname\":\"JERRY\"}}");
- ModuleScriptLoader::Fetch(ModuleScriptFetchRequest::CreateForTest(url),
- fetcher_, ModuleGraphLevel::kTopLevelModuleFetch,
- GetModulator(), custom_fetch_type, registry,
- client);
+ ModuleScriptLoader::Fetch(
+ ModuleScriptFetchRequest::CreateForTest(url, ModuleType::kJSON), fetcher_,
+ ModuleGraphLevel::kTopLevelModuleFetch, GetModulator(), custom_fetch_type,
+ registry, client);
}
void ModuleScriptLoaderTest::TestFetchDataURLInvalidJSONModule(
@@ -268,10 +271,10 @@ void ModuleScriptLoaderTest::TestFetchDataURLInvalidJSONModule(
KURL url(
"data:application/"
"json,{{{");
- ModuleScriptLoader::Fetch(ModuleScriptFetchRequest::CreateForTest(url),
- fetcher_, ModuleGraphLevel::kTopLevelModuleFetch,
- GetModulator(), custom_fetch_type, registry,
- client);
+ ModuleScriptLoader::Fetch(
+ ModuleScriptFetchRequest::CreateForTest(url, ModuleType::kJSON), fetcher_,
+ ModuleGraphLevel::kTopLevelModuleFetch, GetModulator(), custom_fetch_type,
+ registry, client);
}
TEST_F(ModuleScriptLoaderTest, FetchDataURL) {
@@ -422,10 +425,10 @@ void ModuleScriptLoaderTest::TestInvalidSpecifier(
auto* registry = MakeGarbageCollected<ModuleScriptLoaderRegistry>();
KURL url("data:text/javascript,import 'invalid';export default 'grapes';");
GetModulator()->SetModuleRequests({"invalid"});
- ModuleScriptLoader::Fetch(ModuleScriptFetchRequest::CreateForTest(url),
- fetcher_, ModuleGraphLevel::kTopLevelModuleFetch,
- GetModulator(), custom_fetch_type, registry,
- client);
+ ModuleScriptLoader::Fetch(
+ ModuleScriptFetchRequest::CreateForTest(url, ModuleType::kJavaScript),
+ fetcher_, ModuleGraphLevel::kTopLevelModuleFetch, GetModulator(),
+ custom_fetch_type, registry, client);
}
TEST_F(ModuleScriptLoaderTest, InvalidSpecifier) {
@@ -466,10 +469,10 @@ void ModuleScriptLoaderTest::TestFetchInvalidURL(
auto* registry = MakeGarbageCollected<ModuleScriptLoaderRegistry>();
KURL url;
EXPECT_FALSE(url.IsValid());
- ModuleScriptLoader::Fetch(ModuleScriptFetchRequest::CreateForTest(url),
- fetcher_, ModuleGraphLevel::kTopLevelModuleFetch,
- GetModulator(), custom_fetch_type, registry,
- client);
+ ModuleScriptLoader::Fetch(
+ ModuleScriptFetchRequest::CreateForTest(url, ModuleType::kJavaScript),
+ fetcher_, ModuleGraphLevel::kTopLevelModuleFetch, GetModulator(),
+ custom_fetch_type, registry, client);
}
TEST_F(ModuleScriptLoaderTest, FetchInvalidURL) {
@@ -508,10 +511,10 @@ void ModuleScriptLoaderTest::TestFetchURL(
platform_->GetURLLoaderMockFactory());
auto* registry = MakeGarbageCollected<ModuleScriptLoaderRegistry>();
- ModuleScriptLoader::Fetch(ModuleScriptFetchRequest::CreateForTest(url),
- fetcher_, ModuleGraphLevel::kTopLevelModuleFetch,
- GetModulator(), custom_fetch_type, registry,
- client);
+ ModuleScriptLoader::Fetch(
+ ModuleScriptFetchRequest::CreateForTest(url, ModuleType::kJavaScript),
+ fetcher_, ModuleGraphLevel::kTopLevelModuleFetch, GetModulator(),
+ custom_fetch_type, registry, client);
}
TEST_F(ModuleScriptLoaderTest, FetchURL) {
View Lorry Controller Status