extensions: remove unnecessary include from browsertest_util.h

This unnecessary include removal from
extensions/browser/browsertest_util.h
reduces processing time of
chrome/browser/extensions/extension_browsertest.h
from 7.1s to 3.7s in compile of
browser_non_client_frame_view_browsertest.cc

Before:
https://ui.perfetto.dev/#!/?s=275a5587023c48de9b1c9dc06a89f310e95b676ccfb3263c31ed62bc88c4f109
After: https://ui.perfetto.dev/#!/?s=0ccb41f6dbf7bcd62c2096a7ac82237bb74576cabb25e71ef3bd5d2d7a12d148

Bug: 324519459
Change-Id: I0ff7ff4a9cb36c894656e195b0aaec955129cd24
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5302373
Reviewed-by: Reilly Grant <reillyg@chromium.org>
Auto-Submit: Takuto Ikuta <tikuta@chromium.org>
Commit-Queue: Takuto Ikuta <tikuta@chromium.org>
Reviewed-by: Erik Chen <erikchen@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1263131}

chrome/browser/apps/platform_apps/app_window_browsertest.cc

@@ -22,6 +22,7 @@
 #include "extensions/common/extension_id.h"
 #include "extensions/test/extension_test_message_listener.h"
 #include "extensions/test/result_catcher.h"
+#include "ui/display/display_switches.h"
 
 using extensions::AppWindowGeometryCache;
 using extensions::ResultCatcher;

chrome/browser/apps/platform_apps/app_window_interactive_uitest_base.cc

@@ -12,6 +12,7 @@
 #include "extensions/browser/app_window/native_app_window.h"
 #include "extensions/test/extension_test_message_listener.h"
 #include "extensions/test/result_catcher.h"
+#include "ui/display/display_switches.h"
 
 FullscreenChangeWaiter::FullscreenChangeWaiter(
     extensions::NativeAppWindow* window)

chrome/browser/ash/accessibility/accessibility_extension_api_browsertest.cc

@@ -22,6 +22,7 @@
 #include "chrome/browser/web_applications/web_app_provider.h"
 #include "chrome/common/webui_url_constants.h"
 #include "content/public/test/browser_test.h"
+#include "content/public/test/browser_test_utils.h"
 #include "extensions/test/extension_test_message_listener.h"
 #include "extensions/test/result_catcher.h"
 #include "ui/accessibility/accessibility_features.h"

chrome/browser/ash/app_list/app_list_client_impl_browsertest.cc

@@ -81,7 +81,9 @@
 #include "components/services/app_service/public/cpp/package_id.h"
 #include "components/user_manager/user_manager.h"
 #include "components/user_manager/user_names.h"
+#include "content/public/browser/web_contents_observer.h"
 #include "content/public/test/browser_test.h"
+#include "content/public/test/browser_test_utils.h"
 #include "content/public/test/test_utils.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/common/constants.h"

chrome/browser/ash/app_list/app_service/app_service_promise_app_item_browsertest.cc

@@ -24,7 +24,9 @@
 #include "ash/public/cpp/shelf_model.h"
 #include "ash/public/cpp/shelf_types.h"
 #include "base/memory/raw_ptr.h"
+#include "base/metrics/histogram_base.h"
 #include "base/test/bind.h"
+#include "base/test/metrics/histogram_tester.h"
 #include "base/test/test_future.h"
 #include "chrome/browser/apps/app_service/app_service_proxy.h"
 #include "chrome/browser/apps/app_service/app_service_proxy_ash.h"

chrome/browser/ash/file_manager/external_filesystem_apitest.cc

@@ -11,6 +11,7 @@
 #include "base/files/scoped_temp_dir.h"
 #include "base/functional/bind.h"
 #include "base/memory/raw_ptr.h"
+#include "base/metrics/histogram_base.h"
 #include "base/path_service.h"
 #include "base/strings/strcat.h"
 #include "base/strings/string_util.h"
@@ -38,6 +39,7 @@
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/navigation_handle.h"
 #include "content/public/test/browser_test.h"
+#include "content/public/test/browser_test_utils.h"
 #include "content/public/test/file_system_chooser_test_helpers.h"
 #include "content/public/test/test_navigation_observer.h"
 #include "content/public/test/test_utils.h"

