Remove service worker concepts from apps/extensions manifest parsing.

extensions/common/manifest_handlers/background_info.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "extensions/common/manifest_handlers/background_info.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/lazy_instance.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
-#include "content/public/common/content_switches.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/error_utils.h"
 #include "extensions/common/file_util.h"
 #include "extensions/common/manifest_constants.h"
 #include "extensions/common/manifest_handlers/permissions_parser.h"
 #include "extensions/common/permissions/api_permission_set.h"
 #include "extensions/common/switches.h"
 #include "grit/extensions_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 
@@ skipping 39 matching lines @@
   return extension->GetResourceURL(kGeneratedBackgroundPageFilename);
 }
 
 // static
 const std::vector<std::string>& BackgroundInfo::GetBackgroundScripts(
     const Extension* extension) {
   return GetBackgroundInfo(extension).background_scripts_;
 }
 
 // static
-const std::string& BackgroundInfo::GetServiceWorkerScript(
-    const Extension* extension) {
-  return GetBackgroundInfo(extension).service_worker_script_;
-}
-
-// static
 bool BackgroundInfo::HasBackgroundPage(const Extension* extension) {
   return GetBackgroundInfo(extension).has_background_page();
 }
 
 // static
 bool BackgroundInfo::HasPersistentBackgroundPage(const Extension* extension)  {
   return GetBackgroundInfo(extension).has_persistent_background_page();
 }
 
 // static
 bool BackgroundInfo::HasLazyBackgroundPage(const Extension* extension) {
   return GetBackgroundInfo(extension).has_lazy_background_page();
 }
 
 // static
 bool BackgroundInfo::HasGeneratedBackgroundPage(const Extension* extension) {
   const BackgroundInfo& info = GetBackgroundInfo(extension);
   return !info.background_scripts_.empty();
 }
 
 // static
-bool BackgroundInfo::HasServiceWorker(const Extension* extension) {
-  return GetBackgroundInfo(extension).has_service_worker();
-}
-
-// static
 bool BackgroundInfo::AllowJSAccess(const Extension* extension) {
   return GetBackgroundInfo(extension).allow_js_access_;
 }
 
 bool BackgroundInfo::Parse(const Extension* extension, base::string16* error) {
   const std::string& bg_scripts_key = extension->is_platform_app() ?
       keys::kPlatformAppBackgroundScripts : keys::kBackgroundScripts;
-  const std::string& sw_scripts_key =
-      extension->is_platform_app()
-          ? keys::kPlatformAppServiceWorkerScript
-          : "";  // TODO(scheib): Support extensions crbug.com/346885
-  if (!LoadServiceWorkerScript(extension, sw_scripts_key, error) ||
-      !LoadBackgroundScripts(extension, bg_scripts_key, error) ||
+  if (!LoadBackgroundScripts(extension, bg_scripts_key, error) ||
       !LoadBackgroundPage(extension, error) ||
       !LoadBackgroundPersistent(extension, error) ||
       !LoadAllowJSAccess(extension, error)) {
     return false;
   }
 
   int background_solution_sum = (background_url_.is_valid() ? 1 : 0) +
-                                (!background_scripts_.empty() ? 1 : 0) +
-                                (has_service_worker() ? 1 : 0);
+                                (!background_scripts_.empty() ? 1 : 0);
   if (background_solution_sum > 1) {
     *error = ASCIIToUTF16(errors::kInvalidBackgroundCombination);
     return false;
   }
 
   return true;
 }
 
-bool BackgroundInfo::LoadServiceWorkerScript(const Extension* extension,
-                                             const std::string& key,
-                                             base::string16* error) {
-  const base::Value* service_worker_script_value = NULL;
-  if (!extension->manifest()->Get(key, &service_worker_script_value))
-    return true;
-
-  if (!CommandLine::ForCurrentProcess()->HasSwitch(
-          ::switches::kEnableExperimentalWebPlatformFeatures)) {
-    *error = ASCIIToUTF16(errors::kServiceWorkerRequiresFlag);
-    return false;
-  }
-
-  CHECK(service_worker_script_value);
-  if (!service_worker_script_value->GetAsString(&service_worker_script_)) {
-    *error = ASCIIToUTF16(errors::kInvalidServiceWorkerScript);
-    return false;
-  }
-  return true;
-}
-
 bool BackgroundInfo::LoadBackgroundScripts(const Extension* extension,
                                            const std::string& key,
                                            base::string16* error) {
   const base::Value* background_scripts_value = NULL;
   if (!extension->manifest()->Get(key, &background_scripts_value))
     return true;
 
   CHECK(background_scripts_value);
   if (background_scripts_value->GetType() != base::Value::TYPE_LIST) {
     *error = ASCIIToUTF16(errors::kInvalidBackgroundScripts);
@@ skipping 116 matching lines @@
 
 BackgroundManifestHandler::~BackgroundManifestHandler() {
 }
 
 bool BackgroundManifestHandler::Parse(Extension* extension,
                                       base::string16* error) {
   scoped_ptr<BackgroundInfo> info(new BackgroundInfo);
   if (!info->Parse(extension, error))
     return false;
 
-  // Platform apps must have background pages or service workers.
-  if (extension->is_platform_app() && !info->has_background_page() &&
-      !info->has_service_worker()) {
+  // Platform apps must have background pages.
+  if (extension->is_platform_app() && !info->has_background_page()) {
     *error = ASCIIToUTF16(errors::kBackgroundRequiredForPlatformApps);
     return false;
   }
   // Lazy background pages are incompatible with the webRequest API.
   if (info->has_lazy_background_page() &&
       PermissionsParser::HasAPIPermission(extension,
                                           APIPermission::kWebRequest)) {
     *error = ASCIIToUTF16(errors::kWebRequestConflictsWithLazyBackground);
     return false;
   }
@@ skipping 36 matching lines @@
     }
   }
   return true;
 }
 
 bool BackgroundManifestHandler::AlwaysParseForType(Manifest::Type type) const {
   return type == Manifest::TYPE_PLATFORM_APP;
 }
 
 const std::vector<std::string> BackgroundManifestHandler::Keys() const {
-  static const char* keys[] = {keys::kBackgroundAllowJsAccess,
-                               keys::kBackgroundPage,
-                               keys::kBackgroundPageLegacy,
-                               keys::kBackgroundPersistent,
-                               keys::kBackgroundScripts,
-                               keys::kPlatformAppBackgroundPage,
-                               keys::kPlatformAppBackgroundScripts,
-                               keys::kPlatformAppServiceWorkerScript};
+  static const char* keys[] = {
+      keys::kBackgroundAllowJsAccess,     keys::kBackgroundPage,
+      keys::kBackgroundPageLegacy,        keys::kBackgroundPersistent,
+      keys::kBackgroundScripts,           keys::kPlatformAppBackgroundPage,
+      keys::kPlatformAppBackgroundScripts};
   return std::vector<std::string>(keys, keys + arraysize(keys));
 }
 
 }  // namespace extensions