[TM] Remove proactive tab discarding.

We don't plan to ship this.

This also rename the proactive discarding and tab freeze experiment to
TabFreeze.

Bug: 844426
Change-Id: I8cffc01036a976b40da9458ef516f8ca68bcc26a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1994427
Commit-Queue: Sébastien Marchand <[email protected]>
Reviewed-by: François Doray <[email protected]>
Reviewed-by: Alexei Svitkine <[email protected]>
Reviewed-by: Will Harris <[email protected]>
Cr-Commit-Position: refs/heads/master@{#732409}
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index fb2eedd..63ef5975 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -1063,19 +1063,10 @@
 
 #if !defined(OS_ANDROID)
 const FeatureEntry::FeatureParam kTabFreeze_FreezeNoUnfreeze[] = {
-    {resource_coordinator::
-         kProactiveTabFreezeAndDiscard_ShouldProactivelyDiscardParam,
-     "false"},
-    {resource_coordinator::
-         kProactiveTabFreezeAndDiscard_ShouldPeriodicallyUnfreezeParam,
+    {resource_coordinator::kTabFreeze_ShouldPeriodicallyUnfreezeParam,
      "false"}};
 const FeatureEntry::FeatureParam kTabFreeze_FreezeWithUnfreeze[] = {
-    {resource_coordinator::
-         kProactiveTabFreezeAndDiscard_ShouldProactivelyDiscardParam,
-     "false"},
-    {resource_coordinator::
-         kProactiveTabFreezeAndDiscard_ShouldPeriodicallyUnfreezeParam,
-     "true"}};
+    {resource_coordinator::kTabFreeze_ShouldPeriodicallyUnfreezeParam, "true"}};
 const FeatureEntry::FeatureVariation kTabFreezeVariations[] = {
     {"Freeze - No Unfreeze", kTabFreeze_FreezeNoUnfreeze,
      base::size(kTabFreeze_FreezeNoUnfreeze), nullptr},
@@ -3622,9 +3613,9 @@
     {"proactive-tab-freeze", flag_descriptions::kTabFreezeName,
      flag_descriptions::kTabFreezeDescription, kOsDesktop,
      FEATURE_WITH_PARAMS_VALUE_TYPE(
-         features::kProactiveTabFreezeAndDiscard,
+         features::kTabFreeze,
          kTabFreezeVariations,
-         resource_coordinator::kProactiveTabFreezeAndDiscardFeatureName)},
+         resource_coordinator::kTabFreezeFeatureName)},
 #endif
 
 #if defined(OS_CHROMEOS)