chrome/browser/autocomplete/autocomplete_browsertest.cc

@@ -40,6 +40,7 @@
 #include "components/omnibox/browser/omnibox_view.h"
 #include "components/search_engines/template_url_service.h"
 #include "content/public/test/browser_test.h"
+#include "content/public/test/browser_test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/metrics_proto/omnibox_event.pb.h"
 

chrome/browser/chromeos/extensions/odfs_config_private/odfs_config_private_api_browsertest.cc

@@ -16,6 +16,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/test/browser_test.h"
 #include "extensions/browser/api_test_utils.h"
+#include "testing/gmock/include/gmock/gmock.h"
 #include "third_party/abseil-cpp/absl/cleanup/cleanup.h"
 #include "ui/message_center/public/cpp/notification.h"
 

chrome/browser/chromeos/extensions/wm/wm_desks_private_apitest_lacros.cc

@@ -3,6 +3,8 @@
 // found in the LICENSE file.
 
 #include "base/memory/scoped_refptr.h"
+#include "base/metrics/histogram_base.h"
+#include "base/test/metrics/histogram_tester.h"
 #include "base/test/spin_wait.h"
 #include "base/test/test_future.h"
 #include "base/test/test_timeouts.h"

chrome/browser/chromeos/policy/dlp/dlp_content_tab_helper_browsertest.cc

@@ -16,6 +16,7 @@
 #include "content/public/common/content_features.h"
 #include "content/public/test/back_forward_cache_util.h"
 #include "content/public/test/browser_test.h"
+#include "content/public/test/browser_test_utils.h"
 #include "extensions/test/extension_test_message_listener.h"
 #include "net/dns/mock_host_resolver.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"

chrome/browser/extensions/api/content_settings/content_settings_apitest.cc

@@ -38,6 +38,7 @@
 #include "content/public/common/content_switches.h"
 #include "content/public/common/webplugininfo.h"
 #include "content/public/test/browser_test.h"
+#include "content/public/test/browser_test_utils.h"
 #include "content/public/test/test_utils.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/test_extension_registry_observer.h"

chrome/browser/extensions/api/crash_report_private/crash_report_private_apitest.cc

@@ -21,6 +21,7 @@
 #include "components/crash/content/browser/error_reporting/mock_crash_endpoint.h"
 #include "content/public/test/browser_task_environment.h"
 #include "content/public/test/browser_test.h"
+#include "content/public/test/browser_test_utils.h"
 #include "extensions/browser/extension_host.h"
 #include "extensions/browser/process_manager.h"
 #include "extensions/common/switches.h"

chrome/browser/extensions/api/developer_private/developer_private_apitest.cc

@@ -18,6 +18,7 @@
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/test/browser_test.h"
+#include "content/public/test/browser_test_utils.h"
 #include "content/public/test/service_worker_test_helpers.h"
 #include "extensions/browser/api_test_utils.h"
 #include "extensions/browser/app_window/app_window.h"

chrome/browser/extensions/api/enterprise_device_attributes/enterprise_device_attributes_lacros_apitest.cc

@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "base/json/json_writer.h"
 #include "base/path_service.h"
 #include "base/test/gtest_tags.h"
 #include "chrome/browser/extensions/extension_apitest.h"

chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc

@@ -29,7 +29,9 @@
 #include "components/zoom/zoom_controller.h"
 #include "content/public/browser/host_zoom_map.h"
 #include "content/public/browser/web_contents.h"
+#include "content/public/browser/web_contents_observer.h"
 #include "content/public/test/browser_test.h"
+#include "content/public/test/browser_test_utils.h"
 #include "content/public/test/download_test_observer.h"
 #include "content/public/test/fenced_frame_test_util.h"
 #include "content/public/test/test_navigation_observer.h"

chrome/browser/extensions/api/networking_private/networking_private_service_client_apitest.cc

@@ -16,6 +16,7 @@
 #include "extensions/browser/api/networking_private/networking_private_event_router_factory.h"
 #include "extensions/browser/api/networking_private/networking_private_service_client.h"
 #include "extensions/common/switches.h"
+#include "testing/gmock/include/gmock/gmock.h"
 
 // This tests the Windows / Mac implementation of the networkingPrivate API
 // (NetworkingPrivateServiceClient). Note, only a subset of the

