Index: content/browser/shared_worker/shared_worker_service_impl.cc |
diff --git a/content/browser/shared_worker/shared_worker_service_impl.cc b/content/browser/shared_worker/shared_worker_service_impl.cc |
index c350a057a6f73f32401ec7d03bca699923fefe83..b14c66be82fd41a61cf4707ed0293059d3979a56 100644 |
--- a/content/browser/shared_worker/shared_worker_service_impl.cc |
+++ b/content/browser/shared_worker/shared_worker_service_impl.cc |
@@ -296,23 +296,28 @@ void SharedWorkerServiceImpl::RemoveObserver(WorkerServiceObserver* observer) { |
} |
blink::WebWorkerCreationError SharedWorkerServiceImpl::CreateWorker( |
- const ViewHostMsg_CreateWorker_Params& params, |
+ mojom::SharedWorker_CreateWorker_ParamsPtr params, |
int route_id, |
SharedWorkerMessageFilter* filter, |
ResourceContext* resource_context, |
const WorkerStoragePartitionId& partition_id) { |
DCHECK_CURRENTLY_ON(BrowserThread::IO); |
std::unique_ptr<SharedWorkerInstance> instance(new SharedWorkerInstance( |
- params.url, params.name, params.content_security_policy, |
- params.security_policy_type, params.creation_address_space, |
- resource_context, partition_id, params.creation_context_type)); |
+ params->url, params->name, params->content_security_policy, |
+ static_cast<blink::WebContentSecurityPolicyType>( |
+ params->security_policy_type), |
+ static_cast<blink::WebAddressSpace>(params->creation_address_space), |
+ resource_context, partition_id, |
+ static_cast<blink::WebSharedWorkerCreationContextType>( |
+ params->creation_context_type))); |
std::unique_ptr<SharedWorkerPendingInstance::SharedWorkerPendingRequest> |
request(new SharedWorkerPendingInstance::SharedWorkerPendingRequest( |
- filter, route_id, params.document_id, filter->render_process_id(), |
- params.render_frame_route_id)); |
+ filter, route_id, params->document_id, filter->render_process_id(), |
+ params->render_frame_route_id)); |
if (SharedWorkerPendingInstance* pending = FindPendingInstance(*instance)) { |
pending->AddRequest(std::move(request)); |
- if (params.creation_context_type != |
+ if (static_cast<blink::WebSharedWorkerCreationContextType>( |
+ params->creation_context_type) != |
pending->instance()->creation_context_type()) |
return blink::WebWorkerCreationErrorSecureContextMismatch; |
return blink::WebWorkerCreationErrorNone; |