Remove superfluous base/gtest_prod_util.h includes from headers
Remove unnecessary includes. Removal mostly automated with:
git ls-files | grep '\.h$' | xargs grep -l base/gtest_prod_util.h | \
xargs grep -L FRIEND_TEST | xargs grep -L FORWARD_DECLARE_TEST | \
xargs ./tools/add_header.py --remove --header '"base/gtest_prod_util.h"'
Bug: 40318405
Change-Id: Ie998958f1622dd7bc6a7bfafd7dd6f737abbc909
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7240634
Reviewed-by: Mark Mentovai <mark@chromium.org>
Owners-Override: Mark Mentovai <mark@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1558386}
diff --git a/ash/accelerators/accelerator_controller_impl.h b/ash/accelerators/accelerator_controller_impl.h
index ed7b198..e23b610 100644
--- a/ash/accelerators/accelerator_controller_impl.h
+++ b/ash/accelerators/accelerator_controller_impl.h
@@ -29,7 +29,6 @@
#include "ash/public/cpp/accelerators.h"
#include "ash/system/input_device_settings/input_device_settings_notification_controller.h"
#include "base/files/file_path.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/timer/timer.h"
#include "ui/base/accelerators/accelerator.h"
diff --git a/ash/system/network/cellular_setup_notifier.h b/ash/system/network/cellular_setup_notifier.h
index 060be95..a0b1ec8 100644
--- a/ash/system/network/cellular_setup_notifier.h
+++ b/ash/system/network/cellular_setup_notifier.h
@@ -7,7 +7,6 @@
#include "ash/ash_export.h"
#include "ash/public/cpp/session/session_observer.h"
-#include "base/gtest_prod_util.h"
#include "chromeos/services/network_config/public/cpp/cros_network_config_observer.h"
#include "components/prefs/pref_service.h"
#include "mojo/public/cpp/bindings/receiver.h"
diff --git a/ash/system/network/managed_sim_lock_notifier.h b/ash/system/network/managed_sim_lock_notifier.h
index d7c456fe..cee71ec 100644
--- a/ash/system/network/managed_sim_lock_notifier.h
+++ b/ash/system/network/managed_sim_lock_notifier.h
@@ -7,7 +7,6 @@
#include "ash/ash_export.h"
#include "ash/public/cpp/session/session_observer.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/weak_ptr.h"
#include "chromeos/services/network_config/public/cpp/cros_network_config_observer.h"
#include "mojo/public/cpp/bindings/receiver.h"
diff --git a/ash/system/notification_center/ash_message_center_lock_screen_controller.h b/ash/system/notification_center/ash_message_center_lock_screen_controller.h
index 9b9a1f38..c61b25a 100644
--- a/ash/system/notification_center/ash_message_center_lock_screen_controller.h
+++ b/ash/system/notification_center/ash_message_center_lock_screen_controller.h
@@ -9,7 +9,6 @@
#include "ash/ash_export.h"
#include "ash/public/cpp/session/session_observer.h"
-#include "base/gtest_prod_util.h"
#include "components/account_id/account_id.h"
#include "ui/message_center/lock_screen/lock_screen_controller.h"
diff --git a/ash/wm/desks/desk_mini_view.h b/ash/wm/desks/desk_mini_view.h
index 593d656..41158ae 100644
--- a/ash/wm/desks/desk_mini_view.h
+++ b/ash/wm/desks/desk_mini_view.h
@@ -10,7 +10,6 @@
#include "ash/ash_export.h"
#include "ash/wm/desks/desk.h"
#include "ash/wm/desks/desks_controller.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "ui/base/metadata/metadata_header_macros.h"
diff --git a/ash/wm/float/float_controller.h b/ash/wm/float/float_controller.h
index b02c4b3..328e9a6 100644
--- a/ash/wm/float/float_controller.h
+++ b/ash/wm/float/float_controller.h
@@ -11,7 +11,6 @@
#include "ash/rotator/screen_rotation_animator_observer.h"
#include "ash/shell_observer.h"
#include "ash/wm/desks/desks_controller.h"
-#include "base/gtest_prod_util.h"
#include "base/scoped_multi_source_observation.h"
#include "base/scoped_observation.h"
#include "chromeos/ui/base/window_state_type.h"
diff --git a/base/files/block_tests_writing_to_special_dirs.h b/base/files/block_tests_writing_to_special_dirs.h
index f1136b81..a76df78 100644
--- a/base/files/block_tests_writing_to_special_dirs.h
+++ b/base/files/block_tests_writing_to_special_dirs.h
@@ -10,7 +10,6 @@
#include <vector>
#include "base/base_export.h"
-#include "base/gtest_prod_util.h"
namespace base {
diff --git a/base/time/time.h b/base/time/time.h
index 82b2480..1ca0fe2 100644
--- a/base/time/time.h
+++ b/base/time/time.h
@@ -101,7 +101,6 @@
#if BUILDFLAG(IS_WIN)
#include <string>
-#include "base/gtest_prod_util.h"
#include "base/win/windows_types.h"
namespace ABI {
diff --git a/base/trace_event/trace_log.h b/base/trace_event/trace_log.h
index 575be0b8..bd16cf0 100644
--- a/base/trace_event/trace_log.h
+++ b/base/trace_event/trace_log.h
@@ -16,7 +16,6 @@
#include "base/base_export.h"
#include "base/functional/callback.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/scoped_refptr.h"
#include "base/no_destructor.h"
diff --git a/cc/animation/worklet_animation.h b/cc/animation/worklet_animation.h
index 63de896..e4323e7 100644
--- a/cc/animation/worklet_animation.h
+++ b/cc/animation/worklet_animation.h
@@ -9,7 +9,6 @@
#include <optional>
#include <string>
-#include "base/gtest_prod_util.h"
#include "base/time/time.h"
#include "cc/animation/animation.h"
#include "cc/animation/animation_export.h"
diff --git a/chrome/browser/android/favicon_helper.h b/chrome/browser/android/favicon_helper.h
index c2dd8a4..6ece08d 100644
--- a/chrome/browser/android/favicon_helper.h
+++ b/chrome/browser/android/favicon_helper.h
@@ -10,7 +10,6 @@
#include <memory>
#include "base/android/scoped_java_ref.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/weak_ptr.h"
#include "base/task/cancelable_task_tracker.h"
#include "components/favicon/core/favicon_service.h"
diff --git a/chrome/browser/apps/app_preload_service/app_preload_service.h b/chrome/browser/apps/app_preload_service/app_preload_service.h
index d9edfbde..1ce210f 100644
--- a/chrome/browser/apps/app_preload_service/app_preload_service.h
+++ b/chrome/browser/apps/app_preload_service/app_preload_service.h
@@ -11,7 +11,6 @@
#include "base/auto_reset.h"
#include "base/feature_list.h"
#include "base/functional/callback.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/values.h"
diff --git a/chrome/browser/ash/android_sms/connection_manager.h b/chrome/browser/ash/android_sms/connection_manager.h
index 9af7dc78c..94cf793 100644
--- a/chrome/browser/ash/android_sms/connection_manager.h
+++ b/chrome/browser/ash/android_sms/connection_manager.h
@@ -7,7 +7,6 @@
#include <memory>
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "chrome/browser/ash/android_sms/android_sms_app_manager.h"
#include "chromeos/ash/services/multidevice_setup/public/cpp/multidevice_setup_client.h"
diff --git a/chrome/browser/ash/apps/apk_web_app_service.h b/chrome/browser/ash/apps/apk_web_app_service.h
index 58cbf219..5dae744 100644
--- a/chrome/browser/ash/apps/apk_web_app_service.h
+++ b/chrome/browser/ash/apps/apk_web_app_service.h
@@ -9,7 +9,6 @@
#include <vector>
#include "base/functional/callback.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/scoped_observation.h"
diff --git a/chrome/browser/ash/device_name/device_name_store.h b/chrome/browser/ash/device_name/device_name_store.h
index 3ce1c16f..4d9aed5 100644
--- a/chrome/browser/ash/device_name/device_name_store.h
+++ b/chrome/browser/ash/device_name/device_name_store.h
@@ -7,7 +7,6 @@
#include <string>
-#include "base/gtest_prod_util.h"
#include "base/observer_list.h"
#include "base/observer_list_types.h"
diff --git a/chrome/browser/ash/extensions/file_manager/system_notification_manager.h b/chrome/browser/ash/extensions/file_manager/system_notification_manager.h
index 2c988d6..37f74ae 100644
--- a/chrome/browser/ash/extensions/file_manager/system_notification_manager.h
+++ b/chrome/browser/ash/extensions/file_manager/system_notification_manager.h
@@ -7,7 +7,6 @@
#include "ash/public/cpp/notification_utils.h"
#include "base/functional/callback_forward.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "chrome/browser/ash/file_manager/io_task.h"
diff --git a/chrome/browser/ash/login/error_screens_histogram_helper.h b/chrome/browser/ash/login/error_screens_histogram_helper.h
index aec7848..73cc4461 100644
--- a/chrome/browser/ash/login/error_screens_histogram_helper.h
+++ b/chrome/browser/ash/login/error_screens_histogram_helper.h
@@ -5,7 +5,6 @@
#ifndef CHROME_BROWSER_ASH_LOGIN_ERROR_SCREENS_HISTOGRAM_HELPER_H_
#define CHROME_BROWSER_ASH_LOGIN_ERROR_SCREENS_HISTOGRAM_HELPER_H_
-#include "base/gtest_prod_util.h"
#include "base/time/time.h"
#include "chrome/browser/ash/login/screens/network_error.h"
diff --git a/chrome/browser/ash/login/quick_unlock/pin_storage_prefs.h b/chrome/browser/ash/login/quick_unlock/pin_storage_prefs.h
index 2ca8486..cd57eccf 100644
--- a/chrome/browser/ash/login/quick_unlock/pin_storage_prefs.h
+++ b/chrome/browser/ash/login/quick_unlock/pin_storage_prefs.h
@@ -7,7 +7,6 @@
#include <string>
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "chromeos/ash/components/login/auth/public/key.h"
diff --git a/chrome/browser/ash/login/test/cryptohome_mixin.h b/chrome/browser/ash/login/test/cryptohome_mixin.h
index f453c7ae..19b4d549 100644
--- a/chrome/browser/ash/login/test/cryptohome_mixin.h
+++ b/chrome/browser/ash/login/test/cryptohome_mixin.h
@@ -8,7 +8,6 @@
#include <string>
#include <utility>
-#include "base/gtest_prod_util.h"
#include "chrome/test/base/mixin_based_in_process_browser_test.h"
#include "chromeos/ash/components/dbus/cryptohome/rpc.pb.h"
#include "chromeos/ash/components/dbus/userdataauth/fake_userdataauth_client.h"
diff --git a/chrome/browser/ash/net/secure_dns_manager.h b/chrome/browser/ash/net/secure_dns_manager.h
index 594e703..57fbf80 100644
--- a/chrome/browser/ash/net/secure_dns_manager.h
+++ b/chrome/browser/ash/net/secure_dns_manager.h
@@ -8,7 +8,6 @@
#include <string>
#include "base/containers/flat_map.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/observer_list.h"
#include "base/observer_list_types.h"
diff --git a/chrome/browser/ash/power/smart_charging/smart_charging_manager.h b/chrome/browser/ash/power/smart_charging/smart_charging_manager.h
index 9f62903..aa02d03 100644
--- a/chrome/browser/ash/power/smart_charging/smart_charging_manager.h
+++ b/chrome/browser/ash/power/smart_charging/smart_charging_manager.h
@@ -8,7 +8,6 @@
#include <optional>
#include "base/files/file_path.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/weak_ptr.h"
#include "base/scoped_observation.h"
#include "base/sequence_checker.h"
diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.h b/chrome/browser/bookmarks/android/bookmark_bridge.h
index 8402799b..92a5e8d7 100644
--- a/chrome/browser/bookmarks/android/bookmark_bridge.h
+++ b/chrome/browser/bookmarks/android/bookmark_bridge.h
@@ -12,7 +12,6 @@
#include "base/android/jni_android.h"
#include "base/android/jni_weak_ref.h"
#include "base/containers/flat_map.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/scoped_multi_source_observation.h"
diff --git a/chrome/browser/component_updater/file_type_policies_component_installer.h b/chrome/browser/component_updater/file_type_policies_component_installer.h
index 9ae0c7a3..04e3645 100644
--- a/chrome/browser/component_updater/file_type_policies_component_installer.h
+++ b/chrome/browser/component_updater/file_type_policies_component_installer.h
@@ -13,7 +13,6 @@
#include <vector>
#include "base/files/file_path.h"
-#include "base/gtest_prod_util.h"
#include "base/values.h"
#include "components/component_updater/component_installer.h"
diff --git a/chrome/browser/extensions/api/identity/identity_api.h b/chrome/browser/extensions/api/identity/identity_api.h
index c567f87b..bb2bc66 100644
--- a/chrome/browser/extensions/api/identity/identity_api.h
+++ b/chrome/browser/extensions/api/identity/identity_api.h
@@ -12,7 +12,6 @@
#include "base/callback_list.h"
#include "base/containers/flat_set.h"
#include "base/functional/callback_forward.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "build/build_config.h"
#include "build/buildflag.h"
diff --git a/chrome/browser/extensions/extension_safety_check_utils.h b/chrome/browser/extensions/extension_safety_check_utils.h
index f31509203..e6ef811e 100644
--- a/chrome/browser/extensions/extension_safety_check_utils.h
+++ b/chrome/browser/extensions/extension_safety_check_utils.h
@@ -5,7 +5,6 @@
#ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_SAFETY_CHECK_UTILS_H_
#define CHROME_BROWSER_EXTENSIONS_EXTENSION_SAFETY_CHECK_UTILS_H_
-#include "base/gtest_prod_util.h"
#include "chrome/common/extensions/api/developer_private.h"
#include "extensions/browser/blocklist_state.h"
#include "extensions/browser/extension_prefs.h"
diff --git a/chrome/browser/glic/host/glic_region_capture_controller.h b/chrome/browser/glic/host/glic_region_capture_controller.h
index 6a65e4f..8cd7371 100644
--- a/chrome/browser/glic/host/glic_region_capture_controller.h
+++ b/chrome/browser/glic/host/glic_region_capture_controller.h
@@ -9,7 +9,6 @@
#include "base/functional/callback_forward.h"
#include "base/functional/callback_helpers.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/weak_ptr.h"
#include "chrome/browser/glic/host/glic.mojom.h"
#include "mojo/public/cpp/bindings/remote.h"
diff --git a/chrome/browser/media/router/chrome_media_router_factory.h b/chrome/browser/media/router/chrome_media_router_factory.h
index eb90ae66..584ffdb1 100644
--- a/chrome/browser/media/router/chrome_media_router_factory.h
+++ b/chrome/browser/media/router/chrome_media_router_factory.h
@@ -5,7 +5,6 @@
#ifndef CHROME_BROWSER_MEDIA_ROUTER_CHROME_MEDIA_ROUTER_FACTORY_H_
#define CHROME_BROWSER_MEDIA_ROUTER_CHROME_MEDIA_ROUTER_FACTORY_H_
-#include "base/gtest_prod_util.h"
#include "base/lazy_instance.h"
#include "components/media_router/browser/media_router_factory.h"
diff --git a/chrome/browser/media/router/discovery/access_code/access_code_cast_discovery_interface.h b/chrome/browser/media/router/discovery/access_code/access_code_cast_discovery_interface.h
index 00e711f..3e47c126 100644
--- a/chrome/browser/media/router/discovery/access_code/access_code_cast_discovery_interface.h
+++ b/chrome/browser/media/router/discovery/access_code/access_code_cast_discovery_interface.h
@@ -9,7 +9,6 @@
#include "base/functional/bind.h"
#include "base/functional/callback.h"
#include "base/functional/callback_forward.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "chrome/browser/media/router/discovery/access_code/discovery_resources.pb.h"
diff --git a/chrome/browser/media/router/discovery/access_code/access_code_cast_sink_service.h b/chrome/browser/media/router/discovery/access_code/access_code_cast_sink_service.h
index 8466b94..a52a0fee 100644
--- a/chrome/browser/media/router/discovery/access_code/access_code_cast_sink_service.h
+++ b/chrome/browser/media/router/discovery/access_code/access_code_cast_sink_service.h
@@ -5,7 +5,6 @@
#ifndef CHROME_BROWSER_MEDIA_ROUTER_DISCOVERY_ACCESS_CODE_ACCESS_CODE_CAST_SINK_SERVICE_H_
#define CHROME_BROWSER_MEDIA_ROUTER_DISCOVERY_ACCESS_CODE_ACCESS_CODE_CAST_SINK_SERVICE_H_
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/media/router/discovery/access_code/access_code_cast_sink_service_factory.h b/chrome/browser/media/router/discovery/access_code/access_code_cast_sink_service_factory.h
index 18afceb..43eb146de 100644
--- a/chrome/browser/media/router/discovery/access_code/access_code_cast_sink_service_factory.h
+++ b/chrome/browser/media/router/discovery/access_code/access_code_cast_sink_service_factory.h
@@ -5,7 +5,6 @@
#ifndef CHROME_BROWSER_MEDIA_ROUTER_DISCOVERY_ACCESS_CODE_ACCESS_CODE_CAST_SINK_SERVICE_FACTORY_H_
#define CHROME_BROWSER_MEDIA_ROUTER_DISCOVERY_ACCESS_CODE_ACCESS_CODE_CAST_SINK_SERVICE_FACTORY_H_
-#include "base/gtest_prod_util.h"
#include "base/lazy_instance.h"
#include "chrome/browser/profiles/profile_keyed_service_factory.h"
diff --git a/chrome/browser/media/router/discovery/dial/dial_app_discovery_service.h b/chrome/browser/media/router/discovery/dial/dial_app_discovery_service.h
index 182a888..20d25b9 100644
--- a/chrome/browser/media/router/discovery/dial/dial_app_discovery_service.h
+++ b/chrome/browser/media/router/discovery/dial/dial_app_discovery_service.h
@@ -11,7 +11,6 @@
#include <string>
#include "base/functional/callback.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/sequence_checker.h"
diff --git a/chrome/browser/media/router/mojo/media_router_mojo_metrics.h b/chrome/browser/media/router/mojo/media_router_mojo_metrics.h
index d74b740..51275f9d 100644
--- a/chrome/browser/media/router/mojo/media_router_mojo_metrics.h
+++ b/chrome/browser/media/router/mojo/media_router_mojo_metrics.h
@@ -5,7 +5,6 @@
#ifndef CHROME_BROWSER_MEDIA_ROUTER_MOJO_MEDIA_ROUTER_MOJO_METRICS_H_
#define CHROME_BROWSER_MEDIA_ROUTER_MOJO_MEDIA_ROUTER_MOJO_METRICS_H_
-#include "base/gtest_prod_util.h"
#include "components/media_router/common/media_route_provider_helper.h"
#include "components/media_router/common/media_source.h"
#include "components/media_router/common/route_request_result.h"
diff --git a/chrome/browser/on_device_translation/translation_manager_impl.h b/chrome/browser/on_device_translation/translation_manager_impl.h
index 5ad5e127..20e88d2 100644
--- a/chrome/browser/on_device_translation/translation_manager_impl.h
+++ b/chrome/browser/on_device_translation/translation_manager_impl.h
@@ -10,7 +10,6 @@
#include <utility>
#include "base/auto_reset.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
#include "base/supports_user_data.h"
diff --git a/chrome/browser/profiles/gaia_info_update_service.h b/chrome/browser/profiles/gaia_info_update_service.h
index 8e66e38..4ed5b44 100644
--- a/chrome/browser/profiles/gaia_info_update_service.h
+++ b/chrome/browser/profiles/gaia_info_update_service.h
@@ -5,7 +5,6 @@
#ifndef CHROME_BROWSER_PROFILES_GAIA_INFO_UPDATE_SERVICE_H_
#define CHROME_BROWSER_PROFILES_GAIA_INFO_UPDATE_SERVICE_H_
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "chrome/browser/profiles/profile_attributes_storage.h"
#include "chrome/browser/profiles/profile_downloader.h"
diff --git a/chrome/browser/push_messaging/push_messaging_app_identifier.h b/chrome/browser/push_messaging/push_messaging_app_identifier.h
index 58e0620..0566c142 100644
--- a/chrome/browser/push_messaging/push_messaging_app_identifier.h
+++ b/chrome/browser/push_messaging/push_messaging_app_identifier.h
@@ -11,7 +11,6 @@
#include <string>
#include <vector>
-#include "base/gtest_prod_util.h"
#include "components/push_messaging/app_identifier.h"
#include "url/gurl.h"
diff --git a/chrome/browser/resource_coordinator/lifecycle_unit_base.h b/chrome/browser/resource_coordinator/lifecycle_unit_base.h
index 8ea858b..6ac00cc 100644
--- a/chrome/browser/resource_coordinator/lifecycle_unit_base.h
+++ b/chrome/browser/resource_coordinator/lifecycle_unit_base.h
@@ -5,7 +5,6 @@
#ifndef CHROME_BROWSER_RESOURCE_COORDINATOR_LIFECYCLE_UNIT_BASE_H_
#define CHROME_BROWSER_RESOURCE_COORDINATOR_LIFECYCLE_UNIT_BASE_H_
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/observer_list.h"
#include "base/time/time.h"
diff --git a/chrome/browser/resource_coordinator/session_restore_policy.h b/chrome/browser/resource_coordinator/session_restore_policy.h
index 1b47ec2..dcea16d 100644
--- a/chrome/browser/resource_coordinator/session_restore_policy.h
+++ b/chrome/browser/resource_coordinator/session_restore_policy.h
@@ -11,7 +11,6 @@
#include "base/cancelable_callback.h"
#include "base/containers/flat_map.h"
#include "base/functional/callback.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/time/time.h"
diff --git a/chrome/browser/resource_coordinator/tab_memory_metrics_reporter.h b/chrome/browser/resource_coordinator/tab_memory_metrics_reporter.h
index 125af6c..2f3107c 100644
--- a/chrome/browser/resource_coordinator/tab_memory_metrics_reporter.h
+++ b/chrome/browser/resource_coordinator/tab_memory_metrics_reporter.h
@@ -7,7 +7,6 @@
#include <set>
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/time/time.h"
#include "base/timer/timer.h"
diff --git a/chrome/browser/safe_browsing/cloud_content_scanning/multipart_uploader.h b/chrome/browser/safe_browsing/cloud_content_scanning/multipart_uploader.h
index 0d05bdf..eadc924 100644
--- a/chrome/browser/safe_browsing/cloud_content_scanning/multipart_uploader.h
+++ b/chrome/browser/safe_browsing/cloud_content_scanning/multipart_uploader.h
@@ -10,7 +10,6 @@
#include "base/files/file_path.h"
#include "base/functional/callback.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
#include "base/time/time.h"
diff --git a/chrome/browser/sessions/session_service_base.h b/chrome/browser/sessions/session_service_base.h
index da34e77..93ad556 100644
--- a/chrome/browser/sessions/session_service_base.h
+++ b/chrome/browser/sessions/session_service_base.h
@@ -11,7 +11,6 @@
#include <utility>
#include "base/functional/callback.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/scoped_observation.h"
diff --git a/chrome/browser/sessions/tab_loader.h b/chrome/browser/sessions/tab_loader.h
index 4e3c963e..16c15e1 100644
--- a/chrome/browser/sessions/tab_loader.h
+++ b/chrome/browser/sessions/tab_loader.h
@@ -10,7 +10,6 @@
#include "base/containers/flat_set.h"
#include "base/functional/callback.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/memory_pressure_listener.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/raw_ptr_exclusion.h"
diff --git a/chrome/browser/signin/bound_session_credentials/bound_session_cookie_observer.h b/chrome/browser/signin/bound_session_credentials/bound_session_cookie_observer.h
index 3d662746d..143a3e8 100644
--- a/chrome/browser/signin/bound_session_credentials/bound_session_cookie_observer.h
+++ b/chrome/browser/signin/bound_session_credentials/bound_session_cookie_observer.h
@@ -6,7 +6,6 @@
#define CHROME_BROWSER_SIGNIN_BOUND_SESSION_CREDENTIALS_BOUND_SESSION_COOKIE_OBSERVER_H_
#include "base/functional/callback_forward.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "chrome/browser/signin/bound_session_credentials/bound_session_cookie_controller_impl.h"
#include "mojo/public/cpp/bindings/receiver.h"
diff --git a/chrome/browser/signin/web_signin_interceptor.h b/chrome/browser/signin/web_signin_interceptor.h
index 43723bd..5ee4835 100644
--- a/chrome/browser/signin/web_signin_interceptor.h
+++ b/chrome/browser/signin/web_signin_interceptor.h
@@ -10,7 +10,6 @@
#include "base/cancelable_callback.h"
#include "base/functional/callback_forward.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/time/time.h"
#include "chrome/browser/ui/webui/signin/signin_utils.h"
diff --git a/chrome/browser/themes/theme_syncable_service.h b/chrome/browser/themes/theme_syncable_service.h
index c480f393..be93f36 100644
--- a/chrome/browser/themes/theme_syncable_service.h
+++ b/chrome/browser/themes/theme_syncable_service.h
@@ -7,7 +7,6 @@
#include <memory>
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/observer_list.h"
diff --git a/chrome/browser/tracing/chrome_tracing_delegate.h b/chrome/browser/tracing/chrome_tracing_delegate.h
index 3c4b000..8cf600d5 100644
--- a/chrome/browser/tracing/chrome_tracing_delegate.h
+++ b/chrome/browser/tracing/chrome_tracing_delegate.h
@@ -7,7 +7,6 @@
#include <optional>
-#include "base/gtest_prod_util.h"
#include "base/no_destructor.h"
#include "base/time/time.h"
#include "build/build_config.h"
diff --git a/chrome/browser/ui/browser_command_controller.h b/chrome/browser/ui/browser_command_controller.h
index 3b02c8f..f4f7d7c 100644
--- a/chrome/browser/ui/browser_command_controller.h
+++ b/chrome/browser/ui/browser_command_controller.h
@@ -5,7 +5,6 @@
#ifndef CHROME_BROWSER_UI_BROWSER_COMMAND_CONTROLLER_H_
#define CHROME_BROWSER_UI_BROWSER_COMMAND_CONTROLLER_H_
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "build/build_config.h"
#include "chrome/browser/command_updater.h"
diff --git a/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.h b/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.h
index a8f345447..9a553b5 100644
--- a/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.h
+++ b/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.h
@@ -8,7 +8,6 @@
#include <memory>
#include <string>
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/ref_counted.h"
#include "components/omnibox/browser/autocomplete_match.h"
diff --git a/chrome/browser/ui/performance_controls/performance_intervention_button_controller.h b/chrome/browser/ui/performance_controls/performance_intervention_button_controller.h
index 0eca16d..db34059 100644
--- a/chrome/browser/ui/performance_controls/performance_intervention_button_controller.h
+++ b/chrome/browser/ui/performance_controls/performance_intervention_button_controller.h
@@ -5,7 +5,6 @@
#ifndef CHROME_BROWSER_UI_PERFORMANCE_CONTROLS_PERFORMANCE_INTERVENTION_BUTTON_CONTROLLER_H_
#define CHROME_BROWSER_UI_PERFORMANCE_CONTROLS_PERFORMANCE_INTERVENTION_BUTTON_CONTROLLER_H_
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/timer/timer.h"
diff --git a/chrome/browser/ui/search/search_tab_helper.h b/chrome/browser/ui/search/search_tab_helper.h
index 8983555..d161467 100644
--- a/chrome/browser/ui/search/search_tab_helper.h
+++ b/chrome/browser/ui/search/search_tab_helper.h
@@ -9,7 +9,6 @@
#include <string>
#include <vector>
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/time/time.h"
diff --git a/chrome/browser/ui/tab_contents/core_tab_helper.h b/chrome/browser/ui/tab_contents/core_tab_helper.h
index f0039390..1a6253d 100644
--- a/chrome/browser/ui/tab_contents/core_tab_helper.h
+++ b/chrome/browser/ui/tab_contents/core_tab_helper.h
@@ -9,7 +9,6 @@
#include <vector>
#include "base/functional/callback.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/weak_ptr.h"
#include "base/time/time.h"
#include "chrome/common/chrome_render_frame.mojom.h"
diff --git a/chrome/browser/ui/toolbar/cast/cast_toolbar_button_controller.h b/chrome/browser/ui/toolbar/cast/cast_toolbar_button_controller.h
index 42bacef..df25269 100644
--- a/chrome/browser/ui/toolbar/cast/cast_toolbar_button_controller.h
+++ b/chrome/browser/ui/toolbar/cast/cast_toolbar_button_controller.h
@@ -7,7 +7,6 @@
#include <vector>
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ui/views/location_bar/zoom_bubble_view.h b/chrome/browser/ui/views/location_bar/zoom_bubble_view.h
index 440b916..8b7e5bb7 100644
--- a/chrome/browser/ui/views/location_bar/zoom_bubble_view.h
+++ b/chrome/browser/ui/views/location_bar/zoom_bubble_view.h
@@ -8,7 +8,6 @@
#include <memory>
#include <string>
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/scoped_observation.h"
#include "base/time/time.h"
diff --git a/chrome/browser/ui/views/sync/one_click_signin_dialog_view.h b/chrome/browser/ui/views/sync/one_click_signin_dialog_view.h
index cba9bb17..d8e045e 100644
--- a/chrome/browser/ui/views/sync/one_click_signin_dialog_view.h
+++ b/chrome/browser/ui/views/sync/one_click_signin_dialog_view.h
@@ -9,7 +9,6 @@
#include <string>
#include "base/functional/callback.h"
-#include "base/gtest_prod_util.h"
#include "chrome/browser/ui/browser_window.h"
#include "chrome/browser/ui/sync/one_click_signin_links_delegate.h"
#include "ui/base/metadata/metadata_header_macros.h"
diff --git a/chrome/browser/ui/views/tabs/tab_strip.h b/chrome/browser/ui/views/tabs/tab_strip.h
index d21ebd0..2d51fd1 100644
--- a/chrome/browser/ui/views/tabs/tab_strip.h
+++ b/chrome/browser/ui/views/tabs/tab_strip.h
@@ -11,7 +11,6 @@
#include <utility>
#include <vector>
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/raw_ref.h"
#include "base/time/time.h"
diff --git a/chrome/browser/ui/views/tabs/tab_strip_action_container.h b/chrome/browser/ui/views/tabs/tab_strip_action_container.h
index 0e4f6d1..bf1a8fd9 100644
--- a/chrome/browser/ui/views/tabs/tab_strip_action_container.h
+++ b/chrome/browser/ui/views/tabs/tab_strip_action_container.h
@@ -5,7 +5,6 @@
#ifndef CHROME_BROWSER_UI_VIEWS_TABS_TAB_STRIP_ACTION_CONTAINER_H_
#define CHROME_BROWSER_UI_VIEWS_TABS_TAB_STRIP_ACTION_CONTAINER_H_
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "chrome/browser/glic/browser_ui/glic_button_controller_delegate.h"
#include "chrome/browser/ui/tabs/glic_nudge_controller.h"
diff --git a/chrome/browser/ui/views/toolbar/toolbar_controller.h b/chrome/browser/ui/views/toolbar/toolbar_controller.h
index 3982ce2..0666df2 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_controller.h
+++ b/chrome/browser/ui/views/toolbar/toolbar_controller.h
@@ -9,7 +9,6 @@
#include <vector>
#include "base/callback_list.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "chrome/browser/ui/browser_element_identifiers.h"
#include "chrome/browser/ui/toolbar/pinned_toolbar/pinned_toolbar_actions_model.h"
diff --git a/chrome/browser/ui/views/user_education/impl/browser_feature_promo_controller_20.h b/chrome/browser/ui/views/user_education/impl/browser_feature_promo_controller_20.h
index 29cfdd0..f203e159 100644
--- a/chrome/browser/ui/views/user_education/impl/browser_feature_promo_controller_20.h
+++ b/chrome/browser/ui/views/user_education/impl/browser_feature_promo_controller_20.h
@@ -5,7 +5,6 @@
#ifndef CHROME_BROWSER_UI_VIEWS_USER_EDUCATION_IMPL_BROWSER_FEATURE_PROMO_CONTROLLER_20_H_
#define CHROME_BROWSER_UI_VIEWS_USER_EDUCATION_IMPL_BROWSER_FEATURE_PROMO_CONTROLLER_20_H_
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "chrome/browser/ui/views/user_education/impl/browser_feature_promo_controller.h"
#include "components/user_education/common/feature_promo/impl/feature_promo_controller_20.h"
diff --git a/chrome/browser/ui/webui/access_code_cast/access_code_cast_handler.h b/chrome/browser/ui/webui/access_code_cast/access_code_cast_handler.h
index 572d5a8..4a44239d 100644
--- a/chrome/browser/ui/webui/access_code_cast/access_code_cast_handler.h
+++ b/chrome/browser/ui/webui/access_code_cast/access_code_cast_handler.h
@@ -5,7 +5,6 @@
#ifndef CHROME_BROWSER_UI_WEBUI_ACCESS_CODE_CAST_ACCESS_CODE_CAST_HANDLER_H_
#define CHROME_BROWSER_UI_WEBUI_ACCESS_CODE_CAST_ACCESS_CODE_CAST_HANDLER_H_
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/scoped_observation.h"
#include "base/time/time.h"
diff --git a/chrome/browser/ui/webui/history/history_ui.h b/chrome/browser/ui/webui/history/history_ui.h
index b2b16861..9e6ffae 100644
--- a/chrome/browser/ui/webui/history/history_ui.h
+++ b/chrome/browser/ui/webui/history/history_ui.h
@@ -7,7 +7,6 @@
#include <memory>
-#include "base/gtest_prod_util.h"
#include "components/page_image_service/mojom/page_image_service.mojom.h"
#include "components/prefs/pref_change_registrar.h"
#include "components/user_education/webui/help_bubble_handler.h"
diff --git a/chrome/browser/ui/webui/management/management_ui_handler.h b/chrome/browser/ui/webui/management/management_ui_handler.h
index 5587986..56ebd12 100644
--- a/chrome/browser/ui/webui/management/management_ui_handler.h
+++ b/chrome/browser/ui/webui/management/management_ui_handler.h
@@ -9,7 +9,6 @@
#include <set>
#include <string>
-#include "base/gtest_prod_util.h"
#include "base/values.h"
#include "chrome/common/url_constants.h"
#include "components/enterprise/browser/promotion/promotion_eligibility_checker.h"
diff --git a/chrome/browser/ui/webui/print_preview/print_preview_handler_chromeos.h b/chrome/browser/ui/webui/print_preview/print_preview_handler_chromeos.h
index 8a9ec7e6..7479064 100644
--- a/chrome/browser/ui/webui/print_preview/print_preview_handler_chromeos.h
+++ b/chrome/browser/ui/webui/print_preview/print_preview_handler_chromeos.h
@@ -7,7 +7,6 @@
#include <string>
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/values.h"
diff --git a/chrome/browser/ui/webui/settings/site_settings_handler.h b/chrome/browser/ui/webui/settings/site_settings_handler.h
index 0e87a86..08348295 100644
--- a/chrome/browser/ui/webui/settings/site_settings_handler.h
+++ b/chrome/browser/ui/webui/settings/site_settings_handler.h
@@ -13,7 +13,6 @@
#include <variant>
#include <vector>
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/scoped_multi_source_observation.h"
diff --git a/chrome/browser/ui/webui/signin/dice_web_signin_intercept_handler.h b/chrome/browser/ui/webui/signin/dice_web_signin_intercept_handler.h
index d8efb96..7fe6ba0 100644
--- a/chrome/browser/ui/webui/signin/dice_web_signin_intercept_handler.h
+++ b/chrome/browser/ui/webui/signin/dice_web_signin_intercept_handler.h
@@ -8,7 +8,6 @@
#include <string>
#include "base/functional/callback.h"
-#include "base/gtest_prod_util.h"
#include "base/scoped_observation.h"
#include "base/values.h"
#include "chrome/browser/signin/dice_web_signin_interceptor.h"
diff --git a/chrome/browser/ui/webui/signin/inline_login_handler_impl.h b/chrome/browser/ui/webui/signin/inline_login_handler_impl.h
index b96d10b..39cf0cb 100644
--- a/chrome/browser/ui/webui/signin/inline_login_handler_impl.h
+++ b/chrome/browser/ui/webui/signin/inline_login_handler_impl.h
@@ -9,7 +9,6 @@
#include <string>
#include "base/files/file_path.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
diff --git a/chrome/updater/cleanup_task.h b/chrome/updater/cleanup_task.h
index 9c70eb9..a87b3c5 100644
--- a/chrome/updater/cleanup_task.h
+++ b/chrome/updater/cleanup_task.h
@@ -6,7 +6,6 @@
#define CHROME_UPDATER_CLEANUP_TASK_H_
#include "base/functional/callback_forward.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_refptr.h"
#include "base/sequence_checker.h"
diff --git a/chrome/updater/usage_stats_permissions.h b/chrome/updater/usage_stats_permissions.h
index 0a3cb1b..020db2d6 100644
--- a/chrome/updater/usage_stats_permissions.h
+++ b/chrome/updater/usage_stats_permissions.h
@@ -11,7 +11,6 @@
#include <vector>
#include "base/functional/callback_forward.h"
-#include "base/gtest_prod_util.h"
#include "base/sequence_checker.h"
#include "build/build_config.h"
#include "chrome/updater/updater_scope.h"
diff --git a/chromeos/ash/components/dbus/featured/featured_client.h b/chromeos/ash/components/dbus/featured/featured_client.h
index 033aa160..26cda92 100644
--- a/chromeos/ash/components/dbus/featured/featured_client.h
+++ b/chromeos/ash/components/dbus/featured/featured_client.h
@@ -8,7 +8,6 @@
#include "base/component_export.h"
#include "base/files/file_path.h"
#include "base/functional/callback.h"
-#include "base/gtest_prod_util.h"
#include "base/metrics/field_trial.h"
#include "chromeos/ash/components/dbus/featured/featured.pb.h"
diff --git a/chromeos/ash/components/geolocation/location_fetcher.h b/chromeos/ash/components/geolocation/location_fetcher.h
index 5d8125a..95e1b1f7 100644
--- a/chromeos/ash/components/geolocation/location_fetcher.h
+++ b/chromeos/ash/components/geolocation/location_fetcher.h
@@ -11,7 +11,6 @@
#include "ash/constants/geolocation_access_level.h"
#include "base/component_export.h"
#include "base/containers/flat_map.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_refptr.h"
diff --git a/chromeos/ash/components/local_search_service/inverted_index.h b/chromeos/ash/components/local_search_service/inverted_index.h
index a742ccb5..6b978116 100644
--- a/chromeos/ash/components/local_search_service/inverted_index.h
+++ b/chromeos/ash/components/local_search_service/inverted_index.h
@@ -12,7 +12,6 @@
#include <vector>
#include "base/functional/callback.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/weak_ptr.h"
#include "base/sequence_checker.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/chromeos/ash/components/network/cellular_connection_handler.h b/chromeos/ash/components/network/cellular_connection_handler.h
index 7705253d..6a828de7 100644
--- a/chromeos/ash/components/network/cellular_connection_handler.h
+++ b/chromeos/ash/components/network/cellular_connection_handler.h
@@ -9,7 +9,6 @@
#include <optional>
#include "base/containers/queue.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/scoped_observation.h"
diff --git a/chromeos/ash/components/network/cellular_esim_uninstall_handler.h b/chromeos/ash/components/network/cellular_esim_uninstall_handler.h
index 294af75..f0c8e45 100644
--- a/chromeos/ash/components/network/cellular_esim_uninstall_handler.h
+++ b/chromeos/ash/components/network/cellular_esim_uninstall_handler.h
@@ -11,7 +11,6 @@
#include "base/containers/circular_deque.h"
#include "base/containers/flat_set.h"
#include "base/containers/queue.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/scoped_observation.h"
#include "base/time/time.h"
diff --git a/chromeos/ash/components/network/cellular_policy_handler.h b/chromeos/ash/components/network/cellular_policy_handler.h
index 04b1038..060680d2 100644
--- a/chromeos/ash/components/network/cellular_policy_handler.h
+++ b/chromeos/ash/components/network/cellular_policy_handler.h
@@ -10,7 +10,6 @@
#include "base/component_export.h"
#include "base/containers/queue.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/scoped_observation.h"
diff --git a/chromeos/ash/components/network/network_state.h b/chromeos/ash/components/network/network_state.h
index c84f45a3..f984a5e1 100644
--- a/chromeos/ash/components/network/network_state.h
+++ b/chromeos/ash/components/network/network_state.h
@@ -13,7 +13,6 @@
#include <string>
#include <vector>
-#include "base/gtest_prod_util.h"
#include "base/values.h"
#include "chromeos/ash/components/network/managed_state.h"
#include "chromeos/ash/components/network/network_config.h"
diff --git a/chromeos/ash/components/phonehub/recent_apps_interaction_handler.h b/chromeos/ash/components/phonehub/recent_apps_interaction_handler.h
index abe03a6..6ba4fd8 100644
--- a/chromeos/ash/components/phonehub/recent_apps_interaction_handler.h
+++ b/chromeos/ash/components/phonehub/recent_apps_interaction_handler.h
@@ -8,7 +8,6 @@
#include <stdint.h>
#include "ash/webui/eche_app_ui/eche_connection_status_handler.h"
-#include "base/gtest_prod_util.h"
#include "base/observer_list.h"
#include "base/observer_list_types.h"
#include "chromeos/ash/components/phonehub/notification.h"
diff --git a/chromeos/ash/components/phonehub/recent_apps_interaction_handler_impl.h b/chromeos/ash/components/phonehub/recent_apps_interaction_handler_impl.h
index 3d3415dd..7c9e2d37 100644
--- a/chromeos/ash/components/phonehub/recent_apps_interaction_handler_impl.h
+++ b/chromeos/ash/components/phonehub/recent_apps_interaction_handler_impl.h
@@ -6,9 +6,9 @@
#define CHROMEOS_ASH_COMPONENTS_PHONEHUB_RECENT_APPS_INTERACTION_HANDLER_IMPL_H_
#include <stdint.h>
+
#include <memory>
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/observer_list.h"
#include "base/observer_list_types.h"
diff --git a/chromeos/ash/components/tether/top_level_host_scan_cache.h b/chromeos/ash/components/tether/top_level_host_scan_cache.h
index b8eac991..3bd2383 100644
--- a/chromeos/ash/components/tether/top_level_host_scan_cache.h
+++ b/chromeos/ash/components/tether/top_level_host_scan_cache.h
@@ -10,7 +10,6 @@
#include <unordered_map>
#include <unordered_set>
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/timer/timer.h"
diff --git a/chromeos/ash/services/cellular_setup/euicc.h b/chromeos/ash/services/cellular_setup/euicc.h
index 53919777..48dd9ed 100644
--- a/chromeos/ash/services/cellular_setup/euicc.h
+++ b/chromeos/ash/services/cellular_setup/euicc.h
@@ -5,7 +5,6 @@
#ifndef CHROMEOS_ASH_SERVICES_CELLULAR_SETUP_EUICC_H_
#define CHROMEOS_ASH_SERVICES_CELLULAR_SETUP_EUICC_H_
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "chromeos/ash/components/dbus/hermes/hermes_euicc_client.h"
#include "chromeos/ash/components/dbus/hermes/hermes_profile_client.h"
diff --git a/components/affiliations/core/browser/affiliation_backend.h b/components/affiliations/core/browser/affiliation_backend.h
index ecbdcd1b..18806a2 100644
--- a/components/affiliations/core/browser/affiliation_backend.h
+++ b/components/affiliations/core/browser/affiliation_backend.h
@@ -11,7 +11,6 @@
#include <unordered_map>
#include "base/feature_list.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
diff --git a/components/autofill/core/browser/form_import/form_data_importer.h b/components/autofill/core/browser/form_import/form_data_importer.h
index 00ecb08..ac8d5f4 100644
--- a/components/autofill/core/browser/form_import/form_data_importer.h
+++ b/components/autofill/core/browser/form_import/form_data_importer.h
@@ -12,7 +12,6 @@
#include "base/containers/flat_set.h"
#include "base/containers/span.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/scoped_observation.h"
#include "build/build_config.h"
diff --git a/components/autofill/core/browser/form_parsing/address_field_parser.h b/components/autofill/core/browser/form_parsing/address_field_parser.h
index 28f5c23d..f2b0523 100644
--- a/components/autofill/core/browser/form_parsing/address_field_parser.h
+++ b/components/autofill/core/browser/form_parsing/address_field_parser.h
@@ -10,7 +10,6 @@
#include <vector>
#include "base/compiler_specific.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "components/autofill/core/browser/autofill_type.h"
#include "components/autofill/core/browser/country_type.h"
diff --git a/components/autofill/core/browser/form_parsing/form_field_parser.h b/components/autofill/core/browser/form_parsing/form_field_parser.h
index 353b6c8..7200784a 100644
--- a/components/autofill/core/browser/form_parsing/form_field_parser.h
+++ b/components/autofill/core/browser/form_parsing/form_field_parser.h
@@ -17,7 +17,6 @@
#include "base/containers/span.h"
#include "base/feature_list.h"
#include "base/functional/function_ref.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/raw_ref.h"
#include "components/autofill/core/browser/country_type.h"
diff --git a/components/autofill/core/browser/form_parsing/name_field_parser.h b/components/autofill/core/browser/form_parsing/name_field_parser.h
index 7b1f93ba..f603eb2 100644
--- a/components/autofill/core/browser/form_parsing/name_field_parser.h
+++ b/components/autofill/core/browser/form_parsing/name_field_parser.h
@@ -8,7 +8,6 @@
#include <memory>
#include "base/compiler_specific.h"
-#include "base/gtest_prod_util.h"
#include "components/autofill/core/browser/country_type.h"
#include "components/autofill/core/browser/form_parsing/form_field_parser.h"
#include "components/autofill/core/common/language_code.h"
diff --git a/components/autofill/core/browser/form_parsing/phone_field_parser.h b/components/autofill/core/browser/form_parsing/phone_field_parser.h
index e04ca30..6dcc35d 100644
--- a/components/autofill/core/browser/form_parsing/phone_field_parser.h
+++ b/components/autofill/core/browser/form_parsing/phone_field_parser.h
@@ -11,7 +11,6 @@
#include <string_view>
#include "base/compiler_specific.h"
-#include "base/gtest_prod_util.h"
#include "components/autofill/core/browser/autofill_type.h"
#include "components/autofill/core/browser/country_type.h"
#include "components/autofill/core/browser/data_model/addresses/phone_number.h"
diff --git a/components/autofill/core/browser/form_structure.h b/components/autofill/core/browser/form_structure.h
index a71bccd..3243026 100644
--- a/components/autofill/core/browser/form_structure.h
+++ b/components/autofill/core/browser/form_structure.h
@@ -16,7 +16,6 @@
#include <vector>
#include "base/containers/flat_map.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/types/pass_key.h"
#include "components/autofill/core/browser/autofill_field.h"
diff --git a/components/autofill/core/browser/foundations/browser_autofill_manager.h b/components/autofill/core/browser/foundations/browser_autofill_manager.h
index f081ae4..b1ed63d 100644
--- a/components/autofill/core/browser/foundations/browser_autofill_manager.h
+++ b/components/autofill/core/browser/foundations/browser_autofill_manager.h
@@ -13,7 +13,6 @@
#include "base/containers/circular_deque.h"
#include "base/containers/flat_set.h"
#include "base/functional/callback.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
diff --git a/components/autofill/core/browser/payments/credit_card_access_manager.h b/components/autofill/core/browser/payments/credit_card_access_manager.h
index 8b6b2ef8..5fd7758e 100644
--- a/components/autofill/core/browser/payments/credit_card_access_manager.h
+++ b/components/autofill/core/browser/payments/credit_card_access_manager.h
@@ -14,7 +14,6 @@
#include <vector>
#include "base/functional/callback_forward.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/raw_ref.h"
#include "base/observer_list.h"
diff --git a/components/autofill/core/browser/payments/iban_manager.h b/components/autofill/core/browser/payments/iban_manager.h
index cda045f5..c801102 100644
--- a/components/autofill/core/browser/payments/iban_manager.h
+++ b/components/autofill/core/browser/payments/iban_manager.h
@@ -5,7 +5,6 @@
#ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_PAYMENTS_IBAN_MANAGER_H_
#define COMPONENTS_AUTOFILL_CORE_BROWSER_PAYMENTS_IBAN_MANAGER_H_
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "components/autofill/core/browser/data_model/payments/iban.h"
#include "components/autofill/core/browser/metrics/payments/iban_metrics.h"
diff --git a/components/autofill/core/browser/payments/legal_message_line.h b/components/autofill/core/browser/payments/legal_message_line.h
index 40d1d9b5..0eabb616 100644
--- a/components/autofill/core/browser/payments/legal_message_line.h
+++ b/components/autofill/core/browser/payments/legal_message_line.h
@@ -8,7 +8,6 @@
#include <string>
#include <vector>
-#include "base/gtest_prod_util.h"
#include "base/values.h"
#include "ui/gfx/range/range.h"
#include "url/gurl.h"
diff --git a/components/autofill/core/browser/single_field_fillers/autocomplete/autocomplete_history_manager.h b/components/autofill/core/browser/single_field_fillers/autocomplete/autocomplete_history_manager.h
index f93ba5b..4f6fa51 100644
--- a/components/autofill/core/browser/single_field_fillers/autocomplete/autocomplete_history_manager.h
+++ b/components/autofill/core/browser/single_field_fillers/autocomplete/autocomplete_history_manager.h
@@ -8,7 +8,6 @@
#include <vector>
#include "base/functional/callback.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "components/autofill/core/browser/single_field_fillers/single_field_fill_router.h"
diff --git a/components/autofill/core/browser/ui/autofill_external_delegate.h b/components/autofill/core/browser/ui/autofill_external_delegate.h
index 884b487..2c9c5a9 100644
--- a/components/autofill/core/browser/ui/autofill_external_delegate.h
+++ b/components/autofill/core/browser/ui/autofill_external_delegate.h
@@ -13,7 +13,6 @@
#include "base/containers/flat_map.h"
#include "base/containers/span.h"
#include "base/functional/callback.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ref.h"
#include "base/memory/weak_ptr.h"
#include "base/scoped_observation.h"
diff --git a/components/component_updater/installer_policies/first_party_sets_component_installer_policy.h b/components/component_updater/installer_policies/first_party_sets_component_installer_policy.h
index 8a35b68..e5e21aee 100644
--- a/components/component_updater/installer_policies/first_party_sets_component_installer_policy.h
+++ b/components/component_updater/installer_policies/first_party_sets_component_installer_policy.h
@@ -14,7 +14,6 @@
#include "base/files/file.h"
#include "base/functional/callback.h"
-#include "base/gtest_prod_util.h"
#include "base/values.h"
#include "base/version.h"
#include "components/component_updater/component_installer.h"
diff --git a/components/component_updater/installer_policies/optimization_hints_component_installer.h b/components/component_updater/installer_policies/optimization_hints_component_installer.h
index 600b8398..1607d23 100644
--- a/components/component_updater/installer_policies/optimization_hints_component_installer.h
+++ b/components/component_updater/installer_policies/optimization_hints_component_installer.h
@@ -9,7 +9,6 @@
#include <string>
#include <vector>
-#include "base/gtest_prod_util.h"
#include "base/values.h"
#include "components/component_updater/component_installer.h"
diff --git a/components/history/core/browser/history_database.h b/components/history/core/browser/history_database.h
index ce85441..baaa4889 100644
--- a/components/history/core/browser/history_database.h
+++ b/components/history/core/browser/history_database.h
@@ -8,7 +8,6 @@
#include <memory>
#include "base/compiler_specific.h"
-#include "base/gtest_prod_util.h"
#include "base/time/time.h"
#include "build/build_config.h"
#include "components/history/core/browser/download_database.h"
diff --git a/components/history_embeddings/history_embeddings_service.h b/components/history_embeddings/history_embeddings_service.h
index ff7cf90..be0d51b0 100644
--- a/components/history_embeddings/history_embeddings_service.h
+++ b/components/history_embeddings/history_embeddings_service.h
@@ -13,7 +13,6 @@
#include "base/files/file_path.h"
#include "base/functional/callback.h"
#include "base/functional/callback_helpers.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/weak_ptr.h"
#include "base/threading/sequence_bound.h"
#include "base/time/time.h"
diff --git a/components/input/input_router_impl.h b/components/input/input_router_impl.h
index 052f40a9..64d940a 100644
--- a/components/input/input_router_impl.h
+++ b/components/input/input_router_impl.h
@@ -11,7 +11,6 @@
#include "base/component_export.h"
#include "base/containers/flat_map.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/advanced_memory_safety_checks.h"
#include "base/memory/raw_ptr.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/components/legion/phosphor/token_fetcher_impl.h b/components/legion/phosphor/token_fetcher_impl.h
index 61ed20c..0af8b3d 100644
--- a/components/legion/phosphor/token_fetcher_impl.h
+++ b/components/legion/phosphor/token_fetcher_impl.h
@@ -12,7 +12,6 @@
#include <vector>
#include "base/functional/callback.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
diff --git a/components/media_router/browser/media_router_metrics.h b/components/media_router/browser/media_router_metrics.h
index 25b3207bd..83fcfc2 100644
--- a/components/media_router/browser/media_router_metrics.h
+++ b/components/media_router/browser/media_router_metrics.h
@@ -7,7 +7,6 @@
#include <optional>
-#include "base/gtest_prod_util.h"
#include "base/time/time.h"
#include "components/media_router/common/media_route_provider_helper.h"
#include "components/media_router/common/media_source.h"
diff --git a/components/metrics/drive_metrics_provider.h b/components/metrics/drive_metrics_provider.h
index 8e95a53..af507f8 100644
--- a/components/metrics/drive_metrics_provider.h
+++ b/components/metrics/drive_metrics_provider.h
@@ -6,7 +6,6 @@
#define COMPONENTS_METRICS_DRIVE_METRICS_PROVIDER_H_
#include "base/functional/callback_forward.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/weak_ptr.h"
#include "base/sequence_checker.h"
#include "components/metrics/metrics_provider.h"
diff --git a/components/metrics/file_metrics_provider.h b/components/metrics/file_metrics_provider.h
index 5d4e018..200b010 100644
--- a/components/metrics/file_metrics_provider.h
+++ b/components/metrics/file_metrics_provider.h
@@ -14,7 +14,6 @@
#include "base/files/file_path.h"
#include "base/functional/callback_forward.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
diff --git a/components/net_log/net_export_file_writer.h b/components/net_log/net_export_file_writer.h
index 70c3d66..939e2103 100644
--- a/components/net_log/net_export_file_writer.h
+++ b/components/net_log/net_export_file_writer.h
@@ -12,7 +12,6 @@
#include "base/files/file.h"
#include "base/files/file_path.h"
#include "base/functional/callback.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
#include "base/observer_list.h"
diff --git a/components/network_time/network_time_tracker.h b/components/network_time/network_time_tracker.h
index 33e741ab..afc87b7a 100644
--- a/components/network_time/network_time_tracker.h
+++ b/components/network_time/network_time_tracker.h
@@ -13,7 +13,6 @@
#include <vector>
#include "base/feature_list.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/scoped_refptr.h"
#include "base/observer_list.h"
diff --git a/components/omnibox/browser/document_provider.h b/components/omnibox/browser/document_provider.h
index 343e575..c822b96 100644
--- a/components/omnibox/browser/document_provider.h
+++ b/components/omnibox/browser/document_provider.h
@@ -15,7 +15,6 @@
#include "base/compiler_specific.h"
#include "base/containers/lru_cache.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/task/sequenced_task_runner.h"
#include "base/time/time.h"
diff --git a/components/omnibox/browser/history_quick_provider.h b/components/omnibox/browser/history_quick_provider.h
index 1733e9ff..f364179 100644
--- a/components/omnibox/browser/history_quick_provider.h
+++ b/components/omnibox/browser/history_quick_provider.h
@@ -8,7 +8,6 @@
#include <optional>
#include "base/compiler_specific.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "components/history/core/browser/history_types.h"
#include "components/omnibox/browser/autocomplete_input.h"
diff --git a/components/omnibox/browser/history_url_provider.h b/components/omnibox/browser/history_url_provider.h
index f9eece7..f52af4c6 100644
--- a/components/omnibox/browser/history_url_provider.h
+++ b/components/omnibox/browser/history_url_provider.h
@@ -12,7 +12,6 @@
#include <vector>
#include "base/compiler_specific.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/scoped_refptr.h"
#include "base/synchronization/atomic_flag.h"
diff --git a/components/omnibox/browser/scored_history_match.h b/components/omnibox/browser/scored_history_match.h
index ecee2c1e..88e2f21c 100644
--- a/components/omnibox/browser/scored_history_match.h
+++ b/components/omnibox/browser/scored_history_match.h
@@ -12,7 +12,6 @@
#include <utility>
#include <vector>
-#include "base/gtest_prod_util.h"
#include "base/strings/utf_offset_string_conversions.h"
#include "base/time/time.h"
#include "components/history/core/browser/history_types.h"
diff --git a/components/omnibox/browser/shortcuts_backend.h b/components/omnibox/browser/shortcuts_backend.h
index e7a0e723..06482fe1 100644
--- a/components/omnibox/browser/shortcuts_backend.h
+++ b/components/omnibox/browser/shortcuts_backend.h
@@ -12,7 +12,6 @@
#include "base/containers/span.h"
#include "base/files/file_path.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/ref_counted.h"
#include "base/memory/weak_ptr.h"
diff --git a/components/omnibox/browser/shortcuts_provider.h b/components/omnibox/browser/shortcuts_provider.h
index 8aed267..7e423ed0 100644
--- a/components/omnibox/browser/shortcuts_provider.h
+++ b/components/omnibox/browser/shortcuts_provider.h
@@ -7,7 +7,6 @@
#include <string>
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "components/omnibox/browser/autocomplete_provider.h"
#include "components/omnibox/browser/shortcuts_backend.h"
diff --git a/components/omnibox/browser/suggestion_answer.h b/components/omnibox/browser/suggestion_answer.h
index 5ce95c2d..f44f3388 100644
--- a/components/omnibox/browser/suggestion_answer.h
+++ b/components/omnibox/browser/suggestion_answer.h
@@ -10,7 +10,6 @@
#include <string>
#include <vector>
-#include "base/gtest_prod_util.h"
#include "base/memory/ptr_util.h"
#include "base/values.h"
#include "build/build_config.h"
diff --git a/components/page_image_annotation/content/renderer/content_page_annotator_driver.h b/components/page_image_annotation/content/renderer/content_page_annotator_driver.h
index 5576689c..bd5e368 100644
--- a/components/page_image_annotation/content/renderer/content_page_annotator_driver.h
+++ b/components/page_image_annotation/content/renderer/content_page_annotator_driver.h
@@ -8,7 +8,6 @@
#include <map>
#include <utility>
-#include "base/gtest_prod_util.h"
#include "components/page_image_annotation/core/page_annotator.h"
#include "content/public/renderer/render_frame_observer.h"
#include "content/public/renderer/render_frame_observer_tracker.h"
diff --git a/components/password_manager/core/browser/password_store/password_store.h b/components/password_manager/core/browser/password_store/password_store.h
index a234e9c..90f512ff 100644
--- a/components/password_manager/core/browser/password_store/password_store.h
+++ b/components/password_manager/core/browser/password_store/password_store.h
@@ -14,7 +14,6 @@
#include "base/cancelable_callback.h"
#include "base/functional/callback.h"
#include "base/functional/callback_helpers.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
#include "base/observer_list.h"
diff --git a/components/performance_manager/persistence/site_data/site_data_cache_impl.h b/components/performance_manager/persistence/site_data/site_data_cache_impl.h
index 17a0805..49e586a 100644
--- a/components/performance_manager/persistence/site_data/site_data_cache_impl.h
+++ b/components/performance_manager/persistence/site_data/site_data_cache_impl.h
@@ -13,7 +13,6 @@
#include "base/containers/flat_map.h"
#include "base/files/file_path.h"
#include "base/functional/callback_forward.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/scoped_observation.h"
diff --git a/components/permissions/permission_decision_auto_blocker.h b/components/permissions/permission_decision_auto_blocker.h
index 5d93c371..6de6fb0 100644
--- a/components/permissions/permission_decision_auto_blocker.h
+++ b/components/permissions/permission_decision_auto_blocker.h
@@ -9,7 +9,6 @@
#include <set>
#include "base/functional/callback.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/observer_list_types.h"
#include "base/time/default_clock.h"
diff --git a/components/prefs/json_pref_store.h b/components/prefs/json_pref_store.h
index 8ce33b7..84b6547 100644
--- a/components/prefs/json_pref_store.h
+++ b/components/prefs/json_pref_store.h
@@ -16,7 +16,6 @@
#include "base/files/file_path.h"
#include "base/files/important_file_writer.h"
#include "base/functional/callback_forward.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/weak_ptr.h"
#include "base/observer_list.h"
#include "base/sequence_checker.h"
diff --git a/components/privacy_sandbox/privacy_sandbox_settings_impl.h b/components/privacy_sandbox/privacy_sandbox_settings_impl.h
index 0aafd41f..155c624 100644
--- a/components/privacy_sandbox/privacy_sandbox_settings_impl.h
+++ b/components/privacy_sandbox/privacy_sandbox_settings_impl.h
@@ -7,7 +7,6 @@
#include <set>
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/observer_list.h"
#include "base/scoped_observation.h"
diff --git a/components/privacy_sandbox/tracking_protection_onboarding.h b/components/privacy_sandbox/tracking_protection_onboarding.h
index 55f6647..90d19be 100644
--- a/components/privacy_sandbox/tracking_protection_onboarding.h
+++ b/components/privacy_sandbox/tracking_protection_onboarding.h
@@ -5,7 +5,6 @@
#ifndef COMPONENTS_PRIVACY_SANDBOX_TRACKING_PROTECTION_ONBOARDING_H_
#define COMPONENTS_PRIVACY_SANDBOX_TRACKING_PROTECTION_ONBOARDING_H_
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "components/keyed_service/core/keyed_service.h"
diff --git a/components/push_messaging/app_identifier.h b/components/push_messaging/app_identifier.h
index 693020a..e9c43bfb 100644
--- a/components/push_messaging/app_identifier.h
+++ b/components/push_messaging/app_identifier.h
@@ -14,7 +14,6 @@
#include <vector>
#include "base/check.h"
-#include "base/gtest_prod_util.h"
#include "base/time/time.h"
#include "url/gurl.h"
diff --git a/components/regional_capabilities/regional_capabilities_service.h b/components/regional_capabilities/regional_capabilities_service.h
index c892f2f..26c67cc 100644
--- a/components/regional_capabilities/regional_capabilities_service.h
+++ b/components/regional_capabilities/regional_capabilities_service.h
@@ -9,7 +9,6 @@
#include <vector>
#include "base/functional/callback_forward.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ref.h"
#include "base/memory/weak_ptr.h"
#include "components/country_codes/country_codes.h"
diff --git a/components/safe_browsing/content/browser/triggers/ad_sampler_trigger.h b/components/safe_browsing/content/browser/triggers/ad_sampler_trigger.h
index 0896736..40d10f17 100644
--- a/components/safe_browsing/content/browser/triggers/ad_sampler_trigger.h
+++ b/components/safe_browsing/content/browser/triggers/ad_sampler_trigger.h
@@ -5,7 +5,6 @@
#ifndef COMPONENTS_SAFE_BROWSING_CONTENT_BROWSER_TRIGGERS_AD_SAMPLER_TRIGGER_H_
#define COMPONENTS_SAFE_BROWSING_CONTENT_BROWSER_TRIGGERS_AD_SAMPLER_TRIGGER_H_
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/components/safe_browsing/content/browser/triggers/trigger_throttler.h b/components/safe_browsing/content/browser/triggers/trigger_throttler.h
index a6a6bf1e..a893de91 100644
--- a/components/safe_browsing/content/browser/triggers/trigger_throttler.h
+++ b/components/safe_browsing/content/browser/triggers/trigger_throttler.h
@@ -9,7 +9,6 @@
#include <unordered_map>
#include <vector>
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/time/clock.h"
#include "base/time/time.h"
diff --git a/components/search_engines/keyword_table.h b/components/search_engines/keyword_table.h
index 5bc8b25e..29387d28 100644
--- a/components/search_engines/keyword_table.h
+++ b/components/search_engines/keyword_table.h
@@ -13,7 +13,6 @@
#include <vector>
#include "base/compiler_specific.h"
-#include "base/gtest_prod_util.h"
#include "components/country_codes/country_codes.h"
#include "components/search_engines/template_url_id.h"
#include "components/webdata/common/web_database_table.h"
diff --git a/components/services/storage/dom_storage/session_storage_impl.h b/components/services/storage/dom_storage/session_storage_impl.h
index 4831f18f..aad9fec 100644
--- a/components/services/storage/dom_storage/session_storage_impl.h
+++ b/components/services/storage/dom_storage/session_storage_impl.h
@@ -14,7 +14,6 @@
#include "base/files/file_path.h"
#include "base/functional/callback_forward.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
diff --git a/components/services/storage/indexed_db/transactional_leveldb/transactional_leveldb_transaction.h b/components/services/storage/indexed_db/transactional_leveldb/transactional_leveldb_transaction.h
index 67c80ad..fed778bb 100644
--- a/components/services/storage/indexed_db/transactional_leveldb/transactional_leveldb_transaction.h
+++ b/components/services/storage/indexed_db/transactional_leveldb/transactional_leveldb_transaction.h
@@ -12,7 +12,6 @@
#include "base/containers/flat_set.h"
#include "base/functional/callback.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/ref_counted.h"
#include "base/memory/weak_ptr.h"
diff --git a/components/sharing_message/sharing_device_registration.h b/components/sharing_message/sharing_device_registration.h
index d93f58a..b8eb7cb 100644
--- a/components/sharing_message/sharing_device_registration.h
+++ b/components/sharing_message/sharing_device_registration.h
@@ -9,7 +9,6 @@
#include <string>
#include "base/functional/callback.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "components/gcm_driver/instance_id/instance_id.h"
#include "components/sync/protocol/device_info_specifics.pb.h"
diff --git a/components/signin/internal/identity_manager/profile_oauth2_token_service_delegate_chromeos.h b/components/signin/internal/identity_manager/profile_oauth2_token_service_delegate_chromeos.h
index a9cedd62..7a3f17f 100644
--- a/components/signin/internal/identity_manager/profile_oauth2_token_service_delegate_chromeos.h
+++ b/components/signin/internal/identity_manager/profile_oauth2_token_service_delegate_chromeos.h
@@ -12,7 +12,6 @@
#include <vector>
#include "base/callback_list.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/scoped_observation.h"
diff --git a/components/supervised_user/core/browser/remote_web_approvals_manager.h b/components/supervised_user/core/browser/remote_web_approvals_manager.h
index e7c5a48..f087876d 100644
--- a/components/supervised_user/core/browser/remote_web_approvals_manager.h
+++ b/components/supervised_user/core/browser/remote_web_approvals_manager.h
@@ -6,12 +6,12 @@
#define COMPONENTS_SUPERVISED_USER_CORE_BROWSER_REMOTE_WEB_APPROVALS_MANAGER_H_
#include <stddef.h>
+
#include <memory>
#include <string>
#include <vector>
#include "base/functional/callback_forward.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/weak_ptr.h"
#include "base/time/time.h"
#include "build/build_config.h"
diff --git a/components/supervised_user/core/browser/supervised_user_service.h b/components/supervised_user/core/browser/supervised_user_service.h
index 3aca198..9c543b2b 100644
--- a/components/supervised_user/core/browser/supervised_user_service.h
+++ b/components/supervised_user/core/browser/supervised_user_service.h
@@ -12,7 +12,6 @@
#include <string>
#include <string_view>
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/raw_ref.h"
#include "base/observer_list.h"
diff --git a/components/sync/engine/net/sync_server_connection_manager.h b/components/sync/engine/net/sync_server_connection_manager.h
index 013a556..db7c1c9 100644
--- a/components/sync/engine/net/sync_server_connection_manager.h
+++ b/components/sync/engine/net/sync_server_connection_manager.h
@@ -9,7 +9,6 @@
#include <string>
#include "base/compiler_specific.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "components/sync/engine/net/server_connection_manager.h"
#include "url/gurl.h"
diff --git a/components/sync/engine/sync_manager_impl.h b/components/sync/engine/sync_manager_impl.h
index 5329779..e71fa7c 100644
--- a/components/sync/engine/sync_manager_impl.h
+++ b/components/sync/engine/sync_manager_impl.h
@@ -12,7 +12,6 @@
#include <vector>
#include "base/functional/callback_forward.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/observer_list.h"
#include "base/sequence_checker.h"
diff --git a/components/sync/engine/syncer.h b/components/sync/engine/syncer.h
index e16aceb..6d6f8141 100644
--- a/components/sync/engine/syncer.h
+++ b/components/sync/engine/syncer.h
@@ -7,7 +7,6 @@
#include <stdint.h>
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "components/sync/base/data_type.h"
#include "components/sync/engine/syncer_error.h"
diff --git a/components/tracing/common/background_tracing_state_manager.h b/components/tracing/common/background_tracing_state_manager.h
index f294b9e3..a6ac782 100644
--- a/components/tracing/common/background_tracing_state_manager.h
+++ b/components/tracing/common/background_tracing_state_manager.h
@@ -9,7 +9,6 @@
#include <vector>
#include "base/containers/flat_map.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/no_destructor.h"
#include "base/sequence_checker.h"
diff --git a/components/translate/core/browser/translate_manager.h b/components/translate/core/browser/translate_manager.h
index a9d4233..e80a6bdc 100644
--- a/components/translate/core/browser/translate_manager.h
+++ b/components/translate/core/browser/translate_manager.h
@@ -11,7 +11,6 @@
#include "base/callback_list.h"
#include "base/functional/callback.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "components/language_detection/core/constants.h"
diff --git a/components/url_pattern/simple_url_pattern_matcher.h b/components/url_pattern/simple_url_pattern_matcher.h
index 2c0e60a..96294d0b 100644
--- a/components/url_pattern/simple_url_pattern_matcher.h
+++ b/components/url_pattern/simple_url_pattern_matcher.h
@@ -10,7 +10,6 @@
#include <string_view>
#include "base/component_export.h"
-#include "base/gtest_prod_util.h"
#include "base/types/expected.h"
#include "base/types/pass_key.h"
#include "third_party/liburlpattern/parse.h"
diff --git a/components/user_education/common/tutorial/tutorial.h b/components/user_education/common/tutorial/tutorial.h
index 26bbe0d9..94501749 100644
--- a/components/user_education/common/tutorial/tutorial.h
+++ b/components/user_education/common/tutorial/tutorial.h
@@ -5,7 +5,6 @@
#ifndef COMPONENTS_USER_EDUCATION_COMMON_TUTORIAL_TUTORIAL_H_
#define COMPONENTS_USER_EDUCATION_COMMON_TUTORIAL_TUTORIAL_H_
-#include "base/gtest_prod_util.h"
#include "components/user_education/common/help_bubble/help_bubble_factory.h"
#include "components/user_education/common/help_bubble/help_bubble_params.h"
#include "components/user_education/common/tutorial/tutorial_description.h"
diff --git a/components/variations/variations_ids_provider.h b/components/variations/variations_ids_provider.h
index f496de12..94a8b4fc4 100644
--- a/components/variations/variations_ids_provider.h
+++ b/components/variations/variations_ids_provider.h
@@ -13,7 +13,6 @@
#include "base/component_export.h"
#include "base/functional/callback.h"
-#include "base/gtest_prod_util.h"
#include "base/metrics/field_trial.h"
#include "base/synchronization/lock.h"
#include "base/time/clock.h"
diff --git a/components/viz/service/transitions/surface_animation_manager.h b/components/viz/service/transitions/surface_animation_manager.h
index 9c9f33a2..e14f29c5 100644
--- a/components/viz/service/transitions/surface_animation_manager.h
+++ b/components/viz/service/transitions/surface_animation_manager.h
@@ -10,7 +10,6 @@
#include <vector>
#include "base/containers/flat_map.h"
-#include "base/gtest_prod_util.h"
#include "base/time/time.h"
#include "components/viz/common/quads/compositor_frame_transition_directive.h"
#include "components/viz/common/quads/compositor_render_pass.h"
diff --git a/components/webapps/browser/installable/installable_task_queue.h b/components/webapps/browser/installable/installable_task_queue.h
index 4a974ff..2b7dfc99c 100644
--- a/components/webapps/browser/installable/installable_task_queue.h
+++ b/components/webapps/browser/installable/installable_task_queue.h
@@ -7,7 +7,6 @@
#include <deque>
-#include "base/gtest_prod_util.h"
#include "components/webapps/browser/installable/installable_data.h"
#include "components/webapps/browser/installable/installable_params.h"
#include "components/webapps/browser/installable/installable_task.h"
diff --git a/components/webapps/services/web_app_origin_association/web_app_origin_association_fetcher.h b/components/webapps/services/web_app_origin_association/web_app_origin_association_fetcher.h
index 9a75107f..5292c905 100644
--- a/components/webapps/services/web_app_origin_association/web_app_origin_association_fetcher.h
+++ b/components/webapps/services/web_app_origin_association/web_app_origin_association_fetcher.h
@@ -10,7 +10,6 @@
#include <string>
#include "base/functional/callback.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
#include "services/network/public/cpp/simple_url_loader.h"
diff --git a/content/browser/cpu_performance/cpu_performance.h b/content/browser/cpu_performance/cpu_performance.h
index 04b69e2..bb359e14 100644
--- a/content/browser/cpu_performance/cpu_performance.h
+++ b/content/browser/cpu_performance/cpu_performance.h
@@ -7,7 +7,6 @@
#include <cstdint>
-#include "base/gtest_prod_util.h"
#include "content/common/content_export.h"
#include "third_party/blink/public/mojom/cpu_performance.mojom.h"
diff --git a/content/browser/devtools/shared_storage_worklet_devtools_manager.h b/content/browser/devtools/shared_storage_worklet_devtools_manager.h
index 90574c73..b8ffe8a 100644
--- a/content/browser/devtools/shared_storage_worklet_devtools_manager.h
+++ b/content/browser/devtools/shared_storage_worklet_devtools_manager.h
@@ -8,7 +8,6 @@
#include <map>
#include "base/containers/flat_set.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/singleton.h"
#include "base/observer_list.h"
#include "base/unguessable_token.h"
diff --git a/content/browser/devtools/shared_worker_devtools_manager.h b/content/browser/devtools/shared_worker_devtools_manager.h
index bb236496..f923b31c 100644
--- a/content/browser/devtools/shared_worker_devtools_manager.h
+++ b/content/browser/devtools/shared_worker_devtools_manager.h
@@ -8,7 +8,6 @@
#include <map>
#include "base/containers/flat_set.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/singleton.h"
#include "base/observer_list.h"
diff --git a/content/browser/digital_credentials/cross_device_transaction_impl.h b/content/browser/digital_credentials/cross_device_transaction_impl.h
index 82033473..bec7827 100644
--- a/content/browser/digital_credentials/cross_device_transaction_impl.h
+++ b/content/browser/digital_credentials/cross_device_transaction_impl.h
@@ -9,7 +9,6 @@
#include <cstdint>
#include "base/functional/callback_forward.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
#include "base/types/expected.h"
diff --git a/content/browser/media/midi_host.h b/content/browser/media/midi_host.h
index e4320f8..8bab767f 100644
--- a/content/browser/media/midi_host.h
+++ b/content/browser/media/midi_host.h
@@ -11,7 +11,6 @@
#include <memory>
#include <vector>
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/synchronization/lock.h"
#include "base/thread_annotations.h"
diff --git a/content/browser/renderer_host/direct_manipulation_helper_win.h b/content/browser/renderer_host/direct_manipulation_helper_win.h
index 5c16e73e..33639ff 100644
--- a/content/browser/renderer_host/direct_manipulation_helper_win.h
+++ b/content/browser/renderer_host/direct_manipulation_helper_win.h
@@ -6,14 +6,12 @@
#define CONTENT_BROWSER_RENDERER_HOST_DIRECT_MANIPULATION_HELPER_WIN_H_
#include <windows.h>
-
#include <directmanipulation.h>
#include <wrl.h>
#include <memory>
#include <string>
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "content/browser/renderer_host/direct_manipulation_event_handler_win.h"
diff --git a/content/browser/renderer_host/mixed_content_navigation_throttle.h b/content/browser/renderer_host/mixed_content_navigation_throttle.h
index 0e68345..41823f79 100644
--- a/content/browser/renderer_host/mixed_content_navigation_throttle.h
+++ b/content/browser/renderer_host/mixed_content_navigation_throttle.h
@@ -5,7 +5,6 @@
#ifndef CONTENT_BROWSER_RENDERER_HOST_MIXED_CONTENT_NAVIGATION_THROTTLE_H_
#define CONTENT_BROWSER_RENDERER_HOST_MIXED_CONTENT_NAVIGATION_THROTTLE_H_
-#include "base/gtest_prod_util.h"
#include "content/browser/renderer_host/mixed_content_checker.h"
#include "content/common/content_export.h"
#include "content/public/browser/navigation_handle.h"
diff --git a/content/browser/scheduler/responsiveness/metric_source.h b/content/browser/scheduler/responsiveness/metric_source.h
index 5272b632..d07bac83 100644
--- a/content/browser/scheduler/responsiveness/metric_source.h
+++ b/content/browser/scheduler/responsiveness/metric_source.h
@@ -9,7 +9,6 @@
#include "base/functional/callback.h"
#include "base/functional/callback_helpers.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "content/common/content_export.h"
diff --git a/content/browser/service_worker/service_worker_host.h b/content/browser/service_worker/service_worker_host.h
index 6b647132..b5f88c8a 100644
--- a/content/browser/service_worker/service_worker_host.h
+++ b/content/browser/service_worker/service_worker_host.h
@@ -8,7 +8,6 @@
#include <memory>
#include <string>
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/supports_user_data.h"
diff --git a/content/browser/service_worker/service_worker_main_resource_loader_interceptor.h b/content/browser/service_worker/service_worker_main_resource_loader_interceptor.h
index a8faeea..faa7d4a 100644
--- a/content/browser/service_worker/service_worker_main_resource_loader_interceptor.h
+++ b/content/browser/service_worker/service_worker_main_resource_loader_interceptor.h
@@ -7,7 +7,6 @@
#include <memory>
-#include "base/gtest_prod_util.h"
#include "base/memory/weak_ptr.h"
#include "content/browser/loader/navigation_loader_interceptor.h"
#include "content/browser/navigation_subresource_loader_params.h"
diff --git a/content/browser/service_worker/service_worker_process_manager.h b/content/browser/service_worker/service_worker_process_manager.h
index d2fbaf8..0cd0f92 100644
--- a/content/browser/service_worker/service_worker_process_manager.h
+++ b/content/browser/service_worker/service_worker_process_manager.h
@@ -9,7 +9,6 @@
#include <memory>
#include <vector>
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "content/browser/service_worker/service_worker_metrics.h"
diff --git a/content/browser/speech/tts_controller_impl.h b/content/browser/speech/tts_controller_impl.h
index efb52a9..4eb535d 100644
--- a/content/browser/speech/tts_controller_impl.h
+++ b/content/browser/speech/tts_controller_impl.h
@@ -10,7 +10,6 @@
#include <string>
#include <vector>
-#include "base/gtest_prod_util.h"
#include "base/json/json_reader.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/singleton.h"
diff --git a/content/browser/web_package/signed_exchange_prologue.h b/content/browser/web_package/signed_exchange_prologue.h
index 04fd0c9..0d59164 100644
--- a/content/browser/web_package/signed_exchange_prologue.h
+++ b/content/browser/web_package/signed_exchange_prologue.h
@@ -6,7 +6,6 @@
#define CONTENT_BROWSER_WEB_PACKAGE_SIGNED_EXCHANGE_PROLOGUE_H_
#include "base/containers/span.h"
-#include "base/gtest_prod_util.h"
#include "content/browser/web_package/signed_exchange_utils.h"
#include "content/common/content_export.h"
diff --git a/content/browser/webui/web_ui_data_source_impl.h b/content/browser/webui/web_ui_data_source_impl.h
index d19edbb2..1bc62303 100644
--- a/content/browser/webui/web_ui_data_source_impl.h
+++ b/content/browser/webui/web_ui_data_source_impl.h
@@ -13,7 +13,6 @@
#include "base/containers/flat_map.h"
#include "base/functional/callback.h"
-#include "base/gtest_prod_util.h"
#include "base/values.h"
#include "content/browser/webui/url_data_source_impl.h"
#include "content/common/content_export.h"
diff --git a/content/public/browser/web_ui_message_handler.h b/content/public/browser/web_ui_message_handler.h
index 04b32a8..bf2d7b40 100644
--- a/content/public/browser/web_ui_message_handler.h
+++ b/content/public/browser/web_ui_message_handler.h
@@ -9,7 +9,6 @@
#include <string_view>
#include "base/check.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/values.h"
diff --git a/device/bluetooth/cast/bluetooth_device_cast.h b/device/bluetooth/cast/bluetooth_device_cast.h
index ad42f8f3..cc82e16 100644
--- a/device/bluetooth/cast/bluetooth_device_cast.h
+++ b/device/bluetooth/cast/bluetooth_device_cast.h
@@ -14,7 +14,6 @@
#include <vector>
#include "base/functional/callback.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
#include "build/build_config.h"
diff --git a/device/bluetooth/floss/floss_lescan_client.h b/device/bluetooth/floss/floss_lescan_client.h
index eced57ac..73eabe73 100644
--- a/device/bluetooth/floss/floss_lescan_client.h
+++ b/device/bluetooth/floss/floss_lescan_client.h
@@ -9,7 +9,6 @@
#include "base/containers/queue.h"
#include "base/functional/callback.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/observer_list.h"
diff --git a/extensions/browser/api/web_request/web_request_api.h b/extensions/browser/api/web_request/web_request_api.h
index c2178a5..17a3941 100644
--- a/extensions/browser/api/web_request/web_request_api.h
+++ b/extensions/browser/api/web_request/web_request_api.h
@@ -17,7 +17,6 @@
#include "base/containers/unique_ptr_adapters.h"
#include "base/functional/callback.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
diff --git a/extensions/common/manifest_handler.h b/extensions/common/manifest_handler.h
index b2914065..95530dc 100644
--- a/extensions/common/manifest_handler.h
+++ b/extensions/common/manifest_handler.h
@@ -13,7 +13,6 @@
#include "base/containers/flat_map.h"
#include "base/containers/small_map.h"
#include "base/containers/span.h"
-#include "base/gtest_prod_util.h"
#include "extensions/common/manifest.h"
namespace extensions {
diff --git a/google_apis/calendar/calendar_api_response_types.h b/google_apis/calendar/calendar_api_response_types.h
index fb7d36c7..5c59a8d 100644
--- a/google_apis/calendar/calendar_api_response_types.h
+++ b/google_apis/calendar/calendar_api_response_types.h
@@ -13,7 +13,6 @@
#include <vector>
#include "base/compiler_specific.h"
-#include "base/gtest_prod_util.h"
#include "base/time/time.h"
#include "url/gurl.h"
diff --git a/google_apis/gaia/oauth2_mint_token_flow.h b/google_apis/gaia/oauth2_mint_token_flow.h
index 2b41339..84418c9 100644
--- a/google_apis/gaia/oauth2_mint_token_flow.h
+++ b/google_apis/gaia/oauth2_mint_token_flow.h
@@ -12,7 +12,6 @@
#include "base/component_export.h"
#include "base/containers/span.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/time/time.h"
diff --git a/ios/chrome/browser/device_sharing/model/device_sharing_manager_impl.h b/ios/chrome/browser/device_sharing/model/device_sharing_manager_impl.h
index 8846dc8..307580d 100644
--- a/ios/chrome/browser/device_sharing/model/device_sharing_manager_impl.h
+++ b/ios/chrome/browser/device_sharing/model/device_sharing_manager_impl.h
@@ -9,7 +9,6 @@
#import <memory>
-#import "base/gtest_prod_util.h"
#import "base/memory/raw_ptr.h"
#import "components/prefs/pref_change_registrar.h"
#import "ios/chrome/browser/device_sharing/model/device_sharing_manager.h"
diff --git a/ios/web/public/init/network_context_owner.h b/ios/web/public/init/network_context_owner.h
index 195bec10..ea1e795 100644
--- a/ios/web/public/init/network_context_owner.h
+++ b/ios/web/public/init/network_context_owner.h
@@ -9,7 +9,6 @@
#include <string>
#include <vector>
-#include "base/gtest_prod_util.h"
#include "ios/web/public/thread/web_thread.h"
#include "net/url_request/url_request_context_getter.h"
#include "net/url_request/url_request_context_getter_observer.h"
diff --git a/media/audio/audio_thread_hang_monitor.h b/media/audio/audio_thread_hang_monitor.h
index 82a8483..732d210 100644
--- a/media/audio/audio_thread_hang_monitor.h
+++ b/media/audio/audio_thread_hang_monitor.h
@@ -10,7 +10,6 @@
#include <optional>
#include "base/functional/callback_forward.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_refptr.h"
diff --git a/net/base/network_change_notifier_passive.h b/net/base/network_change_notifier_passive.h
index d85d01e2..190a2f4 100644
--- a/net/base/network_change_notifier_passive.h
+++ b/net/base/network_change_notifier_passive.h
@@ -5,7 +5,6 @@
#ifndef NET_BASE_NETWORK_CHANGE_NOTIFIER_PASSIVE_H_
#define NET_BASE_NETWORK_CHANGE_NOTIFIER_PASSIVE_H_
-#include "base/gtest_prod_util.h"
#include "base/sequence_checker.h"
#include "base/synchronization/lock.h"
#include "base/threading/thread.h"
diff --git a/net/disk_cache/memory/mem_entry_impl.h b/net/disk_cache/memory/mem_entry_impl.h
index 4d996b94..907accd7 100644
--- a/net/disk_cache/memory/mem_entry_impl.h
+++ b/net/disk_cache/memory/mem_entry_impl.h
@@ -14,7 +14,6 @@
#include <vector>
#include "base/containers/linked_list.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/time/time.h"
diff --git a/net/nqe/network_quality.h b/net/nqe/network_quality.h
index 9bddacd..04e03fa 100644
--- a/net/nqe/network_quality.h
+++ b/net/nqe/network_quality.h
@@ -7,7 +7,6 @@
#include <stdint.h>
-#include "base/gtest_prod_util.h"
#include "base/sequence_checker.h"
#include "base/time/time.h"
#include "net/base/net_export.h"
diff --git a/net/proxy_resolution/proxy_info.h b/net/proxy_resolution/proxy_info.h
index db28120..5baf4aa 100644
--- a/net/proxy_resolution/proxy_info.h
+++ b/net/proxy_resolution/proxy_info.h
@@ -7,7 +7,6 @@
#include <string>
-#include "base/gtest_prod_util.h"
#include "base/time/time.h"
#include "net/base/net_export.h"
#include "net/base/proxy_chain.h"
diff --git a/net/quic/quic_session_pool.h b/net/quic/quic_session_pool.h
index 627fcb5..e57cf59 100644
--- a/net/quic/quic_session_pool.h
+++ b/net/quic/quic_session_pool.h
@@ -17,7 +17,6 @@
#include "base/containers/lru_cache.h"
#include "base/containers/unique_ptr_adapters.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/memory_pressure_listener.h"
#include "base/memory/memory_pressure_monitor.h"
#include "base/memory/raw_ptr.h"
diff --git a/net/socket/ssl_client_socket.h b/net/socket/ssl_client_socket.h
index 8ed9701..496f4acd 100644
--- a/net/socket/ssl_client_socket.h
+++ b/net/socket/ssl_client_socket.h
@@ -11,7 +11,6 @@
#include <vector>
#include "base/containers/flat_set.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/observer_list.h"
#include "net/base/load_timing_info.h"
diff --git a/net/socket/udp_socket_win.h b/net/socket/udp_socket_win.h
index 644f940..1de97ffc5 100644
--- a/net/socket/udp_socket_win.h
+++ b/net/socket/udp_socket_win.h
@@ -17,7 +17,6 @@
#include <memory>
#include <set>
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
diff --git a/net/spdy/spdy_session.h b/net/spdy/spdy_session.h
index 7e1adc5..5fc8d9b4 100644
--- a/net/spdy/spdy_session.h
+++ b/net/spdy/spdy_session.h
@@ -18,7 +18,6 @@
#include <vector>
#include "base/containers/circular_deque.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_refptr.h"
diff --git a/remoting/base/rate_counter.h b/remoting/base/rate_counter.h
index cc89a3ae..090ce2b7 100644
--- a/remoting/base/rate_counter.h
+++ b/remoting/base/rate_counter.h
@@ -10,7 +10,6 @@
#include <utility>
#include "base/containers/queue.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/sequence_checker.h"
#include "base/time/default_tick_clock.h"
diff --git a/remoting/host/heartbeat_sender.h b/remoting/host/heartbeat_sender.h
index f300f1f..752c21b 100644
--- a/remoting/host/heartbeat_sender.h
+++ b/remoting/host/heartbeat_sender.h
@@ -10,7 +10,6 @@
#include <string>
#include "base/functional/callback.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/sequence_checker.h"
#include "base/timer/timer.h"
diff --git a/remoting/protocol/negotiating_authenticator_base.h b/remoting/protocol/negotiating_authenticator_base.h
index 239e387..16d9f01f 100644
--- a/remoting/protocol/negotiating_authenticator_base.h
+++ b/remoting/protocol/negotiating_authenticator_base.h
@@ -9,7 +9,6 @@
#include <string>
#include <vector>
-#include "base/gtest_prod_util.h"
#include "remoting/protocol/authenticator.h"
#include "remoting/protocol/host_authentication_config.h"
diff --git a/services/audio/input_sync_writer.h b/services/audio/input_sync_writer.h
index d68de16..548a9052 100644
--- a/services/audio/input_sync_writer.h
+++ b/services/audio/input_sync_writer.h
@@ -12,7 +12,6 @@
#include <string>
#include <vector>
-#include "base/gtest_prod_util.h"
#include "base/memory/unsafe_shared_memory_region.h"
#include "base/sync_socket.h"
#include "base/time/time.h"
diff --git a/services/cert_verifier/cert_verifier_service_factory.h b/services/cert_verifier/cert_verifier_service_factory.h
index d62f0bfad..f6239094 100644
--- a/services/cert_verifier/cert_verifier_service_factory.h
+++ b/services/cert_verifier/cert_verifier_service_factory.h
@@ -5,7 +5,6 @@
#ifndef SERVICES_CERT_VERIFIER_CERT_VERIFIER_SERVICE_FACTORY_H_
#define SERVICES_CERT_VERIFIER_CERT_VERIFIER_SERVICE_FACTORY_H_
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
diff --git a/services/device/generic_sensor/sensor_provider_impl.h b/services/device/generic_sensor/sensor_provider_impl.h
index c9f700f..4b61fc2 100644
--- a/services/device/generic_sensor/sensor_provider_impl.h
+++ b/services/device/generic_sensor/sensor_provider_impl.h
@@ -7,7 +7,6 @@
#include <map>
-#include "base/gtest_prod_util.h"
#include "base/memory/read_only_shared_memory_region.h"
#include "mojo/public/cpp/bindings/pending_receiver.h"
#include "mojo/public/cpp/bindings/receiver_set.h"
diff --git a/services/resource_coordinator/memory_instrumentation/graph.h b/services/resource_coordinator/memory_instrumentation/graph.h
index a7ecbbc..308979c 100644
--- a/services/resource_coordinator/memory_instrumentation/graph.h
+++ b/services/resource_coordinator/memory_instrumentation/graph.h
@@ -13,7 +13,6 @@
#include <string_view>
#include <vector>
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/process/process_handle.h"
#include "base/trace_event/memory_allocator_dump_guid.h"
diff --git a/services/video_capture/broadcasting_receiver.h b/services/video_capture/broadcasting_receiver.h
index ae162b8..17a4de5 100644
--- a/services/video_capture/broadcasting_receiver.h
+++ b/services/video_capture/broadcasting_receiver.h
@@ -7,7 +7,6 @@
#include <map>
-#include "base/gtest_prod_util.h"
#include "base/memory/weak_ptr.h"
#include "base/sequence_checker.h"
#include "build/build_config.h"
diff --git a/storage/browser/blob/blob_storage_context.h b/storage/browser/blob/blob_storage_context.h
index 543da2c..bdd350d 100644
--- a/storage/browser/blob/blob_storage_context.h
+++ b/storage/browser/blob/blob_storage_context.h
@@ -16,7 +16,6 @@
#include "base/component_export.h"
#include "base/files/file_path.h"
#include "base/functional/callback_forward.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
#include "base/trace_event/memory_dump_provider.h"
diff --git a/third_party/blink/renderer/core/css/parser/css_parser_impl.h b/third_party/blink/renderer/core/css/parser/css_parser_impl.h
index 1fa82da..64c228f 100644
--- a/third_party/blink/renderer/core/css/parser/css_parser_impl.h
+++ b/third_party/blink/renderer/core/css/parser/css_parser_impl.h
@@ -8,7 +8,6 @@
#include <memory>
#include <optional>
-#include "base/gtest_prod_util.h"
#include "css_at_rule_id.h"
#include "third_party/blink/renderer/core/core_export.h"
#include "third_party/blink/renderer/core/css/css_property_names.h"
diff --git a/third_party/blink/renderer/core/dom/element.h b/third_party/blink/renderer/core/dom/element.h
index 140d91a..4db727c 100644
--- a/third_party/blink/renderer/core/dom/element.h
+++ b/third_party/blink/renderer/core/dom/element.h
@@ -27,7 +27,6 @@
#include "base/check_op.h"
#include "base/dcheck_is_on.h"
-#include "base/gtest_prod_util.h"
#include "base/types/pass_key.h"
#include "third_party/blink/public/common/input/pointer_id.h"
#include "third_party/blink/public/common/metrics/document_update_reason.h"
diff --git a/third_party/blink/renderer/core/frame/history.h b/third_party/blink/renderer/core/frame/history.h
index 91f8f7fb..5686dd0f 100644
--- a/third_party/blink/renderer/core/frame/history.h
+++ b/third_party/blink/renderer/core/frame/history.h
@@ -26,7 +26,6 @@
#ifndef THIRD_PARTY_BLINK_RENDERER_CORE_FRAME_HISTORY_H_
#define THIRD_PARTY_BLINK_RENDERER_CORE_FRAME_HISTORY_H_
-#include "base/gtest_prod_util.h"
#include "third_party/blink/public/mojom/page_state/page_state.mojom-blink.h"
#include "third_party/blink/public/web/web_frame_load_type.h"
#include "third_party/blink/renderer/bindings/core/v8/serialization/serialized_script_value.h"
diff --git a/third_party/blink/renderer/core/html/forms/html_select_element.h b/third_party/blink/renderer/core/html/forms/html_select_element.h
index 253db7d..7c98265 100644
--- a/third_party/blink/renderer/core/html/forms/html_select_element.h
+++ b/third_party/blink/renderer/core/html/forms/html_select_element.h
@@ -27,7 +27,6 @@
#ifndef THIRD_PARTY_BLINK_RENDERER_CORE_HTML_FORMS_HTML_SELECT_ELEMENT_H_
#define THIRD_PARTY_BLINK_RENDERER_CORE_HTML_FORMS_HTML_SELECT_ELEMENT_H_
-#include "base/gtest_prod_util.h"
#include "third_party/blink/public/mojom/input/focus_type.mojom-blink-forward.h"
#include "third_party/blink/renderer/core/core_export.h"
#include "third_party/blink/renderer/core/dom/events/simulated_click_options.h"
diff --git a/third_party/blink/renderer/core/layout/layout_box.h b/third_party/blink/renderer/core/layout/layout_box.h
index 18161265..b720e563 100644
--- a/third_party/blink/renderer/core/layout/layout_box.h
+++ b/third_party/blink/renderer/core/layout/layout_box.h
@@ -27,7 +27,6 @@
#include "base/check_op.h"
#include "base/dcheck_is_on.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/stack_allocated.h"
#include "base/notreached.h"
#include "third_party/blink/public/mojom/scroll/scroll_into_view_params.mojom-blink-forward.h"
diff --git a/third_party/blink/renderer/modules/peerconnection/rtc_encoded_underlying_sink_wrapper.h b/third_party/blink/renderer/modules/peerconnection/rtc_encoded_underlying_sink_wrapper.h
index 37b9ead0..d1a25341 100644
--- a/third_party/blink/renderer/modules/peerconnection/rtc_encoded_underlying_sink_wrapper.h
+++ b/third_party/blink/renderer/modules/peerconnection/rtc_encoded_underlying_sink_wrapper.h
@@ -5,7 +5,6 @@
#ifndef THIRD_PARTY_BLINK_RENDERER_MODULES_PEERCONNECTION_RTC_ENCODED_UNDERLYING_SINK_WRAPPER_H_
#define THIRD_PARTY_BLINK_RENDERER_MODULES_PEERCONNECTION_RTC_ENCODED_UNDERLYING_SINK_WRAPPER_H_
-#include "base/gtest_prod_util.h"
#include "base/sequence_checker.h"
#include "base/task/single_thread_task_runner.h"
#include "base/threading/thread_checker.h"
diff --git a/third_party/blink/renderer/modules/peerconnection/rtc_encoded_underlying_source_wrapper.h b/third_party/blink/renderer/modules/peerconnection/rtc_encoded_underlying_source_wrapper.h
index 99d2488..21cfb1a5 100644
--- a/third_party/blink/renderer/modules/peerconnection/rtc_encoded_underlying_source_wrapper.h
+++ b/third_party/blink/renderer/modules/peerconnection/rtc_encoded_underlying_source_wrapper.h
@@ -5,7 +5,6 @@
#ifndef THIRD_PARTY_BLINK_RENDERER_MODULES_PEERCONNECTION_RTC_ENCODED_UNDERLYING_SOURCE_WRAPPER_H_
#define THIRD_PARTY_BLINK_RENDERER_MODULES_PEERCONNECTION_RTC_ENCODED_UNDERLYING_SOURCE_WRAPPER_H_
-#include "base/gtest_prod_util.h"
#include "base/sequence_checker.h"
#include "base/task/single_thread_task_runner.h"
#include "base/threading/thread_checker.h"
diff --git a/third_party/blink/renderer/modules/webaudio/script_processor_node.h b/third_party/blink/renderer/modules/webaudio/script_processor_node.h
index 1fd5825..d150a32 100644
--- a/third_party/blink/renderer/modules/webaudio/script_processor_node.h
+++ b/third_party/blink/renderer/modules/webaudio/script_processor_node.h
@@ -26,7 +26,6 @@
#ifndef THIRD_PARTY_BLINK_RENDERER_MODULES_WEBAUDIO_SCRIPT_PROCESSOR_NODE_H_
#define THIRD_PARTY_BLINK_RENDERER_MODULES_WEBAUDIO_SCRIPT_PROCESSOR_NODE_H_
-#include "base/gtest_prod_util.h"
#include "base/synchronization/waitable_event.h"
#include "third_party/blink/renderer/bindings/core/v8/active_script_wrappable.h"
#include "third_party/blink/renderer/modules/webaudio/audio_node.h"
diff --git a/third_party/blink/renderer/modules/webaudio/stereo_panner_node.h b/third_party/blink/renderer/modules/webaudio/stereo_panner_node.h
index 0883d26..bb6799d 100644
--- a/third_party/blink/renderer/modules/webaudio/stereo_panner_node.h
+++ b/third_party/blink/renderer/modules/webaudio/stereo_panner_node.h
@@ -7,7 +7,6 @@
#include <memory>
-#include "base/gtest_prod_util.h"
#include "third_party/blink/renderer/modules/webaudio/audio_node.h"
#include "third_party/blink/renderer/modules/webaudio/audio_param.h"
#include "third_party/blink/renderer/modules/webaudio/stereo_panner_handler.h"
diff --git a/third_party/blink/renderer/platform/blob/blob_data.h b/third_party/blink/renderer/platform/blob/blob_data.h
index 885f1cd..1091acd 100644
--- a/third_party/blink/renderer/platform/blob/blob_data.h
+++ b/third_party/blink/renderer/platform/blob/blob_data.h
@@ -41,7 +41,6 @@
#include <memory>
#include <optional>
-#include "base/gtest_prod_util.h"
#include "base/synchronization/lock.h"
#include "base/thread_annotations.h"
#include "mojo/public/cpp/bindings/pending_remote.h"
diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_loader.h b/third_party/blink/renderer/platform/loader/fetch/resource_loader.h
index 1acdaed..5df89522 100644
--- a/third_party/blink/renderer/platform/loader/fetch/resource_loader.h
+++ b/third_party/blink/renderer/platform/loader/fetch/resource_loader.h
@@ -33,7 +33,6 @@
#include <variant>
#include "base/containers/span.h"
-#include "base/gtest_prod_util.h"
#include "base/task/single_thread_task_runner.h"
#include "base/time/time.h"
#include "mojo/public/cpp/base/big_buffer.h"
diff --git a/third_party/blink/renderer/platform/scheduler/public/aggregated_metric_reporter.h b/third_party/blink/renderer/platform/scheduler/public/aggregated_metric_reporter.h
index 5b0a2c38..91181e50 100644
--- a/third_party/blink/renderer/platform/scheduler/public/aggregated_metric_reporter.h
+++ b/third_party/blink/renderer/platform/scheduler/public/aggregated_metric_reporter.h
@@ -8,7 +8,6 @@
#include <array>
#include "base/check_op.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/metrics/histogram.h"
#include "base/threading/thread_checker.h"
diff --git a/third_party/blink/renderer/platform/weborigin/security_origin.h b/third_party/blink/renderer/platform/weborigin/security_origin.h
index 926537ab..4962b57 100644
--- a/third_party/blink/renderer/platform/weborigin/security_origin.h
+++ b/third_party/blink/renderer/platform/weborigin/security_origin.h
@@ -34,7 +34,6 @@
#include <memory>
#include <optional>
-#include "base/gtest_prod_util.h"
#include "third_party/blink/renderer/platform/platform_export.h"
#include "third_party/blink/renderer/platform/wtf/allocator/allocator.h"
#include "third_party/blink/renderer/platform/wtf/forward.h"
diff --git a/ui/accessibility/platform/ax_platform_node_win.h b/ui/accessibility/platform/ax_platform_node_win.h
index 162f108..bb9afd6 100644
--- a/ui/accessibility/platform/ax_platform_node_win.h
+++ b/ui/accessibility/platform/ax_platform_node_win.h
@@ -16,7 +16,6 @@
#include <vector>
#include "base/component_export.h"
-#include "base/gtest_prod_util.h"
#include "base/metrics/histogram_functions.h"
#include "base/metrics/histogram_macros.h"
#include "base/observer_list.h"
diff --git a/ui/base/clipboard/clipboard_mac.h b/ui/base/clipboard/clipboard_mac.h
index 88267f5..d1e45a21 100644
--- a/ui/base/clipboard/clipboard_mac.h
+++ b/ui/base/clipboard/clipboard_mac.h
@@ -13,7 +13,6 @@
#include "base/apple/foundation_util.h"
#include "base/callback_list.h"
#include "base/component_export.h"
-#include "base/gtest_prod_util.h"
#include "ui/base/clipboard/clipboard.h"
#include "ui/base/clipboard/clipboard_change_notifier.h"
diff --git a/ui/base/ime/win/on_screen_keyboard_display_manager_tab_tip.h b/ui/base/ime/win/on_screen_keyboard_display_manager_tab_tip.h
index 21e7e034..ec7d819d 100644
--- a/ui/base/ime/win/on_screen_keyboard_display_manager_tab_tip.h
+++ b/ui/base/ime/win/on_screen_keyboard_display_manager_tab_tip.h
@@ -8,7 +8,6 @@
#include <string>
#include "base/component_export.h"
-#include "base/gtest_prod_util.h"
#include "base/observer_list.h"
#include "ui/base/ime/virtual_keyboard_controller.h"
#include "ui/gfx/geometry/rect.h"
diff --git a/ui/base/interaction/interactive_test_internal.h b/ui/base/interaction/interactive_test_internal.h
index 269f6d93..8044802b 100644
--- a/ui/base/interaction/interactive_test_internal.h
+++ b/ui/base/interaction/interactive_test_internal.h
@@ -19,7 +19,6 @@
#include "base/callback_list.h"
#include "base/containers/contains.h"
-#include "base/gtest_prod_util.h"
#include "base/logging.h"
#include "base/memory/raw_ref.h"
#include "base/memory/weak_ptr.h"
diff --git a/ui/compositor/presentation_time_recorder.h b/ui/compositor/presentation_time_recorder.h
index 29c7598..e703f3e 100644
--- a/ui/compositor/presentation_time_recorder.h
+++ b/ui/compositor/presentation_time_recorder.h
@@ -7,7 +7,6 @@
#include <optional>
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/time/time.h"
#include "ui/compositor/compositor.h"
diff --git a/ui/display/manager/display_manager.h b/ui/display/manager/display_manager.h
index 236ddec0..058e2a4b 100644
--- a/ui/display/manager/display_manager.h
+++ b/ui/display/manager/display_manager.h
@@ -20,7 +20,6 @@
#include "base/cancelable_callback.h"
#include "base/check_op.h"
#include "base/functional/callback.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/observer_list.h"
diff --git a/ui/display/manager/display_port_observer.h b/ui/display/manager/display_port_observer.h
index 727e857..228c72c 100644
--- a/ui/display/manager/display_port_observer.h
+++ b/ui/display/manager/display_port_observer.h
@@ -9,7 +9,6 @@
#include <vector>
#include "base/functional/callback.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "ui/display/manager/display_configurator.h"
diff --git a/ui/events/ozone/evdev/input_controller_evdev.h b/ui/events/ozone/evdev/input_controller_evdev.h
index 93fdff0..467e3430 100644
--- a/ui/events/ozone/evdev/input_controller_evdev.h
+++ b/ui/events/ozone/evdev/input_controller_evdev.h
@@ -9,7 +9,6 @@
#include "base/component_export.h"
#include "base/containers/flat_map.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "mojo/public/cpp/bindings/pending_receiver.h"
diff --git a/ui/gfx/color_space.h b/ui/gfx/color_space.h
index c5eceb8..27fa055 100644
--- a/ui/gfx/color_space.h
+++ b/ui/gfx/color_space.h
@@ -11,7 +11,6 @@
#include <optional>
#include <string>
-#include "base/gtest_prod_util.h"
#include "build/build_config.h"
#include "third_party/skia/include/core/SkRefCnt.h"
#include "ui/gfx/color_space_export.h"
diff --git a/ui/ozone/platform/wayland/host/wayland_buffer_manager_host.h b/ui/ozone/platform/wayland/host/wayland_buffer_manager_host.h
index 1caee55..8b6568d 100644
--- a/ui/ozone/platform/wayland/host/wayland_buffer_manager_host.h
+++ b/ui/ozone/platform/wayland/host/wayland_buffer_manager_host.h
@@ -13,7 +13,6 @@
#include "base/containers/flat_map.h"
#include "base/files/scoped_file.h"
#include "base/functional/callback.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "mojo/public/cpp/bindings/associated_remote.h"
#include "mojo/public/cpp/bindings/receiver.h"
diff --git a/ui/ozone/platform/wayland/host/wayland_clipboard.h b/ui/ozone/platform/wayland/host/wayland_clipboard.h
index 35cdddb..d51548f4 100644
--- a/ui/ozone/platform/wayland/host/wayland_clipboard.h
+++ b/ui/ozone/platform/wayland/host/wayland_clipboard.h
@@ -9,7 +9,6 @@
#include <string>
#include "base/functional/callback.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "ui/base/clipboard/clipboard_buffer.h"
#include "ui/ozone/platform/wayland/host/wayland_data_device.h"
diff --git a/ui/ozone/platform/wayland/host/wayland_window_drag_controller.h b/ui/ozone/platform/wayland/host/wayland_window_drag_controller.h
index 2dda7cc..9d0aa292 100644
--- a/ui/ozone/platform/wayland/host/wayland_window_drag_controller.h
+++ b/ui/ozone/platform/wayland/host/wayland_window_drag_controller.h
@@ -12,7 +12,6 @@
#include <string>
#include "base/functional/callback_forward.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "ui/base/dragdrop/mojom/drag_drop_types.mojom-forward.h"
diff --git a/ui/views/controls/button/label_button.h b/ui/views/controls/button/label_button.h
index 4715994..e70236f 100644
--- a/ui/views/controls/button/label_button.h
+++ b/ui/views/controls/button/label_button.h
@@ -11,7 +11,6 @@
#include <string_view>
#include "base/functional/bind.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "third_party/skia/include/core/SkColor.h"
#include "ui/color/color_id.h"
diff --git a/ui/views/controls/scroll_view.h b/ui/views/controls/scroll_view.h
index 41376781..0c90a230 100644
--- a/ui/views/controls/scroll_view.h
+++ b/ui/views/controls/scroll_view.h
@@ -10,7 +10,6 @@
#include <utility>
#include "base/callback_list.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "ui/color/color_variant.h"
#include "ui/compositor/layer_type.h"
diff --git a/ui/views/window/dialog_client_view.h b/ui/views/window/dialog_client_view.h
index 4bcbbbb4..f20f971 100644
--- a/ui/views/window/dialog_client_view.h
+++ b/ui/views/window/dialog_client_view.h
@@ -11,7 +11,6 @@
#include <vector>
#include "base/feature_list.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "ui/base/interaction/element_identifier.h"
#include "ui/base/mojom/dialog_button.mojom.h"
diff --git a/url/origin.h b/url/origin.h
index 0fd2935..23fd78c 100644
--- a/url/origin.h
+++ b/url/origin.h
@@ -15,7 +15,6 @@
#include <utility>
#include "base/component_export.h"
-#include "base/gtest_prod_util.h"
#include "base/strings/string_util.h"
#include "base/trace_event/base_tracing_forward.h"
#include "base/unguessable_token.h"