chrome/browser/extensions/api/offscreen/audio_lifetime_enforcer_browsertest.cc

@@ -12,6 +12,7 @@
 #include "chrome/browser/extensions/extension_util.h"
 #include "components/version_info/channel.h"
 #include "content/public/test/browser_test.h"
+#include "content/public/test/browser_test_utils.h"
 #include "content/public/test/test_navigation_observer.h"
 #include "extensions/browser/extension_util.h"
 #include "extensions/browser/offscreen_document_host.h"

chrome/browser/extensions/api/preference/preference_api_lacros_browsertest.cc

@@ -29,6 +29,7 @@
 #include "components/proxy_config/proxy_config_dictionary.h"
 #include "components/proxy_config/proxy_config_pref_names.h"
 #include "content/public/test/browser_test.h"
+#include "content/public/test/test_utils.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/test_extension_registry_observer.h"

chrome/browser/extensions/api/virtual_keyboard_private/virtual_keyboard_private_apitest.cc

@@ -9,6 +9,7 @@
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/test/browser_test.h"
+#include "content/public/test/browser_test_utils.h"
 #include "net/dns/mock_host_resolver.h"
 #include "ui/base/clipboard/custom_data_helper.h"
 #include "ui/base/clipboard/scoped_clipboard_writer.h"

chrome/browser/extensions/background_header_browsertest.cc

@@ -7,6 +7,7 @@
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "components/network_session_configurator/common/network_switches.h"
 #include "content/public/test/browser_test.h"
+#include "content/public/test/browser_test_utils.h"
 #include "extensions/test/extension_test_message_listener.h"
 #include "extensions/test/test_extension_dir.h"
 #include "net/dns/mock_host_resolver.h"

chrome/browser/extensions/extension_keybinding_apitest.cc

@@ -26,6 +26,7 @@
 #include "components/sessions/content/session_tab_helper.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/browser_test.h"
+#include "content/public/test/browser_test_utils.h"
 #include "content/public/test/javascript_test_observer.h"
 #include "extensions/browser/extension_action.h"
 #include "extensions/browser/extension_action_manager.h"

chrome/browser/extensions/protocol_handler_apitest.cc

@@ -14,6 +14,7 @@
 #include "components/permissions/permission_request_manager.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/test/browser_test.h"
+#include "content/public/test/browser_test_utils.h"
 #include "extensions/test/extension_test_message_listener.h"
 #include "extensions/test/result_catcher.h"
 #include "third_party/blink/public/common/security/protocol_handler_security_level.h"

chrome/browser/extensions/script_executor_browsertest.cc

@@ -16,6 +16,7 @@
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/browser_test.h"
+#include "content/public/test/browser_test_utils.h"
 #include "content/public/test/test_navigation_observer.h"
 #include "extensions/browser/extension_api_frame_id_map.h"
 #include "extensions/browser/extension_registry.h"

chrome/browser/extensions/service_worker_apitest.h

@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_EXTENSIONS_SERVICE_WORKER_APITEST_H_
 
 #include "chrome/browser/extensions/extension_apitest.h"
+#include "content/public/common/page_type.h"
 #include "extensions/browser/process_manager.h"
 
 class GURL;

chrome/browser/extensions/site_permissions_helper_browsertest.cc

@@ -14,6 +14,7 @@
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/test/browser_test.h"
+#include "content/public/test/browser_test_utils.h"
 #include "extensions/browser/permissions_manager.h"
 #include "extensions/common/manifest_handlers/content_scripts_handler.h"
 #include "extensions/common/mojom/run_location.mojom-shared.h"

chrome/browser/extensions/user_script_world_browsertest.cc

@@ -12,6 +12,7 @@
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/test/browser_test.h"
+#include "content/public/test/browser_test_utils.h"
 #include "content/public/test/test_navigation_observer.h"
 #include "extensions/browser/renderer_startup_helper.h"
 #include "extensions/browser/script_executor.h"

chrome/browser/lacros/lacros_extension_apps_controller_lacros_browsertest.cc

@@ -11,6 +11,8 @@
 #include <vector>
 
 #include "base/functional/bind.h"
+#include "base/metrics/histogram_base.h"
+#include "base/test/metrics/histogram_tester.h"
 #include "base/test/run_until.h"
 #include "base/test/test_future.h"
 #include "chrome/browser/extensions/chrome_test_extension_loader.h"

