Move ServiceWorkerServicification to blink::features.

It's sometimes useful for Blink to define features instead of putting them in
//content. In this case, ServiceWorkerServicification.

Follow-up to r568796 <https://chromium-review.googlesource.com/1107435>.

Change-Id: Ia174481414f2ceeb2f463307436170628da84346
Reviewed-on: https://chromium-review.googlesource.com/1108237
Commit-Queue: Kinuko Yasuda <kinuko@chromium.org>
Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Cr-Commit-Position: refs/heads/master@{#569209}

chrome/browser/about_flags.cc

@@ -122,6 +122,7 @@
 #include "services/network/public/cpp/network_switches.h"
 #include "services/service_manager/sandbox/switches.h"
 #include "third_party/blink/public/common/experiments/memory_ablation_experiment.h"
+#include "third_party/blink/public/common/features.h"
 #include "third_party/libaom/av1_buildflags.h"
 #include "ui/base/ui_base_features.h"
 #include "ui/base/ui_base_switches.h"
@@ -1624,7 +1625,7 @@ const FeatureEntry kFeatureEntries[] = {
     {"enable-service-worker-servicification",
      flag_descriptions::kServiceWorkerServicificationName,
      flag_descriptions::kServiceWorkerServicificationDescription, kOsAll,
-     FEATURE_VALUE_TYPE(features::kServiceWorkerServicification)},
+     FEATURE_VALUE_TYPE(blink::features::kServiceWorkerServicification)},
     {"enable-pwa-full-code-cache",
      flag_descriptions::kEnablePWAFullCodeCacheName,
      flag_descriptions::kEnablePWAFullCodeCacheDescription, kOsAll,

content/browser/service_worker/OWNERS

@@ -5,6 +5,8 @@
 #   //content/browser/resources/service_worker/
 #   //content/common/service_worker/
 #   //content/renderer/service_worker/
+#   //third_party/blink/common/service_worker/
+#   //third_party/blink/public/common/service_worker/
 #   //third_party/blink/public/mojom/service_worker/
 #   //third_party/blink/public/web/modules/serviceworker/
 #   //third_party/blink/public/platform/modules/serviceworker/

content/child/blink_platform_impl.cc

@@ -681,10 +681,6 @@ bool BlinkPlatformImpl::AllowScriptExtensionForServiceWorker(
   return GetContentClient()->AllowScriptExtensionForServiceWorker(scriptUrl);
 }
 
-bool BlinkPlatformImpl::IsServiceWorkerNetServicificationEnabled() {
-  return ServiceWorkerUtils::IsServicificationEnabled();
-}
-
 blink::WebCrypto* BlinkPlatformImpl::Crypto() {
   return &web_crypto_;
 }

content/child/blink_platform_impl.h

@@ -97,7 +97,6 @@ class CONTENT_EXPORT BlinkPlatformImpl : public blink::Platform {
       const blink::WebSize& cumulative_scroll) override;
   bool AllowScriptExtensionForServiceWorker(
       const blink::WebURL& script_url) override;
-  bool IsServiceWorkerNetServicificationEnabled() override;
   blink::WebCrypto* Crypto() override;
   const char* GetBrowserServiceName() const override;
   blink::WebMediaCapabilitiesClient* MediaCapabilitiesClient() override;

content/common/service_worker/service_worker_utils.cc

@@ -16,6 +16,7 @@
 #include "net/http/http_byte_range.h"
 #include "net/http/http_util.h"
 #include "services/network/public/cpp/features.h"
+#include "third_party/blink/public/common/service_worker/service_worker_utils.h"
 
 namespace content {
 
@@ -140,8 +141,7 @@ bool ServiceWorkerUtils::AllOriginsMatchAndCanAccessServiceWorkers(
 
 // static
 bool ServiceWorkerUtils::IsServicificationEnabled() {
-  return base::FeatureList::IsEnabled(network::features::kNetworkService) ||
-         base::FeatureList::IsEnabled(features::kServiceWorkerServicification);
+  return blink::ServiceWorkerUtils::IsServicificationEnabled();
 }
 
 bool ServiceWorkerUtils::ExtractSinglePartHttpRange(

content/common/service_worker/service_worker_utils.h

@@ -51,6 +51,8 @@ class ServiceWorkerUtils {
       const std::vector<GURL>& urls);
 
   // Returns true if servicified service worker is enabled.
+  //
+  // TODO(falken): Remove this and have callsites use blink::ServiceWorkerUtils.
   CONTENT_EXPORT static bool IsServicificationEnabled();
 
   // Returns true if the |provider_id| was assigned by the browser process.

content/public/common/content_features.cc

@@ -362,10 +362,6 @@ const base::Feature kServiceWorkerPaymentApps{
 const base::Feature kServiceWorkerScriptFullCodeCache{
     "ServiceWorkerScriptFullCodeCache", base::FEATURE_ENABLED_BY_DEFAULT};
 
-// Establish direct connection from clients to the service worker.
-const base::Feature kServiceWorkerServicification{
-    "ServiceWorkerServicification", base::FEATURE_DISABLED_BY_DEFAULT};
-
 // http://tc39.github.io/ecmascript_sharedmem/shmem.html
 const base::Feature kSharedArrayBuffer{"SharedArrayBuffer",
                                        base::FEATURE_DISABLED_BY_DEFAULT};

content/public/common/content_features.h

@@ -89,7 +89,6 @@ CONTENT_EXPORT extern const base::Feature
 CONTENT_EXPORT extern const base::Feature kSecMetadata;
 CONTENT_EXPORT extern const base::Feature kServiceWorkerPaymentApps;
 CONTENT_EXPORT extern const base::Feature kServiceWorkerScriptFullCodeCache;
-CONTENT_EXPORT extern const base::Feature kServiceWorkerServicification;
 CONTENT_EXPORT extern const base::Feature kSharedArrayBuffer;
 CONTENT_EXPORT extern const base::Feature kSignedHTTPExchange;
 CONTENT_EXPORT extern const base::Feature kSignedHTTPExchangeOriginTrial;

third_party/blink/common/BUILD.gn

@@ -21,6 +21,7 @@ jumbo_source_set("common") {
     "device_memory/approximated_device_memory.cc",
     "experiments/memory_ablation_experiment.cc",
     "feature_policy/feature_policy.cc",
+    "features.cc",
     "frame/frame_policy.cc",
     "frame/user_activation_state.cc",
     "manifest/manifest.cc",
@@ -38,6 +39,7 @@ jumbo_source_set("common") {
     "origin_manifest/origin_manifest.cc",
     "origin_trials/trial_token.cc",
     "origin_trials/trial_token_validator.cc",
+    "service_worker/service_worker_utils.cc",
   ]
 
   public_deps = [
@@ -48,6 +50,7 @@ jumbo_source_set("common") {
     "//base",
     "//mojo/public/cpp/system",
     "//net",
+    "//services/network/public/cpp:cpp",
   ]
 
   # iOS doesn't use and must not depend on //media

third_party/blink/common/DEPS

@@ -10,6 +10,7 @@ include_rules = [
     "+build",
     "+net",
     "+mojo",
+    "+services/network/public/cpp",
     "+skia/public/interfaces/bitmap_skbitmap_struct_traits.h",
     "+testing/gmock/include/gmock",
     "+testing/gtest/include/gtest",

third_party/blink/common/features.cc

+// Copyright 2018 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 "third_party/blink/public/common/features.h"
+
+namespace blink {
+namespace features {
+
+// Enable new service worker glue for NetworkService. Can be
+// enabled independently of NetworkService.
+const base::Feature kServiceWorkerServicification{
+    "ServiceWorkerServicification", base::FEATURE_DISABLED_BY_DEFAULT};
+
+}  // namespace features
+}  // namespace blink

third_party/blink/common/service_worker/OWNERS

+file://content/browser/service_worker/OWNERS
+
+# TEAM: worker-dev@chromium.org
+# COMPONENT: Blink>ServiceWorker

third_party/blink/common/service_worker/service_worker_utils.cc

+// Copyright 2018 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 "third_party/blink/public/common/service_worker/service_worker_utils.h"
+
+#include "base/feature_list.h"
+#include "services/network/public/cpp/features.h"
+#include "third_party/blink/public/common/features.h"
+
+namespace blink {
+
+// static
+bool ServiceWorkerUtils::IsServicificationEnabled() {
+  return base::FeatureList::IsEnabled(network::features::kNetworkService) ||
+         base::FeatureList::IsEnabled(
+             blink::features::kServiceWorkerServicification);
+}
+
+}  // namespace blink

third_party/blink/public/common/BUILD.gn

@@ -38,6 +38,7 @@ source_set("headers") {
     "device_memory/approximated_device_memory.h",
     "experiments/memory_ablation_experiment.h",
     "feature_policy/feature_policy.h",
+    "features.h",
     "frame/frame_policy.h",
     "frame/sandbox_flags.h",
     "frame/user_activation_state.h",
@@ -59,6 +60,7 @@ source_set("headers") {
     "screen_orientation/web_screen_orientation_enum_traits.h",
     "screen_orientation/web_screen_orientation_lock_type.h",
     "screen_orientation/web_screen_orientation_type.h",
+    "service_worker/service_worker_utils.h",
   ]
 
   public_deps = [

third_party/blink/public/common/features.h

+// Copyright 2018 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.
+
+#ifndef THIRD_PARTY_BLINK_PUBLIC_COMMON_FEATURES_H_
+#define THIRD_PARTY_BLINK_PUBLIC_COMMON_FEATURES_H_
+
+#include "base/feature_list.h"
+#include "third_party/blink/common/common_export.h"
+
+namespace blink {
+namespace features {
+
+BLINK_COMMON_EXPORT extern const base::Feature kServiceWorkerServicification;
+
+}  // namespace features
+}  // namespace blink
+
+#endif  // THIRD_PARTY_BLINK_PUBLIC_COMMON_FEATURES_H_

third_party/blink/public/common/service_worker/OWNERS

+file://content/browser/service_worker/OWNERS
+
+# TEAM: worker-dev@chromium.org
+# COMPONENT: Blink>ServiceWorker

third_party/blink/public/common/service_worker/service_worker_utils.h

+// Copyright 2018 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.
+
+#ifndef THIRD_PARTY_BLINK_PUBLIC_COMMON_SERVICE_WORKER_SERVICE_WORKER_UTILS_H_
+#define THIRD_PARTY_BLINK_PUBLIC_COMMON_SERVICE_WORKER_SERVICE_WORKER_UTILS_H_
+
+#include "third_party/blink/common/common_export.h"
+
+namespace blink {
+
+class ServiceWorkerUtils {
+ public:
+  // Whether the new service worker glue for NetworkService is enabled (i.e.,
+  // the NetworkService or ServiceWorkerServicification feature is enabled).
+  // TODO(crbug.com/715640): Remove this after non-NetS13nSW is removed.
+  static bool BLINK_COMMON_EXPORT IsServicificationEnabled();
+};
+
+}  // namespace blink
+
+#endif  // THIRD_PARTY_BLINK_PUBLIC_COMMON_SERVICE_WORKER_SERVICE_WORKER_UTILS_H_

third_party/blink/public/platform/platform.h

@@ -626,12 +626,6 @@ class BLINK_PLATFORM_EXPORT Platform {
   virtual bool AllowScriptExtensionForServiceWorker(const WebURL& script_url) {
     return false;
   }
-  // Whether the new service worker glue for NetworkService is enabled (i.e.,
-  // the NetworkService or ServiceWorkerServicification feature is enabled).
-  // TODO(falken): Make ServiceWorkerServicification a base::Feature inside
-  // the blink namespace, then this function can move out of platform.h and be
-  // implemented directly in blink.
-  virtual bool IsServiceWorkerNetServicificationEnabled() { return false; }
 
   // WebCrypto ----------------------------------------------------------
 

third_party/blink/renderer/core/loader/document_threadable_loader.cc

@@ -36,6 +36,7 @@
 #include "base/single_thread_task_runner.h"
 #include "services/network/public/mojom/cors.mojom-blink.h"
 #include "services/network/public/mojom/fetch_api.mojom-blink.h"
+#include "third_party/blink/public/common/service_worker/service_worker_utils.h"
 #include "third_party/blink/public/platform/platform.h"
 #include "third_party/blink/public/platform/task_type.h"
 #include "third_party/blink/public/platform/web_cors.h"
@@ -354,7 +355,7 @@ void DocumentThreadableLoader::Start(const ResourceRequest& request) {
       is_controlled_by_service_worker = true;
       break;
     case blink::mojom::ControllerServiceWorkerMode::kNoFetchEventHandler:
-      if (Platform::Current()->IsServiceWorkerNetServicificationEnabled())
+      if (ServiceWorkerUtils::IsServicificationEnabled())
         is_controlled_by_service_worker = false;
       else
         is_controlled_by_service_worker = true;