Quota: Clean up QuotaExpandPoolSize feature.

Bug: 1126640
Change-Id: Ibb6fd1bcea8aae9878051fa4b50bcbff87ba3ca7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2436549Reviewed-by: Steven Holte <holte@chromium.org>
Reviewed-by: Jarryd Goodman <jarrydg@chromium.org>
Commit-Queue: Caitlin Fischer <caitlinfischer@google.com>
Cr-Commit-Position: refs/heads/master@{#811639}

storage/browser/quota/quota_features.cc

@@ -8,15 +8,6 @@ namespace storage {
 
 namespace features {
 
-const base::Feature kQuotaExpandPoolSize{"QuotaExpandPoolSize",
-                                         base::FEATURE_ENABLED_BY_DEFAULT};
-
-constexpr base::FeatureParam<double> kExperimentalPoolSizeRatio{
-    &kQuotaExpandPoolSize, "PoolSizeRatio", 0.8};
-
-constexpr base::FeatureParam<double> kPerHostRatio{&kQuotaExpandPoolSize,
-                                                   "PerHostRatio", 0.75};
-
 // QuotaUnlimitedPoolSize removes limitations around disk space consumption with
 // respect to client-side storage web platform APIs. When enabled, quota will
 // set no limit on how much space a single origin can consume, as well as

storage/browser/quota/quota_features.h

@@ -13,11 +13,6 @@ namespace storage {
 
 namespace features {
 
-COMPONENT_EXPORT(STORAGE_BROWSER)
-extern const base::Feature kQuotaExpandPoolSize;
-extern const base::FeatureParam<double> kExperimentalPoolSizeRatio;
-extern const base::FeatureParam<double> kPerHostRatio;
-
 COMPONENT_EXPORT(STORAGE_BROWSER)
 extern const base::Feature kQuotaUnlimitedPoolSize;
 

storage/browser/quota/quota_settings.cc

@@ -26,6 +26,8 @@ namespace {
 
 const int64_t kMBytes = 1024 * 1024;
 const int kRandomizedPercentage = 10;
+const double kDefaultPerHostRatio = 0.75;
+const double kDefaultPoolSizeRatio = 0.8;
 
 // Skews |value| by +/- |percent|.
 int64_t RandomizeByPercent(int64_t value, int percent) {
@@ -77,7 +79,7 @@ base::Optional<QuotaSettings> CalculateNominalDynamicSettings(
   const double kTemporaryPoolSizeRatio =
       base::FeatureList::IsEnabled(features::kQuotaUnlimitedPoolSize)
           ? 1.0
-          : features::kExperimentalPoolSizeRatio.Get();
+          : kDefaultPoolSizeRatio;
 
   // The amount of the device's storage the browser attempts to
   // keep free. If there is less than this amount of storage free
@@ -114,7 +116,7 @@ base::Optional<QuotaSettings> CalculateNominalDynamicSettings(
   const double kPerHostTemporaryRatio =
       base::FeatureList::IsEnabled(features::kQuotaUnlimitedPoolSize)
           ? 1.0
-          : features::kPerHostRatio.Get();
+          : kDefaultPerHostRatio;
 
   // SessionOnly (or ephemeral) origins are allotted a fraction of what
   // normal origins are provided, and the amount is capped to a hard limit.

storage/browser/quota/quota_settings_unittest.cc

@@ -140,29 +140,6 @@ TEST_F(QuotaSettingsTest, Default) {
   EXPECT_TRUE(callback_executed);
 }
 
-TEST_F(QuotaSettingsTest, ExpandedTempPool) {
-  MockQuotaDeviceInfoHelper device_info_helper;
-  ON_CALL(device_info_helper, AmountOfTotalDiskSpace(_))
-      .WillByDefault(::testing::Return(2000));
-  scoped_feature_list_.InitAndEnableFeatureWithParameters(
-      features::kQuotaExpandPoolSize,
-      {{"PoolSizeRatio", "0.75"}, {"PerHostRatio", "0.5"}});
-
-  bool callback_executed = false;
-  GetNominalDynamicSettings(
-      profile_path(), false, &device_info_helper,
-      base::BindLambdaForTesting([&](base::Optional<QuotaSettings> settings) {
-        callback_executed = true;
-        ASSERT_NE(settings, base::nullopt);
-        // 1500 = 2000 * PoolSizeRatio
-        EXPECT_EQ(settings->pool_size, 1500);
-        // 750 = 1500 * PerHostRatio
-        EXPECT_EQ(settings->per_host_quota, 750);
-      }));
-  task_environment_.RunUntilIdle();
-  EXPECT_TRUE(callback_executed);
-}
-
 TEST_F(QuotaSettingsTest, UnlimitedTempPool) {
   MockQuotaDeviceInfoHelper device_info_helper;
   ON_CALL(device_info_helper, AmountOfTotalDiskSpace(_))

testing/variations/fieldtrial_testing_config.json

@@ -5778,30 +5778,6 @@
             ]
         }
     ],
-    "QuotaExpandPoolSize": [
-        {
-            "platforms": [
-                "android",
-                "android_weblayer",
-                "chromeos",
-                "linux",
-                "mac",
-                "windows"
-            ],
-            "experiments": [
-                {
-                    "name": "Enabled_Pool_Four_Fifths_Origin_ThreeQuarters_20190710",
-                    "params": {
-                        "PerHostRatio": "0.75",
-                        "PoolSizeRatio": "0.8"
-                    },
-                    "enable_features": [
-                        "QuotaExpandPoolSize"
-                    ]
-                }
-            ]
-        }
-    ],
     "ReleaseNotesNotification": [
         {
             "platforms": [