Clean up the unused multistate memory saver mode flag

Fixed: 339250758
Change-Id: I69fe34f903198305b3b4cfc28a894b075e28718f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5667188
Code-Coverage: findit-for-me@appspot.gserviceaccount.com <findit-for-me@appspot.gserviceaccount.com>
Reviewed-by: Joe Mason <joenotcharles@google.com>
Reviewed-by: Eshwar Stalin <estalin@chromium.org>
Commit-Queue: Alison Gale <agale@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1322208}
diff --git a/chrome/browser/performance_manager/user_tuning/user_performance_tuning_manager.cc b/chrome/browser/performance_manager/user_tuning/user_performance_tuning_manager.cc
index 3a708319..58aa494 100644
--- a/chrome/browser/performance_manager/user_tuning/user_performance_tuning_manager.cc
+++ b/chrome/browser/performance_manager/user_tuning/user_performance_tuning_manager.cc
@@ -221,13 +221,11 @@
 void UserPerformanceTuningManager::UpdateMemorySaverModeState() {
   MemorySaverModeState state =
       prefs::GetCurrentMemorySaverModeState(pref_change_registrar_.prefs());
-  if (!base::FeatureList::IsEnabled(features::kMemorySaverMultistateMode)) {
-    if (state != MemorySaverModeState::kDisabled) {
-      // The user has enabled memory saver mode, but without the multistate
-      // UI they didn't choose a policy. The feature controls which policy to
-      // use.
-      state = MemorySaverModeState::kEnabled;
-    }
+  if (state != MemorySaverModeState::kDisabled) {
+    // The user has enabled memory saver mode, but without the multistate
+    // UI they didn't choose a policy. The feature controls which policy to
+    // use.
+    state = MemorySaverModeState::kEnabled;
   }
   memory_saver_mode_delegate_->ToggleMemorySaverMode(state);
 }
diff --git a/chrome/browser/performance_manager/user_tuning/user_performance_tuning_manager_unittest.cc b/chrome/browser/performance_manager/user_tuning/user_performance_tuning_manager_unittest.cc
index a1b63df..bf53c8d 100644
--- a/chrome/browser/performance_manager/user_tuning/user_performance_tuning_manager_unittest.cc
+++ b/chrome/browser/performance_manager/user_tuning/user_performance_tuning_manager_unittest.cc
@@ -6,16 +6,13 @@
 
 #include <memory>
 #include <utility>
-#include <vector>
 
 #include "base/memory/raw_ptr.h"
 #include "base/run_loop.h"
-#include "base/test/scoped_feature_list.h"
 #include "base/test/task_environment.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "chrome/browser/performance_manager/test_support/fake_memory_saver_mode_delegate.h"
-#include "components/performance_manager/public/features.h"
 #include "components/performance_manager/public/user_tuning/prefs.h"
 #include "components/prefs/testing_pref_service.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ -70,17 +67,6 @@
     return UserPerformanceTuningManager::GetInstance();
   }
 
-  void InstallFeatures(bool is_multistate_enabled = false) {
-    std::vector<base::test::FeatureRef> enabled_features;
-    std::vector<base::test::FeatureRef> disabled_features;
-    if (is_multistate_enabled) {
-      enabled_features.push_back(features::kMemorySaverMultistateMode);
-    } else {
-      disabled_features.push_back(features::kMemorySaverMultistateMode);
-    }
-    feature_list_.InitWithFeatures(enabled_features, disabled_features);
-  }
-
   base::Value ValueForPrefState() const {
     return base::Value(static_cast<int>(GetParam().pref_state));
   }
@@ -94,8 +80,6 @@
       memory_saver_mode_delegate_;
 
   std::unique_ptr<UserPerformanceTuningManager> manager_;
-
-  base::test::ScopedFeatureList feature_list_;
 };
 
 class MockUserPerformanceTuningManagerObserver
