4 files changed, 13 insertions, 17 deletions
diff --git a/components/script/dom/dedicatedworkerglobalscope.rs b/components/script/dom/dedicatedworkerglobalscope.rs
index ea284184410..e9579565a44 100644
--- a/components/script/dom/dedicatedworkerglobalscope.rs
+++ b/components/script/dom/dedicatedworkerglobalscope.rs
@@ -320,24 +320,20 @@ impl DedicatedWorkerGlobalScope {
                     .credentials_mode(CredentialsMode::CredentialsSameOrigin)
                     .parser_metadata(ParserMetadata::NotParserInserted)
                     .use_url_credentials(true)
-                    .pipeline_id(pipeline_id)
+                    .pipeline_id(Some(pipeline_id))
                     .referrer(referrer)
                     .referrer_policy(referrer_policy)
                     .origin(origin);
 
                 let runtime = unsafe {
-                    if let Some(pipeline_id) = pipeline_id {
-                        let task_source = NetworkingTaskSource(
-                            Box::new(WorkerThreadWorkerChan {
-                                sender: own_sender.clone(),
-                                worker: worker.clone(),
-                            }),
-                            pipeline_id,
-                        );
-                        new_child_runtime(parent, Some(task_source))
-                    } else {
-                        new_child_runtime(parent, None)
-                    }
+                    let task_source = NetworkingTaskSource(
+                        Box::new(WorkerThreadWorkerChan {
+                            sender: own_sender.clone(),
+                            worker: worker.clone(),
+                        }),
+                        pipeline_id,
+                    );
+                    new_child_runtime(parent, Some(task_source))
                 };
 
                 let (devtools_mpsc_chan, devtools_mpsc_port) = unbounded();
@@ -375,7 +371,7 @@ impl DedicatedWorkerGlobalScope {
                             .send(CommonScriptMsg::Task(
                                 WorkerEvent,
                                 Box::new(SimpleWorkerErrorHandler::new(worker)),
-                                pipeline_id,
+                                Some(pipeline_id),
                                 TaskSourceName::DOMManipulation,
                             ))
                             .unwrap();
diff --git a/components/script/dom/serviceworkerglobalscope.rs b/components/script/dom/serviceworkerglobalscope.rs
index 65eb2cc23b1..ada042c17ac 100644
--- a/components/script/dom/serviceworkerglobalscope.rs
+++ b/components/script/dom/serviceworkerglobalscope.rs
@@ -289,7 +289,7 @@ impl ServiceWorkerGlobalScope {
                     .credentials_mode(CredentialsMode::Include)
                     .parser_metadata(ParserMetadata::NotParserInserted)
                     .use_url_credentials(true)
-                    .pipeline_id(pipeline_id)
+                    .pipeline_id(Some(pipeline_id))
                     .referrer(referrer)
                     .referrer_policy(referrer_policy)
                     .origin(origin);
diff --git a/components/script/dom/serviceworkerregistration.rs b/components/script/dom/serviceworkerregistration.rs
index 00f65f3f2a0..647fb9518c5 100644
--- a/components/script/dom/serviceworkerregistration.rs
+++ b/components/script/dom/serviceworkerregistration.rs
@@ -110,7 +110,7 @@ impl ServiceWorkerRegistration {
         let worker_load_origin = WorkerScriptLoadOrigin {
             referrer_url: None,
             referrer_policy: None,
-            pipeline_id: Some(global.pipeline_id()),
+            pipeline_id: global.pipeline_id(),
         };
 
         let worker_id = WorkerId(Uuid::new_v4());
diff --git a/components/script/dom/worker.rs b/components/script/dom/worker.rs
index 9cec5edf72d..2d126933849 100644
--- a/components/script/dom/worker.rs
+++ b/components/script/dom/worker.rs
@@ -97,7 +97,7 @@ impl Worker {
         let worker_load_origin = WorkerScriptLoadOrigin {
             referrer_url: None,
             referrer_policy: None,
-            pipeline_id: Some(global.pipeline_id()),
+            pipeline_id: global.pipeline_id(),
         };
 
         let (devtools_sender, devtools_receiver) = ipc::channel().unwrap();