Revert "fix: service worker registration with custom protocols (elect…

…ron#34290)" This reverts commit 1639ccf. # Conflicts: # patches/chromium/custom_protocols_plzserviceworker.patch
YuriL180821 · Sep 25, 2022 · 315d16a · 315d16a
1 parent a69cca0
commit 315d16a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 59 deletions.
diff --git a/patches/chromium/custom_protocols_plzserviceworker.patch b/patches/chromium/custom_protocols_plzserviceworker.patch
diff --git a/shell/browser/electron_browser_client.cc b/shell/browser/electron_browser_client.cc
@@ -1389,11 +1389,6 @@ void ElectronBrowserClient::
   DCHECK(browser_context);
   DCHECK(factories);
 
-  auto* protocol_registry =
-      ProtocolRegistry::FromBrowserContext(browser_context);
-  protocol_registry->RegisterURLLoaderFactories(factories,
-                                                false /* allow_file_access */);
-
 #if BUILDFLAG(ENABLE_EXTENSIONS)
   factories->emplace(
       extensions::kExtensionScheme,

diff --git a/spec/api-protocol-spec.ts b/spec/api-protocol-spec.ts
@@ -785,7 +785,10 @@ describe('protocol module', () => {
       await expect(contents.executeJavaScript(`navigator.serviceWorker.register('${v4()}.notjs', {scope: './'})`)).to.be.rejected();
     });
 
-    it('should be able to register service worker for custom scheme', async () => {
+    // TODO(nornagon): I'm not sure why this isn't working, but I'm choosing to
+    // disable this test for now to land the roll. See
+    // https://github.com/electron/electron/issues/32664.
+    it.skip('should be able to register service worker for custom scheme', async () => {
       await contents.loadURL(`${serviceWorkerScheme}://${v4()}.com`);
       await contents.executeJavaScript(`navigator.serviceWorker.register('${v4()}.js', {scope: './'})`);
     });