@@ -118,7 +102,6 @@
         }));
 
 TEST_P(UserPerformanceTuningManagerTest, OnPrefChanged) {
-  InstallFeatures();
   RegisterDelegate();
   StartManager();
   local_state_.SetUserPref(prefs::kMemorySaverModeState, ValueForPrefState());
@@ -126,20 +109,7 @@
               Optional(GetParam().expected_state));
 }
 
-TEST_P(UserPerformanceTuningManagerTest, OnPrefChangedMultistate) {
-  InstallFeatures(/*is_multistate_enabled=*/true);
-  RegisterDelegate();
-  StartManager();
-
-  // When the MemorySaverMultistateMode feature is enabled, all states should
-  // be passed to ToggleMemorySaverMode() unchanged.
-  local_state_.SetUserPref(prefs::kMemorySaverModeState, ValueForPrefState());
-  EXPECT_THAT(memory_saver_mode_delegate_->GetLastState(),
-              Optional(GetParam().pref_state));
-}
-
-TEST_F(UserPerformanceTuningManagerTest, MemorySaverChangeObserver) {
-  InstallFeatures();
+TEST_P(UserPerformanceTuningManagerTest, MemorySaverChangeObserver) {
   RegisterDelegate();
 
   std::unique_ptr<UserPerformanceTuningManager::Observer> observer =
diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
index cc66556..6d91cfe 100644
--- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
+++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
@@ -861,10 +861,6 @@
           IDS_SETTINGS_PERFORMANCE_DISCARD_RING_TREATMENT_ENABLED_DESCRIPTION_WITH_LEARN_LINK,
           l10n_util::GetStringUTF16(IDS_SETTINGS_OPENS_IN_NEW_TAB)));
 
-  html_source->AddBoolean(
-      "memorySaverShowRecommendedBadge",
-      performance_manager::features::kMemorySaverShowRecommendedBadge.Get());
-
   html_source->AddString(
       "tabDiscardTimerFiveMinutes",
       ui::TimeFormat::Simple(ui::TimeFormat::FORMAT_DURATION,
diff --git a/components/performance_manager/features.cc b/components/performance_manager/features.cc
index b641cd2..ad28288 100644
--- a/components/performance_manager/features.cc
+++ b/components/performance_manager/features.cc
@@ -57,14 +57,6 @@
              base::FEATURE_DISABLED_BY_DEFAULT);
 #endif
 
-// The variable was renamed to "MemorySaver" but the experiment name remains as
-// "HighEfficiency" because it is already running (crbug.com/1493843).
-BASE_FEATURE(kMemorySaverMultistateMode,
-             "HighEfficiencyMultistateMode",
-             base::FEATURE_DISABLED_BY_DEFAULT);
-const base::FeatureParam<bool> kMemorySaverShowRecommendedBadge{
-    &kMemorySaverMultistateMode, "show_recommended_badge", false};
-
 BASE_FEATURE(kMemorySaverModeAggressiveness,
              "MemorySaverModeAggressiveness",
              base::FEATURE_DISABLED_BY_DEFAULT);
diff --git a/components/performance_manager/public/features.h b/components/performance_manager/public/features.h
index e03cca1..c337081a 100644
--- a/components/performance_manager/public/features.h
+++ b/components/performance_manager/public/features.h
@@ -61,14 +61,6 @@
 extern const base::FeatureParam<base::TimeDelta>
     kPerformanceControlsBatterySurveyLookback;
 
-// Round 2 Performance Controls features
-
-// This enables the UI for the multi-state version of memory saver mode.
-BASE_DECLARE_FEATURE(kMemorySaverMultistateMode);
-// When true, a recommended badge will be shown next to the heuristic memory
-// saver option.
-extern const base::FeatureParam<bool> kMemorySaverShowRecommendedBadge;
-
 // Round 2.5 Performance Controls features
 
 // This enables the UI for adjusting the aggresiveness of memory saver mode.