service worker: Add extensions check when ServiceWorkerOnUI is on.

The thread ServiceWorkerContextCore lives on (the "core thread")
will move from the IO thread to the UI thread. This CL makes the
check for extensions work when the feature is enabled.

Bug: 824858
Change-Id: I6f9054bc3d77b8261b7e832e97f6cc71e2b3013d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1763651Reviewed-by: Istiaque Ahmed <lazyboy@chromium.org>
Commit-Queue: Matt Falkenhagen <falken@chromium.org>
Cr-Commit-Position: refs/heads/master@{#689724}

chrome/browser/chrome_content_browser_client.cc

@@ -2342,7 +2342,7 @@ bool ChromeContentBrowserClient::AllowServiceWorkerOnIO(
   // to the TabSpecificContentSettings, since the service worker is blocked
   // because of the extension, rather than because of the user's content
   // settings.
-  if (!ChromeContentBrowserClientExtensionsPart::AllowServiceWorker(
+  if (!ChromeContentBrowserClientExtensionsPart::AllowServiceWorkerOnIO(
           scope, first_party_url, script_url, context)) {
     return false;
   }
@@ -2384,9 +2384,16 @@ bool ChromeContentBrowserClient::AllowServiceWorkerOnUI(
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
 #if BUILDFLAG(ENABLE_EXTENSIONS)
-  // TODO(crbug.com/824858): Implement the extensions service worker check on
-  // the UI thread.
-  return false;
+  // Check if this is an extension-related service worker, and, if so, if it's
+  // allowed (this can return false if, e.g., the extension is disabled).
+  // If it's not allowed, return immediately. We deliberately do *not* report
+  // to the TabSpecificContentSettings, since the service worker is blocked
+  // because of the extension, rather than because of the user's content
+  // settings.
+  if (!ChromeContentBrowserClientExtensionsPart::AllowServiceWorkerOnUI(
+          scope, first_party_url, script_url, context)) {
+    return false;
+  }
 #endif
 
   Profile* profile = Profile::FromBrowserContext(context);

chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc

@@ -165,6 +165,37 @@ bool HasEffectiveUrl(content::BrowserContext* browser_context,
              Profile::FromBrowserContext(browser_context), url) != url;
 }
 
+bool AllowServiceWorker(const GURL& scope,
+                        const GURL& script_url,
+                        const Extension* extension) {
+  // Don't allow a service worker for an extension url with no extension (this
+  // could happen in the case of, e.g., an unloaded extension).
+  if (!extension)
+    return false;
+
+  // If an extension doesn't have a service worker-based background script, it
+  // can register a service worker at any scope.
+  if (!extensions::BackgroundInfo::IsServiceWorkerBased(extension))
+    return true;
+
+  // If the script_url parameter is an empty string, allow it. The
+  // infrastructure will call this function at times when the script url is
+  // unknown, but it is always known at registration, so this is OK.
+  if (script_url.is_empty())
+    return true;
+
+  // An extension with a service worked-based background script can register a
+  // service worker at any scope other than the root scope.
+  if (scope != extension->url())
+    return true;
+
+  // If an extension is service-worker based, only the script specified in the
+  // manifest can be registered at the root scope.
+  const std::string& sw_script =
+      extensions::BackgroundInfo::GetBackgroundServiceWorkerScript(extension);
+  return script_url == extension->GetResourceURL(sw_script);
+}
+
 }  // namespace
 
 ChromeContentBrowserClientExtensionsPart::
@@ -531,7 +562,7 @@ bool ChromeContentBrowserClientExtensionsPart::
 }
 
 // static
-bool ChromeContentBrowserClientExtensionsPart::AllowServiceWorker(
+bool ChromeContentBrowserClientExtensionsPart::AllowServiceWorkerOnIO(
     const GURL& scope,
     const GURL& first_party_url,
     const GURL& script_url,
@@ -544,32 +575,23 @@ bool ChromeContentBrowserClientExtensionsPart::AllowServiceWorker(
   InfoMap* extension_info_map = io_data->GetExtensionInfoMap();
   const Extension* extension =
       extension_info_map->extensions().GetExtensionOrAppByURL(first_party_url);
-  // Don't allow a service worker for an extension url with no extension (this
-  // could happen in the case of, e.g., an unloaded extension).
-  if (!extension)
-    return false;
-
-  // If an extension doesn't have a service worker-based background script, it
-  // can register a service worker at any scope.
-  if (!extensions::BackgroundInfo::IsServiceWorkerBased(extension))
-    return true;
-
-  // If the script_url parameter is an empty string, allow it. The
-  // infrastructure will call this function at times when the script url is
-  // unknown, but it is always known at registration, so this is OK.
-  if (script_url.is_empty())
-    return true;
+  return AllowServiceWorker(scope, script_url, extension);
+}
 
-  // An extension with a service worked-based background script can register a
-  // service worker at any scope other than the root scope.
-  if (scope != extension->url())
+// static
+bool ChromeContentBrowserClientExtensionsPart::AllowServiceWorkerOnUI(
+    const GURL& scope,
+    const GURL& first_party_url,
+    const GURL& script_url,
+    content::BrowserContext* context) {
+  // We only care about extension urls.
+  if (!first_party_url.SchemeIs(kExtensionScheme))
     return true;
 
-  // If an extension is service-worker based, only the script specified in the
-  // manifest can be registered at the root scope.
-  const std::string& sw_script =
-      extensions::BackgroundInfo::GetBackgroundServiceWorkerScript(extension);
-  return script_url == extension->GetResourceURL(sw_script);
+  const Extension* extension = ExtensionRegistry::Get(context)
+                                   ->enabled_extensions()
+                                   .GetExtensionOrAppByURL(first_party_url);
+  return AllowServiceWorker(scope, script_url, extension);
 }
 
 // static

chrome/browser/extensions/chrome_content_browser_client_extensions_part.h

@@ -68,10 +68,15 @@ class ChromeContentBrowserClientExtensionsPart
       content::SiteInstance* site_instance,
       const GURL& current_url,
       const GURL& new_url);
-  static bool AllowServiceWorker(const GURL& scope,
-                                 const GURL& first_party_url,
-                                 const GURL& script_url,
-                                 content::ResourceContext* context);
+  // TODO(crbug.com/824858): Remove the OnIO method.
+  static bool AllowServiceWorkerOnIO(const GURL& scope,
+                                     const GURL& first_party_url,
+                                     const GURL& script_url,
+                                     content::ResourceContext* context);
+  static bool AllowServiceWorkerOnUI(const GURL& scope,
+                                     const GURL& first_party_url,
+                                     const GURL& script_url,
+                                     content::BrowserContext* context);
   static void OverrideNavigationParams(
       content::SiteInstance* site_instance,
       ui::PageTransition* transition,