[Extensions] Remove more channel-related Service Worker code.

This CL removes
ExtensionsClient::ExtensionAPIEnabledInExtensionServiceWorkers() and
its overloads.

Bug: 1165397
Change-Id: I8a5bd861c81ec57f1f3d1c9fe8780d904bb48332
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2623894Reviewed-by: Karan Bhatia <karandeepb@chromium.org>
Commit-Queue: David Bertoni <dbertoni@chromium.org>
Cr-Commit-Position: refs/heads/master@{#842684}

chrome/browser/extensions/api/declarative_net_request/declarative_net_request_apitest.cc

@@ -9,6 +9,7 @@
 #include "base/files/scoped_temp_dir.h"
 #include "base/macros.h"
 #include "base/threading/thread_restrictions.h"
+#include "components/version_info/version_info.h"
 #include "content/public/test/browser_test.h"
 #include "extensions/common/features/feature_channel.h"
 #include "net/dns/mock_host_resolver.h"

chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc

@@ -63,7 +63,6 @@
 #include "extensions/browser/view_type_utils.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension_urls.h"
-#include "extensions/common/extensions_client.h"
 #include "extensions/common/manifest_constants.h"
 #include "extensions/common/manifest_handlers/app_isolation_info.h"
 #include "extensions/common/manifest_handlers/background_info.h"
@@ -642,11 +641,8 @@ void ChromeContentBrowserClientExtensionsPart::RenderProcessWillLaunch(
   host->AddFilter(new ChromeExtensionMessageFilter(profile));
   host->AddFilter(new ExtensionMessageFilter(id, profile));
   host->AddFilter(new ExtensionsGuestViewMessageFilter(id, profile));
-  if (extensions::ExtensionsClient::Get()
-          ->ExtensionAPIEnabledInExtensionServiceWorkers()) {
-    host->AddFilter(new ExtensionServiceWorkerMessageFilter(
-        id, profile, host->GetStoragePartition()->GetServiceWorkerContext()));
-  }
+  host->AddFilter(new ExtensionServiceWorkerMessageFilter(
+      id, profile, host->GetStoragePartition()->GetServiceWorkerContext()));
 }
 
 void ChromeContentBrowserClientExtensionsPart::SiteInstanceGotProcess(

chrome/common/extensions/chrome_extensions_client.cc

@@ -19,7 +19,6 @@
 #include "chrome/common/url_constants.h"
 #include "chrome/common/webui_url_constants.h"
 #include "chrome/grit/chromium_strings.h"
-#include "components/version_info/version_info.h"
 #include "content/public/common/url_constants.h"
 #include "extensions/common/api/extension_action/action_info.h"
 #include "extensions/common/constants.h"
@@ -28,7 +27,6 @@
 #include "extensions/common/extension_api.h"
 #include "extensions/common/extension_icon_set.h"
 #include "extensions/common/extension_urls.h"
-#include "extensions/common/features/feature_channel.h"
 #include "extensions/common/manifest.h"
 #include "extensions/common/manifest_constants.h"
 #include "extensions/common/manifest_handlers/icons_handler.h"
@@ -218,12 +216,6 @@ std::set<base::FilePath> ChromeExtensionsClient::GetBrowserImagePaths(
   return image_paths;
 }
 
-bool ChromeExtensionsClient::ExtensionAPIEnabledInExtensionServiceWorkers()
-    const {
-  return GetCurrentChannel() <=
-         extension_misc::kMinChannelForServiceWorkerBasedExtension;
-}
-
 void ChromeExtensionsClient::AddOriginAccessPermissions(
     const Extension& extension,
     bool is_extension_active,

chrome/common/extensions/chrome_extensions_client.h

@@ -43,7 +43,6 @@ class ChromeExtensionsClient : public ExtensionsClient {
   bool IsBlacklistUpdateURL(const GURL& url) const override;
   std::set<base::FilePath> GetBrowserImagePaths(
       const Extension* extension) override;
-  bool ExtensionAPIEnabledInExtensionServiceWorkers() const override;
   void AddOriginAccessPermissions(
       const Extension& extension,
       bool is_extension_active,

chrome/renderer/extensions/chrome_extensions_renderer_client.cc

@@ -30,7 +30,6 @@
 #include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_set.h"
-#include "extensions/common/extensions_client.h"
 #include "extensions/common/manifest_handlers/background_info.h"
 #include "extensions/common/permissions/permissions_data.h"
 #include "extensions/common/switches.h"
@@ -118,10 +117,6 @@ bool ChromeExtensionsRendererClient::ExtensionAPIEnabledForServiceWorkerScript(
   if (!script_url.SchemeIs(extensions::kExtensionScheme))
     return false;
 
-  if (!extensions::ExtensionsClient::Get()
-           ->ExtensionAPIEnabledInExtensionServiceWorkers())
-    return false;
-
   const Extension* extension =
       extensions::RendererExtensionRegistry::Get()->GetExtensionOrAppByURL(
           script_url);

extensions/browser/extension_function_dispatcher.cc

@@ -42,7 +42,6 @@
 #include "extensions/common/extension_api.h"
 #include "extensions/common/extension_messages.h"
 #include "extensions/common/extension_set.h"
-#include "extensions/common/extensions_client.h"
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_message_macros.h"
 
@@ -131,9 +130,6 @@ class ExtensionFunctionDispatcher::WorkerResponseCallbackWrapper
         observer_(this),
         render_process_host_(render_process_host) {
     observer_.Add(render_process_host_);
-
-    DCHECK(ExtensionsClient::Get()
-               ->ExtensionAPIEnabledInExtensionServiceWorkers());
   }
 
   ~WorkerResponseCallbackWrapper() override = default;

extensions/common/constants.h

@@ -9,7 +9,6 @@
 #include "base/strings/string_piece_forward.h"
 #include "build/chromeos_buildflags.h"
 #include "components/services/app_service/public/mojom/types.mojom.h"
-#include "components/version_info/channel.h"
 #include "ui/base/layout.h"
 
 namespace extensions {
@@ -289,10 +288,6 @@ extern const int kContentVerificationDefaultBlockSize;
 // The minimum severity of a log or error in order to report it to the browser.
 extern const logging::LogSeverity kMinimumSeverityToReportError;
 
-// The minimum channel where Service Worker based extensions can run.
-constexpr version_info::Channel kMinChannelForServiceWorkerBasedExtension =
-    version_info::Channel::STABLE;
-
 // IDs for the Media Router Component Extension.
 extern const char kCastExtensionIdRelease[];
 extern const char kCastExtensionIdDev[];

extensions/common/extensions_client.cc

@@ -102,10 +102,6 @@ std::set<base::FilePath> ExtensionsClient::GetBrowserImagePaths(
   return paths;
 }
 
-bool ExtensionsClient::ExtensionAPIEnabledInExtensionServiceWorkers() const {
-  return false;
-}
-
 void ExtensionsClient::AddOriginAccessPermissions(
     const Extension& extension,
     bool is_extension_active,

extensions/common/extensions_client.h

@@ -134,13 +134,6 @@ class ExtensionsClient {
   virtual std::set<base::FilePath> GetBrowserImagePaths(
       const Extension* extension);
 
-  // Returns whether or not extension APIs are allowed in extension service
-  // workers.
-  // This is currently disallowed as the code to support this is work in
-  // progress.
-  // Can be overridden in tests.
-  virtual bool ExtensionAPIEnabledInExtensionServiceWorkers() const;
-
   // Adds client specific permitted origins to |origin_patterns| for
   // cross-origin communication for an extension context.
   virtual void AddOriginAccessPermissions(

extensions/renderer/native_extension_bindings_system.cc

@@ -569,10 +569,6 @@ void NativeExtensionBindingsSystem::UpdateBindingsForContext(
       is_webpage = true;
       break;
     case Feature::BLESSED_EXTENSION_CONTEXT:
-      if (context->IsForServiceWorker())
-        DCHECK(ExtensionsClient::Get()
-                   ->ExtensionAPIEnabledInExtensionServiceWorkers());
-      FALLTHROUGH;
     case Feature::LOCK_SCREEN_EXTENSION_CONTEXT:
     case Feature::UNBLESSED_EXTENSION_CONTEXT:
     case Feature::CONTENT_SCRIPT_CONTEXT: