[bfcache] Pages using geolocation are not cached by default.

Geolocation support with BackForwardCache is now controlled by a chrome
flag variation, similar to what exists with ServiceWorker support.

Bug: 1015377
Change-Id: I4cc1fc5adef0a6bbb2281eb674276723eadf50b2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1864801Reviewed-by: Arthur Sonzogni <arthursonzogni@chromium.org>
Reviewed-by: Alexander Timin <altimin@chromium.org>
Commit-Queue: Arthur Hemery <ahemery@chromium.org>
Cr-Commit-Position: refs/heads/master@{#706998}

chrome/browser/about_flags.cc

@@ -1345,15 +1345,15 @@ const FeatureEntry::FeatureVariation kQuietNotificationPromptsVariations[] = {
 };
 #endif  // !OS_ANDROID
 
-// TODO(crbug.com/991082): Remove after proper service worker support for
-// back-forward cache is implemented.
-const FeatureEntry::FeatureParam kBackForwardCache_ServiceWorkerSupport[] = {
-    {"service_worker_supported", "true"},
+// TODO(crbug.com/991082,1015377): Remove after proper support for back-forward
+// cache is implemented.
+const FeatureEntry::FeatureParam kBackForwardCache_ExtendedSupport[] = {
+    {"experimental extended supported feature set", "true"},
 };
 
 const FeatureEntry::FeatureVariation kBackForwardCacheVariations[] = {
-    {" even for ServiceWorker-controlled pages",
-     kBackForwardCache_ServiceWorkerSupport, 1, nullptr},
+    {"experimental extended supported feature set",
+     kBackForwardCache_ExtendedSupport, 1, nullptr},
 };
 
 #if defined(OS_CHROMEOS)

content/browser/back_forward_cache_browsertest.cc

@@ -2176,7 +2176,7 @@ class BackForwardCacheBrowserTestWithServiceWorkerEnabled
 
  protected:
   base::FieldTrialParams GetFeatureParams() override {
-    return {{"service_worker_supported", "true"}};
+    return {{"experimental extended supported feature set", "true"}};
   }
 };
 
@@ -2279,6 +2279,10 @@ class GeolocationBackForwardCacheBrowserTest
  protected:
   GeolocationBackForwardCacheBrowserTest() : geo_override_(0.0, 0.0) {}
 
+  base::FieldTrialParams GetFeatureParams() override {
+    return {{"experimental extended supported feature set", "true"}};
+  }
+
   device::ScopedGeolocationOverrider geo_override_;
 };
 

content/browser/frame_host/back_forward_cache_impl.cc

@@ -75,10 +75,11 @@ void SetPageFrozenImpl(
   }
 }
 
-bool IsServiceWorkerSupported() {
-  static constexpr base::FeatureParam<bool> service_worker_supported(
-      &features::kBackForwardCache, "service_worker_supported", false);
-  return service_worker_supported.Get();
+bool IsExtendedSupportEnabled() {
+  static constexpr base::FeatureParam<bool> extended_support_enabled(
+      &features::kBackForwardCache,
+      "experimental extended supported feature set", false);
+  return extended_support_enabled.Get();
 }
 
 uint64_t GetDisallowedFeatures() {
@@ -114,10 +115,13 @@ uint64_t GetDisallowedFeatures() {
 
   uint64_t result = kAlwaysDisallowedFeatures;
 
-  if (!IsServiceWorkerSupported()) {
+  if (!IsExtendedSupportEnabled()) {
     result |=
         ToFeatureBit(WebSchedulerTrackedFeature::kServiceWorkerControlledPage);
+    result |= ToFeatureBit(
+        WebSchedulerTrackedFeature::kRequestedGeolocationPermission);
   }
+
   return result;
 }