Remove superfluous field_trial_params.h includes from various headers

Remove base/metrics/field_trial_params.h includes from headers that do
not reference BASE_DECLARE_FEATURE_PARAM, FieldTrialParam, or
FeatureParam. Then do IWYU to fix the build.

Bug: 40318405
Change-Id: I96c886cd63a7d87627a3f8d8a10a0a6091eedb9f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7184936
Commit-Queue: Daniel Cheng <dcheng@chromium.org>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Owners-Override: Daniel Cheng <dcheng@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1550194}
NOKEYCHECK=True
GitOrigin-RevId: f2e75a93dff5a7cbdb522764ff44b936eef9cd52
diff --git a/metrics_features.h b/metrics_features.h
index 1e2e103..41ffca3 100644
--- a/metrics_features.h
+++ b/metrics_features.h
@@ -6,7 +6,6 @@
 #define COMPONENTS_METRICS_METRICS_FEATURES_H_
 
 #include "base/feature_list.h"
-#include "base/metrics/field_trial_params.h"
 
 namespace metrics::features {
 
diff --git a/metrics_service_client.cc b/metrics_service_client.cc
index 4ec9068..668c755 100644
--- a/metrics_service_client.cc
+++ b/metrics_service_client.cc
@@ -10,13 +10,13 @@
 
 #include "base/command_line.h"
 #include "base/logging.h"
+#include "base/metrics/field_trial_params.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "build/build_config.h"
 #include "components/metrics/metrics_features.h"
 #include "components/metrics/metrics_switches.h"
 #include "components/metrics/server_urls.h"
-#include "metrics_service_client.h"
 
 namespace metrics {
 
diff --git a/metrics_service_client.h b/metrics_service_client.h
index 2b1d22c..ec9b7df 100644
--- a/metrics_service_client.h
+++ b/metrics_service_client.h
@@ -13,7 +13,6 @@
 
 #include "base/callback_list.h"
 #include "base/functional/callback.h"
-#include "base/metrics/field_trial_params.h"
 #include "base/time/time.h"
 #include "components/metrics/metrics_log_store.h"
 #include "components/metrics/metrics_log_uploader.h"
diff --git a/structured/structured_metrics_features.cc b/structured/structured_metrics_features.cc
index 83f9c2c..8f41758 100644
--- a/structured/structured_metrics_features.cc
+++ b/structured/structured_metrics_features.cc
@@ -5,6 +5,7 @@
 #include "components/metrics/structured/structured_metrics_features.h"
 
 #include "base/feature_list.h"
+#include "base/metrics/field_trial_params.h"
 
 namespace metrics::structured {
 
diff --git a/structured/structured_metrics_features.h b/structured/structured_metrics_features.h
index f1b2318..125e7a6 100644
--- a/structured/structured_metrics_features.h
+++ b/structured/structured_metrics_features.h
@@ -6,7 +6,6 @@
 #define COMPONENTS_METRICS_STRUCTURED_STRUCTURED_METRICS_FEATURES_H_
 
 #include "base/feature_list.h"
-#include "base/metrics/field_trial_params.h"
 #include "base/time/time.h"
 
 namespace metrics::features {