🧇 Clean up client side trial registration
The WaffleStudy client side field trials have not been used since
M122 or so.
Fixed: b/313067383
Change-Id: I08ee83317fe3b8ce268d5e487df11e59e0d05c7e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5518416
Commit-Queue: Nicolas Dossou-Gbété <[email protected]>
Reviewed-by: Jack Yammine <[email protected]>
Reviewed-by: Colin Blundell <[email protected]>
Auto-Submit: Nicolas Dossou-Gbété <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1297425}
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 392ffc2..2dacf8a 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -284,7 +284,6 @@
#include "chrome/browser/new_tab_page/promos/promo_service.h"
#include "chrome/browser/policy/developer_tools_policy_handler.h"
#include "chrome/browser/search/background/ntp_custom_background_service.h"
-#include "chrome/browser/search_engine_choice/search_engine_choice_client_side_trial.h"
#include "chrome/browser/search_engine_choice/search_engine_choice_dialog_service.h"
#include "chrome/browser/serial/serial_policy_allowed_ports.h"
#include "chrome/browser/signin/signin_promo.h"
@@ -1058,6 +1057,12 @@
constexpr char kGlanceablesEnabled[] = "ash.glanceables_enabled";
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
+#if !BUILDFLAG(IS_ANDROID)
+// Deprecated 05/2024
+inline constexpr char kSearchEnginesStudyGroup[] =
+ "search_engines.client_side_study_group";
+#endif
+
// Register local state used only for migration (clearing or moving to a new
// key).
void RegisterLocalStatePrefsForMigration(PrefRegistrySimple* registry) {
@@ -1182,6 +1187,11 @@
#if BUILDFLAG(IS_CHROMEOS_ASH)
registry->RegisterDictionaryPref(kLastUploadedEuiccStatusPrefLegacy);
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
+
+#if !BUILDFLAG(IS_ANDROID)
+ // Deprecated 05/2024.
+ registry->RegisterStringPref(kSearchEnginesStudyGroup, std::string());
+#endif
}
// Register prefs used only for migration (clearing or moving to a new key).
@@ -1642,7 +1652,6 @@
metrics::TabStatsTracker::RegisterPrefs(registry);
performance_manager::user_tuning::prefs::RegisterLocalStatePrefs(registry);
RegisterBrowserPrefs(registry);
- SearchEngineChoiceClientSideTrial::RegisterLocalStatePrefs(registry);
speech::SodaInstaller::RegisterLocalStatePrefs(registry);
StartupBrowserCreator::RegisterLocalStatePrefs(registry);
task_manager::TaskManagerInterface::RegisterPrefs(registry);
@@ -2428,6 +2437,11 @@
local_state->ClearPref(kLastUploadedEuiccStatusPrefLegacy);
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
+#if !BUILDFLAG(IS_ANDROID)
+ // Added 05/2024.
+ local_state->ClearPref(kSearchEnginesStudyGroup);
+#endif
+
// Please don't delete the following line. It is used by PRESUBMIT.py.
// END_MIGRATE_OBSOLETE_LOCAL_STATE_PREFS
