Reland of [Extensions] Migrate ServiceWorker off behavior feature system (patchset #1 id:1 of https://codereview.chromium.org/1412683007/ )

Reason for revert:
Talked to Anthony offline and we agreed the error was probably not my CL.

Original issue's description:
> Revert of [Extensions] Migrate ServiceWorker off behavior feature system (patchset #1 id:1 of https://codereview.chromium.org/1417563005/ )
>
> Reason for revert:
> Reverting because this CL appears to be causing failures on this bot: https://build.chromium.org/p/chromium.win/builders/Win%20x64%20Builder%20%28dbg%29/builds/14499 .
>
> Original issue's description:
> > [Extensions] Migrate ServiceWorker off behavior feature system
> >
> > The FeatureSystem is failing to retrieve the behavior feature for service
> > workers, but the only reason this seems to be the case is because of
> > potential corruption in the JSON files (or the JSON parser otherwise choking).
> > For now, to reduce the crash rates, just migrate the service worker restriction
> > off the behavior feature system.
> >
> > BUG=461915
> >
> > Committed: https://crrev.com/2507a2fcd25244dadb7dfcc316426bee7b1df275
> > Cr-Commit-Position: refs/heads/master@{#356123}
>
> TBR=rockot@chromium.org,rdevlin.cronin@chromium.org
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=461915
>
> Committed: https://crrev.com/5708524cd0517ad825093d8cb4e9171ca99b3f42
> Cr-Commit-Position: refs/heads/master@{#356137}

TBR=rockot@chromium.org,anthonyvd@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=461915

Review URL: https://codereview.chromium.org/1406083004

Cr-Commit-Position: refs/heads/master@{#356152}

2 files changed, 0 insertions, 13 deletions

diff --git a/extensions/renderer/dispatcher.cc b/extensions/renderer/dispatcher.cc
index fa73ccc..7f3a28f 100644
--- a/extensions/renderer/dispatcher.cc
+++ b/extensions/renderer/dispatcher.cc
@@ -1069,7 +1069,6 @@ void Dispatcher::OnMessageInvoke(const std::string& extension_id,
 
 void Dispatcher::OnSetChannel(int channel) {
   delegate_->SetChannel(channel);
-  AddChannelSpecificFeatures();
 }
 
 void Dispatcher::OnSetScriptingWhitelist(
@@ -1600,13 +1599,4 @@ void Dispatcher::RequireGuestViewModules(ScriptContext* context) {
   }
 }
 
-void Dispatcher::AddChannelSpecificFeatures() {
-  // chrome-extension: resources should be allowed to register a Service Worker.
-  if (FeatureProvider::GetBehaviorFeature(BehaviorFeature::kServiceWorker)
-          ->IsAvailableToEnvironment()
-          .is_available())
-    WebSecurityPolicy::registerURLSchemeAsAllowingServiceWorkers(
-        WebString::fromUTF8(kExtensionScheme));
-}
-
 }  // namespace extensions
diff --git a/extensions/renderer/dispatcher.h b/extensions/renderer/dispatcher.h
index 09cb0d4..434dcde 100644
--- a/extensions/renderer/dispatcher.h
+++ b/extensions/renderer/dispatcher.h
@@ -246,9 +246,6 @@ class Dispatcher : public content::RenderProcessObserver,
   // |context|.
   void RequireGuestViewModules(ScriptContext* context);
 
-  // Adds features that are specific to the current channel.
-  void AddChannelSpecificFeatures();
-
   // The delegate for this dispatcher. Not owned, but must extend beyond the
   // Dispatcher's own lifetime.
   DispatcherDelegate* delegate_;