[bfcache] Remove ServiceWorker blocklisting

ServiceWorker has now been supported properly for bfcache, and no longer
needs to be blocklisted.
This CL removes the blocklisting and removes the test.

Bug: 1105351
Change-Id: I3dbcefa9400fc9d443e087ac2bd7854981924c94
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2296553
Commit-Queue: Yuzu Saijo <yuzus@chromium.org>
Reviewed-by: Hiroki Nakagawa <nhiroki@chromium.org>
Reviewed-by: Alexander Timin <altimin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#791729}

content/browser/back_forward_cache_browsertest.cc

@@ -3276,41 +3276,6 @@ std::unique_ptr<net::test_server::HttpResponse> RequestHandlerForUpdateWorker(
 
 }  // namespace
 
-IN_PROC_BROWSER_TEST_F(BackForwardCacheBrowserTest,
-                       DoesNotCachePagesWithServiceWorkers) {
-  ASSERT_TRUE(CreateHttpsServer()->Start());
-
-  // 1) Navigate to A.
-  EXPECT_TRUE(NavigateToURL(
-      shell(),
-      https_server()->GetURL("a.com", "/back_forward_cache/empty.html")));
-
-  // Register a service worker.
-  RegisterServiceWorker(current_frame_host());
-
-  RenderFrameHostImpl* rfh_a = current_frame_host();
-  RenderFrameDeletedObserver deleted(rfh_a);
-
-  // 2) Navigate away.
-  shell()->LoadURL(https_server()->GetURL("b.com", "/title1.html"));
-
-  // The page is controlled by a service worker, so it shouldn't have been
-  // cached.
-  deleted.WaitUntilDeleted();
-
-  ExpectOutcomeDidNotChange(FROM_HERE);
-
-  // 3) Go back to A.
-  web_contents()->GetController().GoBack();
-  EXPECT_TRUE(WaitForLoadStop(shell()->web_contents()));
-  ExpectNotRestored(
-      {BackForwardCacheMetrics::NotRestoredReason::kBlocklistedFeatures},
-      FROM_HERE);
-  ExpectBlocklistedFeature(blink::scheduler::WebSchedulerTrackedFeature::
-                               kServiceWorkerControlledPage,
-                           FROM_HERE);
-}
-
 class BackForwardCacheBrowserTestWithVibration
     : public BackForwardCacheBrowserTest,
       public device::mojom::VibrationManager {

content/browser/frame_host/back_forward_cache_impl.cc

@@ -72,14 +72,6 @@ const base::FeatureParam<ChildProcessImportance> kChildProcessImportanceParam{
     ChildProcessImportance::MODERATE, &child_process_importance_options};
 #endif
 
-bool IsServiceWorkerSupported() {
-  if (!DeviceHasEnoughMemoryForBackForwardCache())
-    return false;
-  static constexpr base::FeatureParam<bool> service_worker_supported(
-      &features::kBackForwardCache, "service_worker_supported", false);
-  return service_worker_supported.Get();
-}
-
 bool IsGeolocationSupported() {
   if (!DeviceHasEnoughMemoryForBackForwardCache())
     return false;
@@ -163,11 +155,6 @@ uint64_t GetDisallowedFeatures(RenderFrameHostImpl* rfh) {
 
   uint64_t result = kAlwaysDisallowedFeatures;
 
-  if (!IsServiceWorkerSupported()) {
-    result |=
-        FeatureToBit(WebSchedulerTrackedFeature::kServiceWorkerControlledPage);
-  }
-
   if (!IsGeolocationSupported()) {
     result |= FeatureToBit(
         WebSchedulerTrackedFeature::kRequestedGeolocationPermission);

third_party/blink/common/scheduler/web_scheduler_tracked_feature.cc

@@ -47,8 +47,6 @@ const char* FeatureToString(WebSchedulerTrackedFeature feature) {
       return "outstanding network request (XHR)";
     case WebSchedulerTrackedFeature::kOutstandingNetworkRequestOthers:
       return "outstanding network request (others)";
-    case WebSchedulerTrackedFeature::kServiceWorkerControlledPage:
-      return "ServiceWorker-controlled page";
     case WebSchedulerTrackedFeature::kOutstandingIndexedDBTransaction:
       return "outstanding IndexedDB transaction";
     case WebSchedulerTrackedFeature::kRequestedGeolocationPermission:

third_party/blink/public/common/scheduler/web_scheduler_tracked_feature.h

@@ -43,9 +43,8 @@ enum class WebSchedulerTrackedFeature {
   // specific context types down below.
   kOutstandingNetworkRequestOthers = 15,
 
-  // TODO(altimin): This doesn't include service worker-controlled origins.
-  // We need to track them too.
-  kServiceWorkerControlledPage = 16,
+  // kServiceWorkerControlledPage = 16. Removed after implementing ServiceWorker
+  // support.
 
   kOutstandingIndexedDBTransaction = 17,
 

third_party/blink/renderer/modules/service_worker/service_worker_container.cc

@@ -492,9 +492,6 @@ void ServiceWorkerContainer::SetController(
     MaybeRecordThirdPartyServiceWorkerUsage(GetExecutionContext());
     UseCounter::Count(GetExecutionContext(),
                       WebFeature::kServiceWorkerControlledPage);
-    GetExecutionContext()->GetScheduler()->RegisterStickyFeature(
-        SchedulingPolicy::Feature::kServiceWorkerControlledPage,
-        {SchedulingPolicy::RecordMetricsForBackForwardCache()});
   }
   if (should_notify_controller_change)
     DispatchEvent(*Event::Create(event_type_names::kControllerchange));

third_party/blink/renderer/platform/scheduler/common/scheduling_policy.cc

@@ -41,7 +41,6 @@ bool SchedulingPolicy::IsFeatureSticky(SchedulingPolicy::Feature feature) {
     case Feature::kResumeEventListener:
     case Feature::kContainsPlugins:
     case Feature::kDocumentLoaded:
-    case Feature::kServiceWorkerControlledPage:
     case Feature::kRequestedGeolocationPermission:
     case Feature::kRequestedNotificationsPermission:
     case Feature::kRequestedMIDIPermission:

tools/metrics/histograms/enums.xml

@@ -73312,7 +73312,7 @@ Called by update_scheduler_enums.py.-->
   <int value="49" label="PaymentManager"/>
   <int value="50" label="SpeechSynthesis"/>
   <int value="51" label="KeyboardLock"/>
-  <int value="52" label="SMSService"/>
+  <int value="52" label="SmsService"/>
 </enum>
 
 <enum name="WebShareMethod">