chrome/browser/renderer_context_menu/link_to_text_menu_observer_interactive_uitest.cc

@@ -18,6 +18,7 @@
 #include "content/public/browser/context_menu_params.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/test/browser_test.h"
+#include "content/public/test/browser_test_utils.h"
 #include "net/dns/mock_host_resolver.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/clipboard/clipboard.h"

chrome/browser/ui/ash/app_list/app_list_with_recent_apps_browsertest.cc

@@ -4,6 +4,8 @@
 
 #include "ash/public/cpp/test/app_list_test_api.h"
 #include "ash/public/cpp/test/shell_test_api.h"
+#include "base/metrics/histogram_base.h"
+#include "base/test/metrics/histogram_tester.h"
 #include "chrome/browser/ash/app_list/app_list_client_impl.h"
 #include "chrome/browser/ash/app_list/search/search_controller.h"
 #include "chrome/browser/extensions/extension_browsertest.h"

chrome/browser/ui/ash/desks/desks_client_browsertest.cc

@@ -43,9 +43,11 @@
 #include "base/containers/contains.h"
 #include "base/json/json_writer.h"
 #include "base/memory/raw_ptr.h"
+#include "base/metrics/histogram_base.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/bind.h"
+#include "base/test/metrics/histogram_tester.h"
 #include "base/test/scoped_feature_list.h"
 #include "base/test/spin_wait.h"
 #include "base/uuid.h"

chrome/browser/ui/ash/user_education/chrome_user_education_delegate_browsertest.cc

@@ -8,6 +8,7 @@
 #include <string>
 
 #include "ash/webui/system_apps/public/system_web_app_type.h"
+#include "base/metrics/histogram_base.h"
 #include "base/test/metrics/histogram_tester.h"
 #include "base/test/run_until.h"
 #include "chrome/browser/apps/app_service/metrics/app_service_metrics.h"

chrome/browser/ui/cocoa/apps/native_app_window_cocoa_browsertest.mm

@@ -26,6 +26,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/public/test/browser_test.h"
+#include "content/public/test/browser_test_utils.h"
 #include "content/public/test/test_utils.h"
 #include "extensions/browser/app_window/app_window_registry.h"
 #include "extensions/common/constants.h"

chrome/browser/ui/views/extensions/device_chooser_extension_browsertest.cc

@@ -20,6 +20,7 @@
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/test/browser_test.h"
+#include "content/public/test/browser_test_utils.h"
 #include "extensions/test/test_extension_dir.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "ui/views/layout/animating_layout_manager_test_util.h"

chrome/browser/ui/web_applications/app_browser_controller_browsertest_chromeos.cc

@@ -35,6 +35,7 @@
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/test/browser_test.h"
+#include "content/public/test/browser_test_utils.h"
 #include "content/public/test/test_utils.h"
 #include "content/public/test/theme_change_waiter.h"
 #include "extensions/browser/extension_registry.h"

chrome/browser/web_applications/preinstalled_web_app_migration_browsertest.cc

@@ -11,11 +11,13 @@
 #include "base/auto_reset.h"
 #include "base/files/file_path.h"
 #include "base/json/json_reader.h"
+#include "base/metrics/histogram_base.h"
 #include "base/path_service.h"
 #include "base/strings/strcat.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/bind.h"
+#include "base/test/metrics/histogram_tester.h"
 #include "base/test/test_future.h"
 #include "build/chromeos_buildflags.h"
 #include "chrome/browser/apps/app_service/app_registry_cache_waiter.h"

extensions/browser/app_window/app_window_browsertest.cc

@@ -6,6 +6,7 @@
 #include "build/chromeos_buildflags.h"
 #include "chrome/browser/apps/platform_apps/app_browsertest_util.h"
 #include "content/public/test/browser_test.h"
+#include "content/public/test/browser_test_utils.h"
 #include "extensions/browser/app_window/native_app_window.h"
 
 namespace extensions {

extensions/browser/browsertest_util.h

@@ -7,7 +7,6 @@
 
 #include <string>
 
-#include "content/public/test/browser_test_utils.h"
 #include "extensions/common/extension_id.h"
 
 namespace base {