[UseClientConfigIPH] Cleanup for fixit

Bug: 40247004
Change-Id: I4639ac92058d7e7c3499f87e1d08f9536ef4b0ac
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5301598
Reviewed-by: Dana Fried <dfried@chromium.org>
Commit-Queue: Peilin Wang <peilinwang@google.com>
Cr-Commit-Position: refs/heads/main@{#1261800}

diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index fad443cc..6995dc6 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc

@@ -4648,10 +4648,6 @@
          feature_engagement::kIPHDemoMode,
          feature_engagement::kIPHDemoModeChoiceVariations,
          "IPH_DemoMode")},
-    {"in-product-help-use-client-config",
-     flag_descriptions::kInProductHelpUseClientConfigName,
-     flag_descriptions::kInProductHelpUseClientConfigDescription, kOsAll,
-     FEATURE_VALUE_TYPE(feature_engagement::kUseClientConfigIPH)},
 #if !BUILDFLAG(IS_ANDROID)
     {"user-education-experience-v2",
      flag_descriptions::kUserEducationExperienceVersion2Name,

diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
index 13cb1dc9..0f46cd5 100644
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc

@@ -2157,10 +2157,6 @@
 const char kInProductHelpSnoozeDescription[] =
     "Enables the snooze button on In-Product Help.";
 
-const char kInProductHelpUseClientConfigName[] = "IPH Use Client Config";
-const char kInProductHelpUseClientConfigDescription[] =
-    "Enable In-Product Help to use client side configuration.";
-
 #if !BUILDFLAG(IS_ANDROID)
 const char kUserEducationExperienceVersion2Name[] =
     "User Education Experience Version 2";

diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
index 31a82f6..404699a 100644
--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h

@@ -1203,9 +1203,6 @@
 extern const char kInProductHelpSnoozeName[];
 extern const char kInProductHelpSnoozeDescription[];
 
-extern const char kInProductHelpUseClientConfigName[];
-extern const char kInProductHelpUseClientConfigDescription[];
-
 #if !BUILDFLAG(IS_ANDROID)
 extern const char kUserEducationExperienceVersion2Name[];
 extern const char kUserEducationExperienceVersion2Description[];

diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
index 61f16e1..80a6e2079 100644
--- a/chrome/browser/flags/android/chrome_feature_list.cc
+++ b/chrome/browser/flags/android/chrome_feature_list.cc

@@ -126,7 +126,6 @@
     &features::kIncognitoDownloadsWarning,
     &features::kIncognitoNtpRevamp,
     &feature_engagement::kIPHTabSwitcherButtonFeature,
-    &feature_engagement::kUseClientConfigIPH,
     &feature_guide::features::kFeatureNotificationGuide,
     &feature_guide::features::kSkipCheckForLowEngagedUsers,
     &feed::kFeedDynamicColors,

diff --git a/components/feature_engagement/public/feature_constants.cc b/components/feature_engagement/public/feature_constants.cc
index 72de21e1..6b70faf 100644
--- a/components/feature_engagement/public/feature_constants.cc
+++ b/components/feature_engagement/public/feature_constants.cc

@@ -13,9 +13,6 @@
 
 // Features used by the In-Product Help system.
 BASE_FEATURE(kIPHDemoMode, "IPH_DemoMode", base::FEATURE_DISABLED_BY_DEFAULT);
-BASE_FEATURE(kUseClientConfigIPH,
-             "UseClientConfigIPH",
-             base::FEATURE_DISABLED_BY_DEFAULT);
 
 // Features used by various clients to show their In-Product Help messages.
 BASE_FEATURE(kIPHDummyFeature, "IPH_Dummy", base::FEATURE_DISABLED_BY_DEFAULT);

diff --git a/components/feature_engagement/public/feature_constants.h b/components/feature_engagement/public/feature_constants.h
index 42a7340..db5d614 100644
--- a/components/feature_engagement/public/feature_constants.h
+++ b/components/feature_engagement/public/feature_constants.h

@@ -16,11 +16,6 @@
 // A feature for enabling a demonstration mode for In-Product Help (IPH).
 BASE_DECLARE_FEATURE(kIPHDemoMode);
 
-// A feature for enabling In-Product Help (IPH) to use client side
-// configuration. When this flag is enabled, finch config will be ignored for
-// all IPHs.
-BASE_DECLARE_FEATURE(kUseClientConfigIPH);
-
 // A feature to ensure all arrays can contain at least one feature.
 BASE_DECLARE_FEATURE(kIPHDummyFeature);
 

diff --git a/components/feature_engagement/public/field_trial_configuration_provider.cc b/components/feature_engagement/public/field_trial_configuration_provider.cc
index e223058..4f7c2c6f 100644
--- a/components/feature_engagement/public/field_trial_configuration_provider.cc
+++ b/components/feature_engagement/public/field_trial_configuration_provider.cc

@@ -613,11 +613,6 @@
     FeatureConfig& config,
     const FeatureVector& known_features,
     const GroupVector& known_groups) const {
-  // If UseClientConfig is set, never parse field trial data.
-  if (base::FeatureList::IsEnabled(kUseClientConfigIPH)) {
-    return false;
-  }
-
   if (config.valid) {
     return false;
   }
@@ -667,11 +662,6 @@
 bool FieldTrialConfigurationProvider::MaybeProvideGroupConfiguration(
     const base::Feature& feature,
     GroupConfig& config) const {
-  // If UseClientConfig is set, never parse field trial data.
-  if (base::FeatureList::IsEnabled(kUseClientConfigIPH)) {
-    return false;
-  }
-
   if (config.valid) {
     return false;
   }

diff --git a/components/feature_engagement/public/field_trial_configuration_provider.h b/components/feature_engagement/public/field_trial_configuration_provider.h
index 9512032..c6fe0db 100644
--- a/components/feature_engagement/public/field_trial_configuration_provider.h
+++ b/components/feature_engagement/public/field_trial_configuration_provider.h

@@ -17,8 +17,7 @@
 // should only fill in configurations for which there are not active field
 // trials.
 //
-// This provider does not override valid configurations, and won't do anything
-// if the "UseClientConfigIPH" flag is set.
+// This provider does not override valid configurations.
 class FieldTrialConfigurationProvider : public ConfigurationProvider {
  public:
   FieldTrialConfigurationProvider();

diff --git a/components/feature_engagement/public/local_configuration_provider.h b/components/feature_engagement/public/local_configuration_provider.h
index 7577fcd..170cbc3 100644
--- a/components/feature_engagement/public/local_configuration_provider.h
+++ b/components/feature_engagement/public/local_configuration_provider.h

@@ -20,8 +20,7 @@
 // this one should go after the field trial provider, as its job is only to fill
 // in configuration for features where there is no explicit field trial.
 //
-// Does not override valid configurations; the field trial provider will defer
-// to this provider if "UseClientConfigIPH" is set.
+// Does not override valid configurations.
 class LocalConfigurationProvider : public ConfigurationProvider {
  public:
   explicit LocalConfigurationProvider();