[Service Worker Registration] Registered extension scheme to allow service workers

extensions/renderer/dispatcher.cc

Index: extensions/renderer/dispatcher.cc
diff --git a/extensions/renderer/dispatcher.cc b/extensions/renderer/dispatcher.cc
index c22774aaed8605b259b6b123cc0ed8c666dc75ff..2667ebd0b7205e47231a4c3eb43ba502bf2b6baf 100644
--- a/extensions/renderer/dispatcher.cc
+++ b/extensions/renderer/dispatcher.cc
@@ -14,6 +14,7 @@
 #include "base/strings/string_piece.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
+#include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "content/grit/content_resources.h"
@@ -28,6 +29,7 @@
 #include "extensions/common/extension_messages.h"
 #include "extensions/common/extension_urls.h"
 #include "extensions/common/feature_switch.h"
+#include "extensions/common/features/behavior_feature.h"
 #include "extensions/common/features/feature.h"
 #include "extensions/common/features/feature_provider.h"
 #include "extensions/common/manifest.h"
@@ -98,6 +100,7 @@
 #include "ui/base/resource/resource_bundle.h"
 #include "v8/include/v8.h"
 
+using base::ASCIIToUTF16;

[Devlin, 2015/07/10 21:51:23]

avoid using "usings" when it's less than about 5 - 10 instances.  Even though
this file is pretty bad for it already. :)

 using base::UserMetricsAction;
 using blink::WebDataSource;
 using blink::WebDocument;
@@ -912,6 +915,7 @@ void Dispatcher::OnMessageInvoke(const std::string& extension_id,
 
 void Dispatcher::OnSetChannel(int channel) {
   delegate_->SetChannel(channel);
+  AddChannelSpecificFeatures();
 }
 
 void Dispatcher::OnSetFunctionNames(const std::vector<std::string>& names) {
@@ -1448,4 +1452,20 @@ void Dispatcher::RequireGuestViewModules(ScriptContext* context) {
   }
 }
 
+void Dispatcher::AddChannelSpecificFeatures() {
+  WebString extension_scheme(ASCIIToUTF16(extensions::kExtensionScheme));

[Devlin, 2015/07/10 21:51:23]

This would be simpler using WebString::fromUtf8(kExtensionScheme).  It's also
basic enough that you can inline it in the registerURLScheme...() call.

+
+  // chrome-extension: resources should be allowed to register a Service Worker.
+  if (IsExtensionAllowedToUseServiceWorker())
+    WebSecurityPolicy::registerURLSchemeAsAllowingServiceWorkers(
+        extension_scheme);
+}
+
+bool Dispatcher::IsExtensionAllowedToUseServiceWorker() {

[Devlin, 2015/07/10 21:51:23]

It's fine to inline this function in AddChannelSpecificFeatures().

+   return FeatureProvider::GetBehaviorFeature(
+             BehaviorFeature::kServiceWorker)
+      ->IsAvailableToEnvironment()
+      .is_available();
+}
+
 }  // namespace extensions