[FedCM] Enable FedCM desktop settings by default

This CL changes how FedCM desktop settings are enabled. Previously,
FedCM desktop settings were enabled when both
(1) FedCM feature is enabled
AND
(2) 'DesktopSettings' field trial is enabled.

This CL changes the requirement to just (1).

BUG=1324742

Change-Id: I2c736dc82ece9fee6ef4683a8fc6161f140806d6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3641680
Reviewed-by: Yi Gu <yigu@chromium.org>
Commit-Queue: Peter Kotwicz <pkotwicz@chromium.org>
Reviewed-by: Demetrios Papadopoulos <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1002446}

chrome/browser/about_flags.cc

@@ -2459,19 +2459,11 @@ const FeatureEntry::FeatureParam kFedCmVariationAutoSignin[] = {
     {features::kFedCmAutoSigninFieldTrialParamName, "true"}};
 const FeatureEntry::FeatureParam kFedCmVariationIdpSignout[] = {
     {features::kFedCmIdpSignoutFieldTrialParamName, "true"}};
-#if !BUILDFLAG(IS_ANDROID)
-const FeatureEntry::FeatureParam kFedCmVariationDesktopSettings[] = {
-    {features::kFedCmDesktopSettingsFieldTrialParamName, "true"}};
-#endif  // BUILDFLAG(IS_ANDROID)
 const FeatureEntry::FeatureVariation kFedCmFeatureVariations[] = {
     {"- with FedCM auto sign-in", kFedCmVariationAutoSignin,
      std::size(kFedCmVariationAutoSignin), nullptr},
     {"- with FedCM IDP sign-out", kFedCmVariationIdpSignout,
      std::size(kFedCmVariationIdpSignout), nullptr},
-#if !BUILDFLAG(IS_ANDROID)
-    {"- with desktop settings", kFedCmVariationDesktopSettings,
-     std::size(kFedCmVariationDesktopSettings), nullptr}
-#endif  // BUILDFLAG(IS_ANDROID)
 };
 
 #if BUILDFLAG(IS_CHROMEOS_ASH)

chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc

@@ -2845,11 +2845,8 @@ void AddSiteSettingsStrings(content::WebUIDataSource* html_source,
       "enablePaymentHandlerContentSetting",
       base::FeatureList::IsEnabled(features::kServiceWorkerPaymentApps));
 
-  html_source->AddBoolean(
-      "enableFederatedIdentityApiContentSetting",
-      GetFieldTrialParamByFeatureAsBool(
-          features::kFedCm, features::kFedCmDesktopSettingsFieldTrialParamName,
-          false));
+  html_source->AddBoolean("enableFederatedIdentityApiContentSetting",
+                          base::FeatureList::IsEnabled(features::kFedCm));
 
   base::CommandLine& cmd = *base::CommandLine::ForCurrentProcess();
   html_source->AddBoolean(

chrome/browser/ui/webui/settings/site_settings_helper.cc

@@ -462,9 +462,7 @@ const std::vector<ContentSettingsType>& GetVisiblePermissionCategories() {
     if (base::FeatureList::IsEnabled(::features::kServiceWorkerPaymentApps))
       base_types->push_back(ContentSettingsType::PAYMENT_HANDLER);
 
-    if (GetFieldTrialParamByFeatureAsBool(
-            features::kFedCm,
-            features::kFedCmDesktopSettingsFieldTrialParamName, false)) {
+    if (base::FeatureList::IsEnabled(features::kFedCm)) {
       base_types->push_back(ContentSettingsType::FEDERATED_IDENTITY_API);
     }
 

chrome/common/chrome_features.cc

@@ -416,12 +416,6 @@ const base::Feature kExtensionWorkflowJustification{
 const base::Feature kExternalExtensionDefaultButtonControl{
     "ExternalExtensionDefaultButtonControl", base::FEATURE_DISABLED_BY_DEFAULT};
 
-#if !BUILDFLAG(IS_ANDROID)
-// Field trial boolean parameter which indicates whether FedCM desktop settings
-// are enabled.
-const char kFedCmDesktopSettingsFieldTrialParamName[] = "DesktopSettings";
-#endif  // !BUILDFLAG(IS_ANDROID)
-
 #if BUILDFLAG(ENABLE_PLUGINS)
 // Show Flash deprecation warning to users who have manually enabled Flash.
 // https://crbug.com/918428

chrome/common/chrome_features.h

@@ -293,11 +293,6 @@ extern const base::Feature kEnterpriseReportingInChromeOS;
 COMPONENT_EXPORT(CHROME_FEATURES)
 extern const base::Feature kExternalExtensionDefaultButtonControl;
 
-#if !BUILDFLAG(IS_ANDROID)
-COMPONENT_EXPORT(CHROME_FEATURES)
-extern const char kFedCmDesktopSettingsFieldTrialParamName[];
-#endif  // !BUILDFLAG(IS_ANDROID)
-
 #if BUILDFLAG(ENABLE_PLUGINS)
 COMPONENT_EXPORT(CHROME_FEATURES)
 extern const base::Feature kFlashDeprecationWarning;