diff options
Diffstat (limited to 'chromium/third_party/blink/renderer/modules/webaudio/audio_worklet_global_scope_test.cc')
-rw-r--r-- | chromium/third_party/blink/renderer/modules/webaudio/audio_worklet_global_scope_test.cc | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/chromium/third_party/blink/renderer/modules/webaudio/audio_worklet_global_scope_test.cc b/chromium/third_party/blink/renderer/modules/webaudio/audio_worklet_global_scope_test.cc index 80b166f42dd..c60b0414d34 100644 --- a/chromium/third_party/blink/renderer/modules/webaudio/audio_worklet_global_scope_test.cc +++ b/chromium/third_party/blink/renderer/modules/webaudio/audio_worklet_global_scope_test.cc @@ -21,6 +21,7 @@ #include "third_party/blink/renderer/bindings/core/v8/v8_gc_controller.h" #include "third_party/blink/renderer/bindings/core/v8/worker_or_worklet_script_controller.h" #include "third_party/blink/renderer/core/dom/document.h" +#include "third_party/blink/renderer/core/inspector/worker_devtools_params.h" #include "third_party/blink/renderer/core/messaging/message_channel.h" #include "third_party/blink/renderer/core/messaging/message_port.h" #include "third_party/blink/renderer/core/origin_trials/origin_trial_context.h" @@ -28,7 +29,6 @@ #include "third_party/blink/renderer/core/testing/page_test_base.h" #include "third_party/blink/renderer/core/workers/global_scope_creation_params.h" #include "third_party/blink/renderer/core/workers/worker_backing_thread.h" -#include "third_party/blink/renderer/core/workers/worker_inspector_proxy.h" #include "third_party/blink/renderer/core/workers/worker_reporting_proxy.h" #include "third_party/blink/renderer/core/workers/worklet_module_responses_map.h" #include "third_party/blink/renderer/modules/webaudio/audio_buffer.h" @@ -39,7 +39,6 @@ #include "third_party/blink/renderer/platform/bindings/script_state.h" #include "third_party/blink/renderer/platform/bindings/v8_binding_macros.h" #include "third_party/blink/renderer/platform/bindings/v8_object_constructor.h" -#include "third_party/blink/renderer/platform/loader/fetch/access_control_status.h" #include "third_party/blink/renderer/platform/loader/fetch/resource_loader_options.h" #include "third_party/blink/renderer/platform/weborigin/security_origin.h" #include "third_party/blink/renderer/platform/wtf/text/text_position.h" @@ -69,15 +68,15 @@ class AudioWorkletGlobalScopeTest : public PageTestBase { Document* document = &GetDocument(); thread->Start( std::make_unique<GlobalScopeCreationParams>( - document->Url(), ScriptType::kModule, document->UserAgent(), - Vector<CSPHeaderAndType>(), document->GetReferrerPolicy(), - document->GetSecurityOrigin(), document->IsSecureContext(), - document->GetHttpsState(), nullptr /* worker_clients */, - document->AddressSpace(), + document->Url(), mojom::ScriptType::kModule, document->UserAgent(), + nullptr /* web_worker_fetch_context */, Vector<CSPHeaderAndType>(), + document->GetReferrerPolicy(), document->GetSecurityOrigin(), + document->IsSecureContext(), document->GetHttpsState(), + nullptr /* worker_clients */, document->AddressSpace(), OriginTrialContext::GetTokens(document).get(), base::UnguessableToken::Create(), nullptr /* worker_settings */, kV8CacheOptionsDefault, new WorkletModuleResponsesMap), - base::nullopt, WorkerInspectorProxy::PauseOnWorkerStart::kDontPause, + base::nullopt, std::make_unique<WorkerDevToolsParams>(), ParentExecutionContextTaskRunners::Create()); return thread; } @@ -137,8 +136,8 @@ class AudioWorkletGlobalScopeTest : public PageTestBase { KURL js_url("https://example.com/worklet.js"); ScriptModule module = ScriptModule::Compile( script_state->GetIsolate(), source_code, js_url, js_url, - ScriptFetchOptions(), kSharableCrossOrigin, - TextPosition::MinimumPosition(), ASSERT_NO_EXCEPTION); + ScriptFetchOptions(), TextPosition::MinimumPosition(), + ASSERT_NO_EXCEPTION); EXPECT_FALSE(module.IsNull()); ScriptValue exception = module.Instantiate(script_state); EXPECT_TRUE(exception.IsEmpty()); @@ -154,7 +153,7 @@ class AudioWorkletGlobalScopeTest : public PageTestBase { WaitableEvent* wait_event) { EXPECT_TRUE(thread->IsCurrentThread()); - auto* global_scope = ToAudioWorkletGlobalScope(thread->GlobalScope()); + auto* global_scope = To<AudioWorkletGlobalScope>(thread->GlobalScope()); ScriptState* script_state = global_scope->ScriptController()->GetScriptState(); @@ -202,7 +201,7 @@ class AudioWorkletGlobalScopeTest : public PageTestBase { WaitableEvent* wait_event) { EXPECT_TRUE(thread->IsCurrentThread()); - auto* global_scope = ToAudioWorkletGlobalScope(thread->GlobalScope()); + auto* global_scope = To<AudioWorkletGlobalScope>(thread->GlobalScope()); ScriptState* script_state = global_scope->ScriptController()->GetScriptState(); @@ -257,7 +256,7 @@ class AudioWorkletGlobalScopeTest : public PageTestBase { WaitableEvent* wait_event) { EXPECT_TRUE(thread->IsCurrentThread()); - auto* global_scope = ToAudioWorkletGlobalScope(thread->GlobalScope()); + auto* global_scope = To<AudioWorkletGlobalScope>(thread->GlobalScope()); ScriptState* script_state = global_scope->ScriptController()->GetScriptState(); @@ -323,7 +322,7 @@ class AudioWorkletGlobalScopeTest : public PageTestBase { WaitableEvent* wait_event) { EXPECT_TRUE(thread->IsCurrentThread()); - auto* global_scope = ToAudioWorkletGlobalScope(thread->GlobalScope()); + auto* global_scope = To<AudioWorkletGlobalScope>(thread->GlobalScope()); ScriptState* script_state = global_scope->ScriptController()->GetScriptState(); |