From ef4e919472b5d3392ee0a203eb127cbbdfca18d2 Mon Sep 17 00:00:00 2001 From: Guido Urdaneta Date: Mon, 9 Nov 2020 15:06:24 +0000 Subject: [PATCH] Reland "Move base/test/bind_test_util.h to base/test/bind.h" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 8bd07a6cf9f06aabfa2af81c6e3679c0d51dad73. Reason for revert: This revert was incorrect and breaks the build. Original change's description: > Revert "Move base/test/bind_test_util.h to base/test/bind.h" > > This reverts commit a4493a6f807921ee85f7783e671c1d7d488c5bff. > > Reason for revert: This CL breaks internal builds (e.g. /chrome/browser/media/kaleidoscope/internal/kaleidoscope_browsertest.cc). > > Original change's description: > > Move base/test/bind_test_util.h to base/test/bind.h > > > > Stop relying on us to remember arcane file names when writing tests, > > and repeating the directory hierarchy into the file name. > > > > R=​dcheng@chromium.org > > TBR= > > NOPRESUBMIT=true > > > > Change-Id: I49c951162939c7dcef44883bee740f94b2f49e09 > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2523099 > > Commit-Queue: danakj > > Reviewed-by: Daniel Cheng > > Cr-Commit-Position: refs/heads/master@{#825145} > > TBR=danakj@chromium.org,dcheng@chromium.org > > # Not skipping CQ checks because original CL landed > 1 day ago. > > Change-Id: If165b8443662baa564895e994ea0d772348e6da6 > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2526102 > Reviewed-by: Denis Kuznetsov [CET] > Commit-Queue: Denis Kuznetsov [CET] > Cr-Commit-Position: refs/heads/master@{#825328} TBR=danakj@chromium.org,dcheng@chromium.org,antrim@chromium.org # Not skipping CQ checks because this is a reland. NOPRESUBMIT=true NOTREECHECK=true No-Try: True Change-Id: I6a8c0c8bbb1c8f87cc7f2df7a8b3388971292975 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2526683 Commit-Queue: Guido Urdaneta Reviewed-by: Guido Urdaneta Cr-Commit-Position: refs/heads/master@{#825329} --- android_webview/test/shell/memory_metrics_logger_utils.cc | 2 +- ash/ambient/ambient_controller_unittest.cc | 2 +- ash/ambient/ambient_photo_controller_unittest.cc | 2 +- .../in_session_auth_dialog_controller_impl_unittest.cc | 2 +- ash/keyboard/keyboard_controller_impl_unittest.cc | 2 +- ash/login/login_screen_controller_unittest.cc | 2 +- ash/login/ui/pin_request_view_unittest.cc | 2 +- ash/metrics/presentation_time_recorder_unittest.cc | 2 +- .../message_center/arc_notification_content_view_unittest.cc | 2 +- ash/public/cpp/holding_space/holding_space_item_unittest.cc | 2 +- ash/public/cpp/metrics_util_unittest.cc | 2 +- ash/system/holding_space/holding_space_tray_unittest.cc | 2 +- ash/wallpaper/wallpaper_controller_unittest.cc | 2 +- ash/wm/overview/overview_test_util.cc | 2 +- base/allocator/partition_allocator/partition_lock_unittest.cc | 2 +- base/allocator/partition_allocator/thread_cache_unittest.cc | 2 +- base/android/java_handler_thread_unittest.cc | 2 +- base/bind_unittest.cc | 2 +- base/bind_unittest.nc | 2 +- base/debug/task_trace_unittest.cc | 2 +- base/files/important_file_writer_cleaner_unittest.cc | 2 +- base/fuchsia/intl_profile_watcher_unittest.cc | 2 +- base/logging_unittest.cc | 2 +- base/message_loop/message_pump_mac_unittest.mm | 2 +- base/message_loop/message_pump_unittest.cc | 2 +- base/message_loop/work_id_provider_unittest.cc | 2 +- base/observer_list_threadsafe_unittest.cc | 2 +- base/profiler/module_cache_unittest.cc | 2 +- base/profiler/native_unwinder_android_unittest.cc | 2 +- base/profiler/stack_sampling_profiler_test_util.cc | 2 +- base/profiler/stack_sampling_profiler_unittest.cc | 2 +- base/run_loop_unittest.cc | 2 +- base/sequence_checker_unittest.cc | 2 +- base/task/cancelable_task_tracker_unittest.cc | 2 +- base/task/common/task_annotator_unittest.cc | 2 +- base/task/job_perftest.cc | 2 +- base/task/post_job_unittest.cc | 2 +- base/task/post_task_unittest.cc | 2 +- base/task/sequence_manager/atomic_flag_set_unittest.cc | 2 +- base/task/sequence_manager/sequence_manager_impl_unittest.cc | 2 +- .../thread_controller_with_message_pump_impl_unittest.cc | 2 +- base/task/single_thread_task_executor_unittest.cc | 2 +- base/task/thread_pool/can_run_policy_test.h | 2 +- base/task/thread_pool/delayed_task_manager_unittest.cc | 2 +- base/task/thread_pool/job_task_source_unittest.cc | 2 +- .../pooled_single_thread_task_runner_manager_unittest.cc | 2 +- base/task/thread_pool/task_tracker_unittest.cc | 2 +- base/task/thread_pool/test_utils.cc | 2 +- base/task/thread_pool/thread_group_impl_unittest.cc | 2 +- base/task/thread_pool/thread_group_unittest.cc | 2 +- base/task/thread_pool/thread_pool_impl_unittest.cc | 2 +- base/task/thread_pool_unittest.cc | 2 +- base/test/BUILD.gn | 4 ++-- base/test/{bind_test_util.cc => bind.cc} | 2 +- base/test/{bind_test_util.h => bind.h} | 4 ++-- base/test/scoped_run_loop_timeout_unittest.cc | 2 +- base/test/task_environment.cc | 2 +- base/test/task_environment_unittest.cc | 2 +- base/test/test_mock_time_task_runner_unittest.cc | 2 +- base/threading/hang_watcher_unittest.cc | 2 +- base/threading/scoped_blocking_call_unittest.cc | 2 +- base/threading/sequence_bound_unittest.cc | 2 +- base/threading/thread_checker_unittest.cc | 2 +- base/threading/thread_local_storage_perftest.cc | 2 +- base/threading/thread_local_unittest.cc | 2 +- base/threading/thread_unittest.cc | 2 +- base/timer/timer_unittest.cc | 2 +- .../multi_source_memory_pressure_monitor_unittest.cc | 2 +- .../system_memory_pressure_evaluator_win_unittest.cc | 2 +- base/win/post_async_results_unittest.cc | 2 +- cc/metrics/frame_sequence_tracker_unittest.cc | 2 +- cc/metrics/video_playback_roughness_reporter_unittest.cc | 2 +- cc/trees/layer_tree_host_impl_unittest.cc | 2 +- chrome/browser/about_flags_browsertest.cc | 2 +- chrome/browser/android/customtabs/custom_tabs_browsertest.cc | 2 +- .../android/customtabs/detached_resource_request_unittest.cc | 2 +- .../browser/android/explore_sites/block_site_task_unittest.cc | 2 +- .../android/explore_sites/clear_activities_task_unittest.cc | 2 +- .../android/explore_sites/clear_catalog_task_unittest.cc | 2 +- .../android/explore_sites/explore_sites_fetcher_unittest.cc | 2 +- .../explore_sites/explore_sites_service_impl_unittest.cc | 2 +- .../android/explore_sites/explore_sites_store_unittest.cc | 2 +- .../android/explore_sites/get_catalog_task_unittest.cc | 2 +- .../browser/android/explore_sites/get_images_task_unittest.cc | 2 +- .../android/explore_sites/get_version_task_unittest.cc | 2 +- .../explore_sites/history_statistics_reporter_unittest.cc | 2 +- chrome/browser/android/explore_sites/image_helper_unittest.cc | 2 +- .../android/explore_sites/import_catalog_task_unittest.cc | 2 +- .../explore_sites/increment_shown_count_task_unittest.cc | 2 +- .../android/explore_sites/record_site_click_task_unittest.cc | 2 +- .../android/feed/history/feed_history_helper_unittest.cc | 2 +- chrome/browser/android/webapk/webapk_icon_hasher_unittest.cc | 2 +- chrome/browser/apps/app_service/app_icon_factory_unittest.cc | 2 +- chrome/browser/apps/app_service/web_apps_base_browsertest.cc | 2 +- chrome/browser/autofill/autofill_interactive_uitest.cc | 2 +- chrome/browser/autofill/automated_tests/cache_replayer.cc | 2 +- chrome/browser/banners/app_banner_manager_browsertest.cc | 2 +- .../browser/banners/app_banner_manager_desktop_browsertest.cc | 2 +- .../browser/browsing_data/access_context_audit_browsertest.cc | 2 +- .../browsing_data/access_context_audit_database_unittest.cc | 2 +- .../browsing_data/access_context_audit_service_unittest.cc | 2 +- .../browsing_data/browsing_data_remover_browsertest.cc | 2 +- .../chrome_browsing_data_lifetime_manager_browsertest.cc | 2 +- .../chrome_browsing_data_remover_delegate_unittest.cc | 2 +- .../counters/site_data_counting_helper_unittest.cc | 2 +- chrome/browser/captive_portal/captive_portal_browsertest.cc | 2 +- .../account_manager_policy_controller_browsertest.cc | 2 +- chrome/browser/chromeos/app_mode/app_session_unittest.cc | 2 +- .../chromeos/apps/apk_web_app_installer_browsertest.cc | 2 +- .../app_shortcuts/arc_app_shortcuts_menu_builder_unittest.cc | 2 +- .../arc/app_shortcuts/arc_app_shortcuts_request_unittest.cc | 2 +- ...c_active_directory_enrollment_token_fetcher_browsertest.cc | 2 +- .../browser/chromeos/arc/auth/arc_auth_service_browsertest.cc | 2 +- .../arc/auth/arc_robot_auth_code_fetcher_browsertest.cc | 2 +- .../chromeos/attestation/attestation_ca_client_unittest.cc | 2 +- .../enrollment_certificate_uploader_impl_unittest.cc | 2 +- .../chromeos/borealis/borealis_app_launcher_unittest.cc | 2 +- .../chromeos/borealis/borealis_context_manager_unittest.cc | 2 +- .../time_limits/app_service_wrapper_unittest.cc | 2 +- .../chromebox_for_meetings/service_adaptor_unittest.cc | 2 +- .../browser/chromeos/crosapi/account_manager_ash_unittest.cc | 2 +- .../chromeos/crosapi/test_mojo_connection_manager_unittest.cc | 2 +- chrome/browser/chromeos/crostini/crostini_disk_unittest.cc | 2 +- .../browser/chromeos/crostini/crostini_features_unittest.cc | 2 +- .../browser/chromeos/crostini/crostini_installer_unittest.cc | 2 +- chrome/browser/chromeos/crostini/crostini_manager_unittest.cc | 2 +- .../customization_wallpaper_downloader_browsertest.cc | 2 +- .../cryptohome_key_delegate_service_provider_browsertest.cc | 2 +- chrome/browser/chromeos/display/quirks_browsertest.cc | 2 +- .../chromeos/drive/drive_integration_service_browsertest.cc | 2 +- chrome/browser/chromeos/drive/drivefs_test_support.cc | 2 +- .../extensions/autotest_private/autotest_private_apitest.cc | 2 +- .../quick_unlock_private/quick_unlock_private_api_unittest.cc | 2 +- .../chromeos/file_manager/file_manager_browsertest_base.cc | 2 +- .../browser/chromeos/file_manager/file_manager_test_util.cc | 2 +- .../browser/chromeos/file_manager/file_tasks_browsertest.cc | 2 +- .../chromeos/file_manager/file_tasks_notifier_unittest.cc | 2 +- chrome/browser/chromeos/file_manager/file_watcher_unittest.cc | 2 +- .../chromeos/kerberos/kerberos_credentials_manager_test.cc | 2 +- .../login/challenge_response_auth_keys_loader_browsertest.cc | 2 +- chrome/browser/chromeos/login/error_screen_browsertest.cc | 2 +- chrome/browser/chromeos/login/eula_browsertest.cc | 2 +- .../chromeos/login/existing_user_controller_browsertest.cc | 2 +- .../browser/chromeos/login/login_screen_policy_browsertest.cc | 2 +- chrome/browser/chromeos/login/profile_auth_data_unittest.cc | 2 +- .../chromeos/login/quick_unlock/pin_migration_browsertest.cc | 2 +- chrome/browser/chromeos/login/saml/saml_browsertest.cc | 2 +- chrome/browser/chromeos/login/webview_login_browsertest.cc | 2 +- .../browser/chromeos/login/wizard_controller_browsertest.cc | 2 +- .../chromeos/nearby/nearby_process_manager_impl_unittest.cc | 2 +- chrome/browser/chromeos/plugin_vm/plugin_vm_files_unittest.cc | 2 +- .../chromeos/plugin_vm/plugin_vm_installer_unittest.cc | 2 +- .../chromeos/plugin_vm/plugin_vm_manager_impl_unittest.cc | 2 +- .../policy/minimum_version_policy_handler_unittest.cc | 2 +- .../device_command_get_available_routines_job_unittest.cc | 2 +- .../device_command_get_routine_update_job_unittest.cc | 2 +- .../device_command_remote_powerwash_job_unittest.cc | 2 +- .../device_command_run_routine_job_unittest.cc | 2 +- .../policy/status_collector/app_info_generator_unittest.cc | 2 +- .../chromeos/policy/system_proxy_manager_browsertest.cc | 2 +- .../chromeos/scanning/lorgnette_scanner_manager_unittest.cc | 2 +- .../secure_channel/nearby_connection_broker_impl_unittest.cc | 2 +- .../chromeos/secure_channel/nearby_connector_impl_unittest.cc | 2 +- .../browser/chromeos/smb_client/smb_file_system_unittest.cc | 2 +- .../smb_client/smb_kerberos_credentials_updater_unittest.cc | 2 +- chrome/browser/chromeos/smb_client/smb_service_unittest.cc | 2 +- chrome/browser/chromeos/smb_client/smbfs_share_unittest.cc | 2 +- .../chromeos/ui/update_required_notification_unittest.cc | 2 +- .../web_applications/media_app_integration_browsertest.cc | 2 +- .../testing_wilco_dtc_supportd_bridge_wrapper.cc | 2 +- .../autofill_states_component_installer_unittest.cc | 2 +- .../first_party_sets_component_installer_unittest.cc | 2 +- .../component_updater/floc_component_installer_unittest.cc | 2 +- .../component_updater/games_component_installer_unittest.cc | 2 +- .../component_updater/soda_component_installer_unittest.cc | 2 +- .../soda_en_us_component_installer_unittest.cc | 2 +- .../soda_ja_jp_component_installer_unittest.cc | 2 +- ...rust_token_key_commitments_component_installer_unittest.cc | 2 +- chrome/browser/content_index/content_index_browsertest.cc | 2 +- .../browser/content_index/content_index_provider_unittest.cc | 2 +- .../browser/content_settings/content_settings_browsertest.cc | 2 +- .../data_reduction_proxy/data_reduction_proxy_browsertest.cc | 2 +- .../chromeos/device_oauth2_token_store_chromeos_unittest.cc | 2 +- .../device_oauth2_token_store_desktop_unittest.cc | 2 +- .../android/available_offline_content_provider_unittest.cc | 2 +- chrome/browser/download/download_browsertest.cc | 2 +- .../enterprise/connectors/connectors_manager_unittest.cc | 2 +- .../connectors/content_analysis_delegate_browsertest.cc | 2 +- .../connectors/content_analysis_delegate_unittest.cc | 2 +- .../connectors/content_analysis_dialog_browsertest.cc | 2 +- .../remote_commands/clear_browsing_data_job_unittest.cc | 2 +- .../enterprise/reporting/browser_report_generator_unittest.cc | 2 +- .../browser/enterprise/reporting/report_generator_unittest.cc | 2 +- .../reporting/report_request_queue_generator_unittest.cc | 2 +- .../enterprise/util/android_enterprise_info_unittest.cc | 2 +- .../extensions/api/browsing_data/browsing_data_test.cc | 2 +- .../declarative_net_request_browsertest.cc | 2 +- .../extensions/api/downloads/downloads_api_browsertest.cc | 2 +- chrome/browser/extensions/api/identity/identity_apitest.cc | 2 +- .../extensions/api/management/management_browsertest.cc | 2 +- .../networking_private/networking_private_chromeos_apitest.cc | 2 +- .../api/passwords_private/password_check_delegate_unittest.cc | 2 +- .../passwords_private_delegate_impl_unittest.cc | 2 +- chrome/browser/extensions/api/sessions/sessions_apitest.cc | 2 +- chrome/browser/extensions/api/socket/tcp_socket_unittest.cc | 2 +- chrome/browser/extensions/api/socket/tls_socket_unittest.cc | 2 +- .../browser/extensions/api/web_request/web_request_apitest.cc | 2 +- .../webrtc_audio_private/webrtc_audio_private_browsertest.cc | 2 +- chrome/browser/extensions/browsertest_util.cc | 2 +- .../content_verifier_hash_fetch_behavior_browsertest.cc | 2 +- .../browser/extensions/corb_and_cors_extension_browsertest.cc | 2 +- .../browser/extensions/extension_disabled_ui_browsertest.cc | 2 +- chrome/browser/extensions/extension_nacl_browsertest.cc | 2 +- chrome/browser/extensions/extension_service_unittest.cc | 2 +- chrome/browser/extensions/service_worker_apitest.cc | 2 +- .../browser/extensions/updater/extension_updater_unittest.cc | 2 +- .../browser/extensions/updater/update_service_browsertest.cc | 2 +- .../federated_learning/floc_id_provider_browsertest.cc | 2 +- .../browser/federated_learning/floc_id_provider_unittest.cc | 2 +- .../federated_learning/floc_origin_trial_browsertest.cc | 2 +- .../log_sources/chrome_internal_log_source_unittest.cc | 2 +- chrome/browser/games/games_service_browsertest.cc | 2 +- .../google/google_update_policy_fetcher_win_util_unittest.cc | 2 +- chrome/browser/hid/hid_chooser_context_unittest.cc | 2 +- chrome/browser/history/domain_diversity_reporter_unittest.cc | 2 +- chrome/browser/history/history_browsertest.cc | 2 +- chrome/browser/history/history_tab_helper_unittest.cc | 2 +- chrome/browser/importer/profile_writer_unittest.cc | 2 +- chrome/browser/installable/installable_manager_browsertest.cc | 2 +- chrome/browser/media/feeds/media_feeds_browsertest.cc | 2 +- chrome/browser/media/feeds/media_feeds_converter_unittest.cc | 2 +- chrome/browser/media/feeds/media_feeds_fetcher_unittest.cc | 2 +- chrome/browser/media/feeds/media_feeds_service_unittest.cc | 2 +- chrome/browser/media/history/media_history_browsertest.cc | 2 +- .../media/history/media_history_keyed_service_unittest.cc | 2 +- chrome/browser/media/history/media_history_store_unittest.cc | 2 +- chrome/browser/media/history/media_history_test_utils.cc | 2 +- .../media/kaleidoscope/kaleidoscope_service_unittest.cc | 2 +- .../media/router/providers/cast/app_activity_unittest.cc | 2 +- .../router/providers/cast/cast_activity_manager_unittest.cc | 2 +- .../media/router/providers/cast/cast_activity_test_base.cc | 2 +- .../router/providers/cast/mirroring_activity_unittest.cc | 2 +- chrome/browser/media/webrtc/webrtc_browsertest.cc | 2 +- .../memory/enterprise_memory_limit_evaluator_unittest.cc | 2 +- .../browser/metrics/cros_healthd_metrics_provider_unittest.cc | 2 +- chrome/browser/metrics/perf/metric_collector_unittest.cc | 2 +- chrome/browser/metrics/perf/metric_provider_unittest.cc | 2 +- chrome/browser/metrics/perf/perf_events_collector_unittest.cc | 2 +- .../metrics/perf/profile_provider_chromeos_unittest.cc | 2 +- chrome/browser/metrics/perf/profile_provider_unittest_main.cc | 2 +- .../metrics/perf/windowed_incognito_observer_unittest.cc | 2 +- chrome/browser/metrics/power_metrics_provider_mac_unittest.cc | 2 +- chrome/browser/metrics/thread_watcher_unittest.cc | 2 +- .../chrome_native_file_system_permission_context_unittest.cc | 2 +- ...n_scoped_native_file_system_permission_context_unittest.cc | 2 +- .../nearby_sharing/fast_initiation_manager_unittest.cc | 2 +- .../browser/nearby_sharing/incoming_frames_reader_unittest.cc | 2 +- .../instantmessaging/receive_messages_express_unittest.cc | 2 +- .../instantmessaging/send_message_express_unittest.cc | 2 +- .../nearby_share_local_device_data_manager_impl_unittest.cc | 2 +- .../nearby_connections_manager_impl_unittest.cc | 2 +- .../nearby_sharing/nearby_notification_manager_unittest.cc | 2 +- .../browser/nearby_sharing/nearby_process_manager_unittest.cc | 2 +- .../browser/nearby_sharing/nearby_receive_manager_unittest.cc | 2 +- .../browser/nearby_sharing/nearby_share_settings_unittest.cc | 2 +- .../nearby_sharing/nearby_sharing_service_impl_unittest.cc | 2 +- .../nearby_sharing/paired_key_verification_runner_unittest.cc | 2 +- .../nearby_sharing/webrtc_signaling_messenger_unittest.cc | 2 +- chrome/browser/net/chrome_accept_header_browsertest.cc | 2 +- .../net/chrome_mojo_proxy_resolver_factory_browsertest.cc | 2 +- chrome/browser/net/chrome_network_service_browsertest.cc | 2 +- chrome/browser/net/network_connection_tracker_browsertest.cc | 2 +- .../browser/net/network_context_configuration_browsertest.cc | 2 +- chrome/browser/net/proxy_browsertest.cc | 2 +- chrome/browser/net/proxy_test_utils.cc | 2 +- chrome/browser/net/websocket_browsertest.cc | 2 +- .../no_best_effort_tasks_during_startup_browsertest.cc | 2 +- .../notifications/notification_display_queue_unittest.cc | 2 +- .../notification_display_service_impl_unittest.cc | 2 +- .../notification_platform_bridge_win_interactive_uitest.cc | 2 +- .../android/offline_page_auto_fetcher_service_unittest.cc | 2 +- chrome/browser/offline_pages/offline_page_utils_unittest.cc | 2 +- chrome/browser/offline_pages/visuals_decoder_impl_unittest.cc | 2 +- .../password_check/android/password_check_manager_unittest.cc | 2 +- chrome/browser/pdf/pdf_extension_test.cc | 2 +- .../background_tab_loading_policy_browsertest.cc | 2 +- .../performance_manager/frame_node_impl_browsertest.cc | 2 +- .../performance_manager/graph/page_node_impl_browsertest.cc | 2 +- .../page_load_tracker_decorator_browsertest.cc | 2 +- .../persistence/site_data/site_data_cache_facade_unittest.cc | 2 +- .../tab_properties_decorator_browsertest.cc | 2 +- .../performance_manager/test_support/page_aggregator.cc | 2 +- .../performance_manager/test_support/site_data_utils.cc | 2 +- .../metric_evaluator_helper_win_unittest.cc | 2 +- .../browser/policy/cloud/cloud_policy_manager_browsertest.cc | 2 +- .../policy/cloud/user_policy_signin_service_unittest.cc | 2 +- chrome/browser/policy/extension_policy_browsertest.cc | 2 +- chrome/browser/policy/policy_browsertest.cc | 2 +- chrome/browser/policy/policy_test_google_browsertest.cc | 2 +- chrome/browser/predictors/prefetch_manager_unittest.cc | 2 +- .../prerender_nostate_prefetch_browsertest.cc | 2 +- chrome/browser/prefetch/prefetch_browsertest.cc | 2 +- .../prefetch/prefetch_proxy/prefetch_proxy_test_utils.cc | 2 +- chrome/browser/printing/cloud_print/gcd_api_flow_unittest.cc | 2 +- chrome/browser/printing/cloud_print/privet_http_unittest.cc | 2 +- .../printing/cloud_print/privet_url_loader_unittest.cc | 2 +- chrome/browser/profile_resetter/profile_resetter_unittest.cc | 2 +- chrome/browser/profiles/profile_browsertest.cc | 2 +- chrome/browser/profiles/profile_manager_browsertest.cc | 2 +- chrome/browser/push_messaging/push_messaging_browsertest.cc | 2 +- .../render_view_context_menu_browsertest.cc | 2 +- .../discard_before_unload_helper_browsertest.cc | 2 +- .../resource_coordinator/session_restore_policy_unittest.cc | 2 +- .../tab_lifecycle_unit_source_unittest.cc | 2 +- .../chrome_password_protection_service_unittest.cc | 2 +- .../client_side_detection_service_browsertest.cc | 2 +- .../safe_browsing/client_side_detection_service_unittest.cc | 2 +- .../cloud_content_scanning/binary_fcm_service_unittest.cc | 2 +- .../cloud_content_scanning/file_analysis_request_unittest.cc | 2 +- .../download_protection_service_unittest.cc | 2 +- .../search/background/ntp_background_service_unittest.cc | 2 +- .../one_google_bar/one_google_bar_loader_impl_unittest.cc | 2 +- chrome/browser/search/promos/promo_service_unittest.cc | 2 +- .../search_suggest/search_suggest_loader_impl_unittest.cc | 2 +- .../search/task_module/task_module_service_unittest.cc | 2 +- .../search_engines/template_url_scraper_browsertest.cc | 2 +- .../browser/search_engines/template_url_service_test_util.cc | 2 +- .../browser/search_engines/template_url_service_unittest.cc | 2 +- chrome/browser/services_unittest.cc | 2 +- chrome/browser/sessions/better_session_restore_browsertest.cc | 2 +- chrome/browser/sessions/session_restore_browsertest.cc | 2 +- chrome/browser/sessions/tab_loader_tester.cc | 2 +- chrome/browser/sessions/tab_restore_service_unittest.cc | 2 +- .../browser/sharing/sharing_device_registration_unittest.cc | 2 +- chrome/browser/sharing/sharing_device_source_sync_unittest.cc | 2 +- chrome/browser/sharing/sharing_device_source_unittest.cc | 2 +- .../browser/sharing/sms/sms_fetch_request_handler_unittest.cc | 2 +- chrome/browser/sharing/sms/sms_remote_fetcher_unittest.cc | 2 +- chrome/browser/sharing/webrtc/ice_config_fetcher_unittest.cc | 2 +- .../browser/signin/dice_web_signin_interceptor_browsertest.cc | 2 +- chrome/browser/signin/mirror_browsertest.cc | 2 +- chrome/browser/signin/signin_util_win_browsertest.cc | 2 +- .../browser/spellchecker/spelling_service_client_unittest.cc | 2 +- chrome/browser/ssl/certificate_error_reporter_unittest.cc | 2 +- chrome/browser/ssl/security_state_tab_helper_browsertest.cc | 2 +- chrome/browser/ssl/ssl_browsertest.cc | 2 +- .../supervised_user/supervised_user_url_filter_browsertest.cc | 2 +- chrome/browser/sync/test/integration/cookie_helper.cc | 2 +- chrome/browser/sync/test/integration/enable_disable_test.cc | 2 +- .../sync/test/integration/profile_sync_service_harness.cc | 2 +- .../single_client_history_delete_directives_sync_test.cc | 2 +- .../test/integration/single_client_user_events_sync_test.cc | 2 +- chrome/browser/sync/test/integration/sync_errors_test.cc | 2 +- .../browser/sync/test/integration/sync_test_utils_android.cc | 2 +- .../test/integration/two_client_web_apps_bmo_sync_test.cc | 2 +- .../sync/test/integration/two_client_web_apps_sync_test.cc | 2 +- .../tab_contents/form_interaction_tab_helper_unittest.cc | 2 +- chrome/browser/tab_contents/view_source_browsertest.cc | 2 +- .../translate/language_detection_service_browsertest.cc | 2 +- chrome/browser/ui/app_list/app_context_menu_unittest.cc | 2 +- .../browser/ui/app_list/app_list_client_impl_browsertest.cc | 2 +- chrome/browser/ui/app_list/arc/arc_app_unittest.cc | 2 +- .../browser/ui/app_list/search/app_list_search_browsertest.cc | 2 +- chrome/browser/ui/ash/assistant/assistant_browsertest.cc | 2 +- .../browser/ui/ash/assistant/assistant_timers_browsertest.cc | 2 +- chrome/browser/ui/ash/clipboard_history_browsertest.cc | 2 +- .../holding_space/holding_space_client_impl_browsertest.cc | 2 +- .../holding_space/holding_space_keyed_service_browsertest.cc | 2 +- .../ash/holding_space/holding_space_keyed_service_unittest.cc | 2 +- .../holding_space_thumbnail_loader_browsertest.cc | 2 +- .../ui/ash/holding_space/holding_space_ui_browsertest.cc | 2 +- chrome/browser/ui/ash/ime_controller_client_unittest.cc | 2 +- .../browser/ui/ash/in_session_auth_dialog_client_unittest.cc | 2 +- .../app_service/app_service_shelf_context_menu_browsertest.cc | 2 +- .../ui/ash/launcher/chrome_launcher_controller_browsertest.cc | 2 +- chrome/browser/ui/ash/launcher/shelf_context_menu_unittest.cc | 2 +- chrome/browser/ui/bookmarks/bookmark_browsertest.cc | 2 +- .../tab_contents/web_contents_view_mac_interactive_uitest.mm | 2 +- chrome/browser/ui/extensions/hosted_app_browsertest.cc | 2 +- chrome/browser/ui/hid/hid_chooser_controller_unittest.cc | 2 +- .../passwords/settings/password_manager_presenter_unittest.cc | 2 +- .../browser/ui/serial/serial_chooser_controller_unittest.cc | 2 +- .../browser/ui/signin_reauth_view_controller_browsertest.cc | 2 +- .../browser/ui/signin_view_controller_interactive_uitest.cc | 2 +- .../credential_provider_signin_info_fetcher_win_unittest.cc | 2 +- .../chrome_web_contents_view_handle_drop_unittest.cc | 2 +- .../browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc | 2 +- .../reopen_tab_in_product_help_trigger_unittest.cc | 2 +- .../ui/views/crypto_module_password_dialog_view_unittest.cc | 2 +- .../desktop_capture/desktop_media_picker_views_browsertest.cc | 2 +- .../download/download_in_progress_dialog_view_unittest.cc | 2 +- chrome/browser/ui/views/hats/hats_browsertest.cc | 2 +- .../native_file_system/native_file_system_browsertest.cc | 2 +- .../native_file_system_permission_view_browsertest.cc | 2 +- ...ile_system_restricted_directory_dialog_view_browsertest.cc | 2 +- .../ui/views/page_action/pwa_install_view_browsertest.cc | 2 +- .../ui/views/profiles/profile_picker_view_browsertest.cc | 2 +- chrome/browser/ui/views/sharing/click_to_call_browsertest.cc | 2 +- chrome/browser/ui/views/sharing/sharing_browsertest.cc | 2 +- .../browser/ui/views/sharing/sharing_dialog_view_unittest.cc | 2 +- .../ui/views/tabs/tab_drag_controller_interactive_uitest.cc | 2 +- .../user_education/feature_promo_controller_views_unittest.cc | 2 +- .../web_apps/pwa_confirmation_bubble_view_browsertest.cc | 2 +- .../views/web_apps/web_app_confirmation_view_browsertest.cc | 2 +- .../ui/views/web_apps/web_app_uninstall_dialog_browsertest.cc | 2 +- .../ui/web_applications/app_browser_controller_browsertest.cc | 2 +- .../ui/web_applications/test/web_app_browsertest_util.cc | 2 +- .../ui/web_applications/web_app_engagement_browsertest.cc | 2 +- .../ui/web_applications/web_app_file_handling_browsertest.cc | 2 +- .../web_applications/web_app_profile_deletion_browsertest.cc | 2 +- .../web_applications/web_app_ui_manager_impl_browsertest.cc | 2 +- .../ui/web_applications/web_app_uninstall_browsertest.cc | 2 +- .../browser/ui/webauthn/authenticator_dialog_browsertest.cc | 2 +- .../ui/webui/chromeos/edu_account_login_handler_unittest.cc | 2 +- .../chromeos/smb_shares/smb_credentials_dialog_browsertest.cc | 2 +- .../chrome_customize_themes_handler_unittest.cc | 2 +- chrome/browser/ui/webui/discards/graph_dump_impl_unittest.cc | 2 +- chrome/browser/ui/webui/favicon_source_unittest.cc | 2 +- .../webui/local_discovery/local_discovery_ui_browsertest.cc | 2 +- .../ui/webui/read_later/read_later_page_handler_unittest.cc | 2 +- .../settings/chromeos/account_manager_handler_browsertest.cc | 2 +- chrome/browser/ui/webui/signin/login_ui_test_utils.cc | 2 +- .../ui/webui/tab_search/tab_search_page_handler_unittest.cc | 2 +- chrome/browser/usb/web_usb_service_impl_unittest.cc | 2 +- .../video_tutorials/internal/tutorial_fetcher_unittest.cc | 2 +- chrome/browser/visibility_timer_tab_helper_unittest.cc | 2 +- chrome/browser/vr/webxr_vr_isolated_device_service_test.cc | 2 +- .../web_applications/components/install_finalizer_unittest.cc | 2 +- .../components/pending_app_manager_unittest.cc | 2 +- .../components/web_app_data_retriever_unittest.cc | 2 +- .../web_app_file_handler_registration_linux_browsertest.cc | 2 +- .../web_app_file_handler_registration_linux_unittest.cc | 2 +- .../web_app_handler_registration_utils_win_unittest.cc | 2 +- .../components/web_app_url_loader_browsertest.cc | 2 +- .../components/web_app_url_loader_unittest.cc | 2 +- .../extensions/bookmark_app_install_finalizer_unittest.cc | 2 +- .../extensions/pending_app_install_task_unittest.cc | 2 +- .../web_applications/external_web_app_manager_browsertest.cc | 2 +- .../web_applications/external_web_app_manager_unittest.cc | 2 +- .../external_web_app_migration_browsertest.cc | 2 +- .../web_applications/manifest_update_manager_browsertest.cc | 2 +- .../web_applications/pending_app_manager_impl_browsertest.cc | 2 +- .../web_applications/pending_app_manager_impl_unittest.cc | 2 +- .../web_applications/system_web_app_manager_unittest.cc | 2 +- .../browser/web_applications/test/test_install_finalizer.cc | 2 +- .../browser/web_applications/test/test_pending_app_manager.cc | 2 +- .../web_applications/test/test_system_web_app_installation.cc | 2 +- .../test/test_system_web_app_url_data_source.cc | 2 +- .../web_applications/test/test_web_app_database_factory.cc | 2 +- .../web_applications/test/test_web_app_registry_controller.cc | 2 +- .../browser/web_applications/test/test_web_app_ui_manager.cc | 2 +- .../browser/web_applications/test/web_app_install_observer.cc | 2 +- .../web_applications/test/web_app_install_test_utils.cc | 2 +- .../web_applications/test/web_app_registration_waiter.cc | 2 +- chrome/browser/web_applications/web_app_database_unittest.cc | 2 +- .../web_applications/web_app_icon_manager_browsertest.cc | 2 +- .../browser/web_applications/web_app_icon_manager_unittest.cc | 2 +- .../web_applications/web_app_install_manager_unittest.cc | 2 +- .../browser/web_applications/web_app_install_task_unittest.cc | 2 +- .../web_applications/web_app_migration_manager_browsertest.cc | 2 +- ...eb_app_migration_user_display_mode_clean_up_browsertest.cc | 2 +- chrome/browser/web_applications/web_app_registrar_unittest.cc | 2 +- .../browser/web_applications/web_app_sync_bridge_unittest.cc | 2 +- chrome/browser/webauth_interactive_uitest.cc | 2 +- .../webshare/chromeos/sharesheet_client_browsertest.cc | 2 +- chrome/browser/webshare/share_service_unittest.cc | 2 +- .../webshare/win/fake_data_transfer_manager_unittest.cc | 2 +- chrome/browser/webshare/win/fake_random_access_stream.cc | 2 +- chrome/browser/webshare/win/fake_storage_file_statics.cc | 2 +- chrome/browser/webshare/win/share_operation_unittest.cc | 2 +- .../win/conflicts/incompatible_applications_browsertest.cc | 2 +- .../browser/win/conflicts/third_party_blocking_browsertest.cc | 2 +- chrome/common/profiler/thread_profiler_unittest.cc | 2 +- chrome/installer/util/callback_work_item_unittest.cc | 2 +- chrome/renderer/chromeos_delayed_callback_group_unittest.cc | 2 +- chrome/renderer/net/net_error_helper_core_unittest.cc | 2 +- chrome/renderer/v8_unwinder_unittest.cc | 2 +- chrome/service/cloud_print/printer_job_handler_unittest.cc | 2 +- .../machine_learning/decision_tree_predictor_unittest.cc | 2 +- .../machine_learning/machine_learning_service_unittest.cc | 2 +- .../media_gallery_util/media_parser_android_unittest.cc | 2 +- .../sharing/nearby/decoder/nearby_decoder_unittest.cc | 2 +- chrome/services/sharing/nearby/nearby_connections_unittest.cc | 2 +- .../sharing/nearby/platform/atomic_boolean_unittest.cc | 2 +- .../sharing/nearby/platform/atomic_uint32_unittest.cc | 2 +- .../services/sharing/nearby/platform/ble_medium_unittest.cc | 2 +- .../sharing/nearby/platform/bluetooth_adapter_unittest.cc | 2 +- .../nearby/platform/bluetooth_classic_medium_unittest.cc | 2 +- .../nearby/platform/bluetooth_server_socket_unittest.cc | 2 +- .../sharing/nearby/platform/bluetooth_socket_unittest.cc | 2 +- .../sharing/nearby/platform/condition_variable_unittest.cc | 2 +- .../sharing/nearby/platform/count_down_latch_unittest.cc | 2 +- chrome/services/sharing/nearby/platform/mutex_unittest.cc | 2 +- .../sharing/nearby/platform/recursive_mutex_unittest.cc | 2 +- chrome/services/sharing/sharing_impl_unittest.cc | 2 +- chrome/test/base/search_test_utils.cc | 2 +- chrome/test/base/ui_test_utils.cc | 2 +- chrome/updater/mac/update_service_proxy_test.mm | 2 +- chrome/updater/prefs_unittest.cc | 2 +- chromecast/browser/cast_web_contents_browsertest.cc | 2 +- .../components/account_manager/account_manager_unittest.cc | 2 +- .../diagnostics_ui/backend/system_data_provider_unittest.cc | 2 +- .../backend/system_routine_controller_unittest.cc | 2 +- chromeos/components/drivefs/drivefs_auth_unittest.cc | 2 +- chromeos/components/drivefs/drivefs_host_unittest.cc | 2 +- chromeos/components/drivefs/drivefs_search_unittest.cc | 2 +- chromeos/components/drivefs/drivefs_session_unittest.cc | 2 +- .../mojo_bootstrap/pending_connection_manager_unittest.cc | 2 +- chromeos/components/smbfs/smbfs_host_unittest.cc | 2 +- chromeos/components/smbfs/smbfs_mounter_unittest.cc | 2 +- .../sync_wifi/wifi_configuration_bridge_unittest.cc | 2 +- .../telemetry_extension_ui/probe_service_unittest.cc | 2 +- .../chromebox_for_meetings/cfm_hotline_client_unittest.cc | 2 +- .../lorgnette_manager/lorgnette_manager_client_unittest.cc | 2 +- chromeos/dbus/power/power_manager_client_unittest.cc | 2 +- chromeos/disks/mount_point_unittest.cc | 2 +- chromeos/memory/userspace_swap/userfaultfd_unittest.cc | 2 +- chromeos/printing/ppd_provider_unittest.cc | 2 +- chromeos/printing/ppd_provider_v3_unittest.cc | 2 +- chromeos/printing/printer_config_cache_unittest.cc | 2 +- .../assistant/assistant_manager_service_impl_unittest.cc | 2 +- .../public/cpp/service_connection_unittest.cc | 2 +- .../cros_healthd/public/cpp/service_connection_unittest.cc | 2 +- .../synced_bluetooth_address_tracker_impl_unittest.cc | 2 +- chromeos/services/ime/decoder/system_engine_unittest.cc | 2 +- chromeos/services/secure_channel/ble_scanner_impl_unittest.cc | 2 +- .../arc/enterprise/arc_data_snapshotd_bridge_unittest.cc | 2 +- .../arc/enterprise/arc_data_snapshotd_manager_unittest.cc | 2 +- components/arc/ime/key_event_result_receiver_unittest.cc | 2 +- components/arc/session/arc_vm_client_adapter_unittest.cc | 2 +- .../core/browser/payments/payments_client_unittest.cc | 2 +- .../core/browser/webdata/autocomplete_sync_bridge_unittest.cc | 2 +- .../browser/webdata/autofill_profile_sync_bridge_unittest.cc | 2 +- .../webdata/autofill_wallet_metadata_sync_bridge_unittest.cc | 2 +- .../webdata/autofill_wallet_offer_sync_bridge_unittest.cc | 2 +- .../browser/webdata/autofill_wallet_sync_bridge_unittest.cc | 2 +- .../browser/actions/action_delegate_util_unittest.cc | 2 +- .../browser/actions/configure_bottom_sheet_action_unittest.cc | 2 +- .../browser/actions/prompt_action_unittest.cc | 2 +- .../browser/actions/wait_for_document_action_unittest.cc | 2 +- components/autofill_assistant/browser/controller_unittest.cc | 2 +- .../browser/service/lite_service_unittest.cc | 2 +- .../trigger_scripts/dynamic_trigger_conditions_unittest.cc | 2 +- .../browser/web/web_controller_browsertest.cc | 2 +- .../android/popup_blocked_infobar_delegate_unittest.cc | 2 +- components/browsing_data/content/appcache_helper_unittest.cc | 2 +- components/browsing_data/content/cookie_helper_unittest.cc | 2 +- .../browsing_data/content/database_helper_browsertest.cc | 2 +- .../browsing_data/content/indexed_db_helper_unittest.cc | 2 +- .../browsing_data/core/history_notice_utils_unittest.cc | 2 +- components/cast_channel/cast_socket_unittest.cc | 2 +- .../data_reduction_proxy_config_service_client_unittest.cc | 2 +- .../background_service/in_memory_download_unittest.cc | 2 +- .../content/browser/net_error_auto_reloader_browsertest.cc | 2 +- components/favicon/content/content_favicon_driver_unittest.cc | 2 +- .../floc_sorting_lsh_clusters_service_unittest.cc | 2 +- components/feed/core/feed_networking_host_unittest.cc | 2 +- components/feed/core/v2/feed_network_impl_unittest.cc | 2 +- components/feed/core/v2/feed_store_unittest.cc | 2 +- components/feed/core/v2/feed_stream_unittest.cc | 2 +- components/feed/core/v2/image_fetcher_unittest.cc | 2 +- components/feedback/feedback_uploader_dispatch_unittest.cc | 2 +- components/games/core/catalog_store_unittest.cc | 2 +- components/games/core/games_service_impl_unittest.cc | 2 +- components/games/core/highlighted_games_store_unittest.cc | 2 +- components/gwp_asan/client/guarded_page_allocator_unittest.cc | 2 +- .../in_process/heap_profiler_controller_unittest.cc | 2 +- components/heap_profiling/multi_process/test_driver.cc | 2 +- components/history/core/browser/history_querying_unittest.cc | 2 +- components/history/core/browser/history_service_unittest.cc | 2 +- components/image_fetcher/core/image_data_fetcher_unittest.cc | 2 +- components/image_fetcher/core/image_fetcher_impl_unittest.cc | 2 +- .../impl/per_user_topic_subscription_request_unittest.cc | 2 +- components/metrics/call_stack_profile_builder_unittest.cc | 2 +- components/metrics/net/net_metrics_log_uploader_unittest.cc | 2 +- components/net_log/net_log_proxy_source_unittest.cc | 2 +- .../core/offline_content_aggregator_unittest.cc | 2 +- .../core/background/request_coordinator_unittest.cc | 2 +- .../core/downloads/download_ui_adapter_unittest.cc | 2 +- .../offline_pages/core/model/cleanup_visuals_task_unittest.cc | 2 +- .../offline_pages/core/model/get_visuals_task_unittest.cc | 2 +- .../core/model/offline_page_model_taskified_unittest.cc | 2 +- .../offline_pages/core/model/store_visuals_task_unittest.cc | 2 +- .../core/model/visuals_availability_task_unittest.cc | 2 +- .../core/offline_page_metadata_store_test_util.cc | 2 +- .../core/offline_page_metadata_store_unittest.cc | 2 +- .../core/prefetch/prefetch_dispatcher_impl_unittest.cc | 2 +- .../offline_pages/core/prefetch/prefetch_request_test_base.cc | 2 +- .../core/prefetch/store/prefetch_store_test_util.cc | 2 +- .../offline_pages/core/prefetch/test_download_service.cc | 2 +- .../omnibox/browser/document_suggestions_service_unittest.cc | 2 +- components/omnibox/browser/history_url_provider_unittest.cc | 2 +- .../omnibox/browser/remote_suggestions_service_unittest.cc | 2 +- .../android_affiliation/affiliation_fetcher_unittest.cc | 2 +- .../generation/password_requirements_spec_fetcher_unittest.cc | 2 +- .../core/browser/http_credentials_cleaner_unittest.cc | 2 +- .../core/browser/password_requirements_service_unittest.cc | 2 +- .../core/browser/sync/password_sync_bridge_unittest.cc | 2 +- .../decorators/decorators_utils_unittest.cc | 2 +- .../decorators/site_data_recorder_unittest.cc | 2 +- .../graph/policies/process_priority_policy_unittest.cc | 2 +- .../policies/tab_loading_frame_navigation_policy_unittest.cc | 2 +- .../performance_manager/graph/process_node_impl_unittest.cc | 2 +- .../tab_loading_frame_navigation_scheduler_browsertest.cc | 2 +- .../tab_loading_frame_navigation_scheduler_unittest.cc | 2 +- .../performance_manager/performance_manager_browsertest.cc | 2 +- .../performance_manager/performance_manager_impl_unittest.cc | 2 +- .../performance_manager_tab_helper_unittest.cc | 2 +- .../performance_manager/performance_manager_unittest.cc | 2 +- .../persistence/site_data/leveldb_site_data_store_unittest.cc | 2 +- .../persistence/site_data/site_data_cache_factory_unittest.cc | 2 +- .../persistence/site_data/site_data_impl_unittest.cc | 2 +- .../persistence/site_data/site_data_reader_unittest.cc | 2 +- .../render_process_host_proxy_browsertest.cc | 2 +- .../performance_manager/test_support/decorators_utils.h | 2 +- .../test_support/performance_manager_browsertest_harness.h | 2 +- .../v8_memory/v8_detailed_memory_unittest.cc | 2 +- .../performance_manager/v8_memory/v8_memory_test_helpers.cc | 2 +- .../v8_memory/web_memory_aggregator_unittest.cc | 2 +- components/performance_manager/web_contents_proxy_unittest.cc | 2 +- components/performance_manager/worker_watcher_unittest.cc | 2 +- .../policy/core/common/cloud/cloud_policy_client_unittest.cc | 2 +- components/prefs/pref_test_utils.cc | 2 +- components/query_tiles/internal/tile_fetcher_unittest.cc | 2 +- components/query_tiles/internal/tile_service_impl_unittest.cc | 2 +- .../password_protection_navigation_throttle_unittest.cc | 2 +- .../content/renderer/phishing_classifier/scorer_unittest.cc | 2 +- components/safe_browsing/core/db/database_manager_unittest.cc | 2 +- components/schema_org/extractor_fuzzer.cc | 2 +- components/schema_org/extractor_unittest.cc | 2 +- components/services/filesystem/directory_test_helper.cc | 2 +- .../storage/dom_storage/dom_storage_database_unittest.cc | 2 +- .../storage/dom_storage/local_storage_impl_unittest.cc | 2 +- .../storage/dom_storage/session_storage_area_impl_unittest.cc | 2 +- .../storage/dom_storage/session_storage_data_map_unittest.cc | 2 +- .../storage/dom_storage/session_storage_impl_unittest.cc | 2 +- .../storage/dom_storage/session_storage_metadata_unittest.cc | 2 +- .../dom_storage/session_storage_namespace_impl_unittest.cc | 2 +- .../storage/dom_storage/storage_area_impl_unittest.cc | 2 +- .../services/storage/dom_storage/storage_area_test_util.cc | 2 +- .../indexed_db/scopes/disjoint_range_lock_manager_unittest.cc | 2 +- .../storage/indexed_db/scopes/leveldb_scope_unittest.cc | 2 +- .../storage/indexed_db/scopes/leveldb_scopes_test_utils.cc | 2 +- .../storage/indexed_db/scopes/leveldb_scopes_unittest.cc | 2 +- .../storage/indexed_db/scopes/scopes_lock_manager_unittest.cc | 2 +- .../transactional_leveldb_transaction_unittest.cc | 2 +- components/sessions/core/command_storage_backend_unittest.cc | 2 +- .../sessions/core/snapshotting_session_backend_unittest.cc | 2 +- .../ios/browser/account_consistency_service_unittest.mm | 2 +- .../identity_manager/accounts_cookie_mutator_unittest.cc | 2 +- .../public/identity_manager/identity_manager_unittest.cc | 2 +- components/sync/driver/profile_sync_service_unittest.cc | 2 +- components/sync/driver/sync_stopped_reporter_unittest.cc | 2 +- components/sync/engine/net/http_bridge_unittest.cc | 2 +- components/sync/model_impl/model_type_store_impl_unittest.cc | 2 +- .../sync/model_impl/syncable_service_based_bridge_unittest.cc | 2 +- .../standalone_trusted_vault_backend_unittest.cc | 2 +- .../trusted_vault_access_token_fetcher_frontend_unittest.cc | 2 +- .../sync_bookmarks/bookmark_model_type_processor_unittest.cc | 2 +- .../sync_device_info/device_info_sync_bridge_unittest.cc | 2 +- components/sync_sessions/session_sync_bridge_unittest.cc | 2 +- .../core/browser/translate_language_list_unittest.cc | 2 +- .../translate/core/browser/translate_script_unittest.cc | 2 +- components/update_client/crx_downloader_unittest.cc | 2 +- components/update_client/net/url_loader_post_interceptor.cc | 2 +- components/update_client/update_checker_unittest.cc | 2 +- components/variations/service/variations_service_unittest.cc | 2 +- components/viz/service/display/display_unittest.cc | 2 +- .../skia_output_device_buffer_queue_unittest.cc | 2 +- .../display_embedder/software_output_surface_unittest.cc | 2 +- components/web_package/web_bundle_parser_factory_unittest.cc | 2 +- components/web_package/web_bundle_parser_unittest.cc | 2 +- content/browser/accessibility/hit_testing_browsertest.cc | 2 +- content/browser/appcache/appcache_browsertest.cc | 2 +- content/browser/appcache/appcache_response_unittest.cc | 2 +- content/browser/appcache/appcache_storage_impl_unittest.cc | 2 +- content/browser/back_forward_cache_browsertest.cc | 2 +- .../background_sync/background_sync_launcher_unittest.cc | 2 +- content/browser/blob_storage/blob_storage_browsertest.cc | 2 +- .../browser/bluetooth/web_bluetooth_service_impl_unittest.cc | 2 +- .../browsing_data/browsing_data_remover_impl_browsertest.cc | 2 +- content/browser/browsing_data/browsing_data_test_utils.cc | 2 +- .../browsing_data/clear_site_data_handler_browsertest.cc | 2 +- .../browsing_data/same_site_data_remover_impl_unittest.cc | 2 +- content/browser/cache_storage/cache_storage_cache_unittest.cc | 2 +- .../browser/cache_storage/cache_storage_manager_unittest.cc | 2 +- content/browser/child_process_security_policy_unittest.cc | 2 +- content/browser/content_index/content_index_browsertest.cc | 2 +- .../browser/content_index/content_index_database_unittest.cc | 2 +- .../content_index/content_index_service_impl_unittest.cc | 2 +- .../browser/conversions/conversion_manager_impl_unittest.cc | 2 +- .../browser/conversions/conversion_reporter_impl_unittest.cc | 2 +- content/browser/conversions/conversion_test_utils.cc | 2 +- .../conversions/conversions_origin_trial_browsertest.cc | 2 +- content/browser/cookie_store/cookie_store_manager_unittest.cc | 2 +- content/browser/cross_origin_opener_policy_browsertest.cc | 2 +- .../protocol/devtools_network_resource_loader_browsertest.cc | 2 +- content/browser/direct_sockets/direct_sockets_browsertest.cc | 2 +- content/browser/dom_storage/dom_storage_browsertest.cc | 2 +- content/browser/download/download_browsertest.cc | 2 +- .../file_system/file_system_url_loader_factory_browsertest.cc | 2 +- .../file_system_access/file_system_chooser_unittest.cc | 2 +- .../native_file_system_file_handle_impl_unittest.cc | 2 +- .../native_file_system_file_writer_impl_unittest.cc | 2 +- .../native_file_system_handle_base_unittest.cc | 2 +- .../native_file_system_manager_impl_unittest.cc | 2 +- .../font_access/font_access_manager_impl_browsertest.cc | 2 +- .../browser/font_access/font_access_manager_impl_unittest.cc | 2 +- content/browser/hid/hid_service_unittest.cc | 2 +- content/browser/idle/idle_manager_unittest.cc | 2 +- .../browser/indexed_db/indexed_db_backing_store_unittest.cc | 2 +- content/browser/indexed_db/indexed_db_browsertest.cc | 2 +- content/browser/indexed_db/indexed_db_database_unittest.cc | 2 +- .../browser/indexed_db/indexed_db_dispatcher_host_unittest.cc | 2 +- content/browser/indexed_db/indexed_db_factory_unittest.cc | 2 +- .../browser/indexed_db/indexed_db_quota_client_unittest.cc | 2 +- content/browser/indexed_db/indexed_db_transaction_unittest.cc | 2 +- content/browser/indexed_db/indexed_db_unittest.cc | 2 +- content/browser/isolated_origin_browsertest.cc | 2 +- content/browser/launch_as_mojo_client_browsertest.cc | 2 +- content/browser/loader/loader_browsertest.cc | 2 +- content/browser/loader/quic_transport_browsertest.cc | 2 +- content/browser/mojo_sandbox_browsertest.cc | 2 +- content/browser/native_io/native_io_context_unittest.cc | 2 +- content/browser/navigation_browsertest.cc | 2 +- content/browser/navigation_mhtml_browsertest.cc | 2 +- content/browser/net/accept_header_browsertest.cc | 2 +- content/browser/network_service_browsertest.cc | 2 +- content/browser/network_service_restart_browsertest.cc | 2 +- .../browser/notifications/notification_database_unittest.cc | 2 +- .../platform_notification_context_trigger_unittest.cc | 2 +- .../notifications/platform_notification_context_unittest.cc | 2 +- content/browser/origin_trials/origin_trials_browsertest.cc | 2 +- .../picture_in_picture_service_impl_unittest.cc | 2 +- content/browser/portal/portal_browsertest.cc | 2 +- content/browser/renderer_host/clipboard_host_impl_unittest.cc | 2 +- .../dwrite_font_lookup_table_builder_win_unittest.cc | 2 +- .../browser/renderer_host/input/input_event_browsertest.cc | 2 +- .../browser/renderer_host/input/touch_action_browsertest.cc | 2 +- .../media/service_video_capture_provider_unittest.cc | 2 +- .../renderer_host/media/video_capture_controller_unittest.cc | 2 +- .../renderer_host/media/video_capture_manager_unittest.cc | 2 +- .../renderer_host/navigation_controller_impl_browsertest.cc | 2 +- .../renderer_host/navigation_controller_impl_unittest.cc | 2 +- .../render_document_host_user_data_browsertest.cc | 2 +- .../renderer_host/render_frame_host_impl_browsertest.cc | 2 +- .../renderer_host/render_frame_host_manager_browsertest.cc | 2 +- .../renderer_host/render_frame_message_filter_browsertest.cc | 2 +- .../browser/renderer_host/render_widget_host_browsertest.cc | 2 +- .../renderer_host/render_widget_host_view_aura_unittest.cc | 2 +- .../render_widget_host_view_child_frame_browsertest.cc | 2 +- .../browser/renderer_host/web_database_host_impl_unittest.cc | 2 +- content/browser/resolve_proxy_helper_unittest.cc | 2 +- content/browser/scheduler/browser_task_executor_unittest.cc | 2 +- content/browser/scheduler/browser_task_queues_unittest.cc | 2 +- .../scheduler/responsiveness/jank_monitor_impl_unittest.cc | 2 +- .../scheduler/responsiveness/metric_source_unittest.cc | 2 +- content/browser/serial/serial_unittest.cc | 2 +- content/browser/service_process_host_browsertest.cc | 2 +- .../browser/service_worker/service_worker_auth_browsertest.cc | 2 +- content/browser/service_worker/service_worker_browsertest.cc | 2 +- .../service_worker/service_worker_context_core_unittest.cc | 2 +- .../service_worker/service_worker_context_wrapper_unittest.cc | 2 +- .../service_worker_controllee_request_handler_unittest.cc | 2 +- .../service_worker/service_worker_disk_cache_unittest.cc | 2 +- content/browser/service_worker/service_worker_job_unittest.cc | 2 +- .../service_worker/service_worker_object_host_unittest.cc | 2 +- .../service_worker_offline_capability_check_browsertest.cc | 2 +- .../service_worker/service_worker_process_browsertest.cc | 2 +- .../service_worker/service_worker_registration_unittest.cc | 2 +- .../service_worker/service_worker_registry_unittest.cc | 2 +- .../service_worker_single_script_update_checker_unittest.cc | 2 +- .../service_worker_storage_control_impl_unittest.cc | 2 +- .../browser/service_worker/service_worker_storage_unittest.cc | 2 +- content/browser/service_worker/service_worker_test_utils.cc | 2 +- .../service_worker/service_worker_version_browsertest.cc | 2 +- .../browser/service_worker/service_worker_version_unittest.cc | 2 +- content/browser/site_per_process_browsertest.cc | 2 +- content/browser/site_per_process_hit_test_browsertest.cc | 2 +- content/browser/sms/sms_browsertest.cc | 2 +- content/browser/sms/user_consent_handler_unittest.cc | 2 +- content/browser/sms/webotp_service_unittest.cc | 2 +- content/browser/storage_partition_impl_browsertest.cc | 2 +- content/browser/storage_partition_impl_unittest.cc | 2 +- content/browser/storage_service_restart_browsertest.cc | 2 +- content/browser/storage_service_sandbox_browsertest.cc | 2 +- content/browser/web_contents/web_contents_impl_browsertest.cc | 2 +- content/browser/web_package/mock_web_bundle_reader_factory.cc | 2 +- .../web_package/save_page_as_web_bundle_browsertest.cc | 2 +- .../signed_exchange_request_handler_browsertest.cc | 2 +- content/browser/web_package/web_bundle_browsertest.cc | 2 +- content/browser/webauth/authenticator_impl_unittest.cc | 2 +- content/browser/webauth/webauth_browsertest.cc | 2 +- content/browser/webui/web_ui_browsertest.cc | 2 +- content/browser/worker_host/worker_browsertest.cc | 2 +- content/browser/worker_network_isolation_key_browsertest.cc | 2 +- .../service_manager_connection_impl_unittest.cc | 2 +- content/public/test/browser_task_environment_unittest.cc | 2 +- content/public/test/browser_test_base.cc | 2 +- content/public/test/browser_test_utils.cc | 2 +- content/public/test/test_utils_unittest.cc | 2 +- content/public/test/url_loader_interceptor.cc | 2 +- content/renderer/categorized_worker_pool_unittest.cc | 2 +- content/renderer/dom_serializer_browsertest.cc | 2 +- content/renderer/render_frame_impl_browsertest.cc | 2 +- .../render_thread_impl_discardable_memory_browsertest.cc | 2 +- content/renderer/render_view_browsertest.cc | 2 +- content/test/top_frame_population_browsertest.cc | 2 +- content/test/trust_token_browsertest.cc | 2 +- content/test/trust_token_origin_trial_browsertest.cc | 2 +- content/test/trust_token_parameters_browsertest.cc | 2 +- content/test/url_loader_interceptor_test.cc | 2 +- device/bluetooth/adapter_unittest.cc | 2 +- device/bluetooth/bluetooth_adapter_mac_unittest.mm | 2 +- device/bluetooth/bluetooth_adapter_unittest.cc | 2 +- device/bluetooth/bluetooth_adapter_win_unittest.cc | 2 +- device/bluetooth/bluetooth_device_unittest.cc | 2 +- ...bluetooth_low_energy_advertisement_manager_mac_unittest.mm | 2 +- .../bluetooth_remote_gatt_characteristic_unittest.cc | 2 +- .../bluez/bluetooth_adapter_profile_bluez_unittest.cc | 2 +- .../bluetooth/bluez/bluetooth_advertisement_bluez_unittest.cc | 2 +- device/bluetooth/bluez/bluetooth_bluez_unittest.cc | 2 +- device/bluetooth/bluez/bluetooth_gatt_bluez_unittest.cc | 2 +- device/bluetooth/bluez/bluetooth_socket_bluez_unittest.cc | 2 +- device/bluetooth/test/bluetooth_test.cc | 2 +- device/bluetooth/test/bluetooth_test_win.cc | 2 +- device/bluetooth/test/fake_bluetooth_le_device_winrt.cc | 2 +- .../test/fake_device_information_custom_pairing_winrt.cc | 2 +- device/bluetooth/test/fake_gatt_session_winrt.cc | 2 +- device/bluetooth/test/fake_radio_winrt.cc | 2 +- device/fido/fake_fido_discovery_unittest.cc | 2 +- device/fido/test_callback_receiver_unittest.cc | 2 +- device/fido/virtual_ctap2_device_unittest.cc | 2 +- device/fido/virtual_u2f_device_unittest.cc | 2 +- docs/callback.md | 2 +- extensions/browser/api/socket/mojo_data_pump_unittest.cc | 2 +- extensions/browser/content_verify_job_unittest.cc | 2 +- extensions/renderer/bindings/api_event_handler_unittest.cc | 2 +- .../renderer/native_extension_bindings_system_unittest.cc | 2 +- .../browser/shell_desktop_controller_aura_browsertest.cc | 2 +- fuchsia/base/legacymetrics_client_unittest.cc | 2 +- fuchsia/engine/browser/cookie_manager_impl_unittest.cc | 2 +- fuchsia/engine/browser/fake_semantic_tree.cc | 2 +- fuchsia/engine/browser/media_player_impl_unittest.cc | 2 +- fuchsia/engine/context_provider_impl_unittest.cc | 2 +- fuchsia/engine/test_debug_listener.cc | 2 +- fuchsia/engine/web_engine_integration_logging_test.cc | 2 +- fuchsia/runners/cast/api_bindings_client_browsertest.cc | 2 +- fuchsia/runners/cast/cast_runner_integration_test.cc | 2 +- google_apis/gaia/gaia_auth_fetcher_unittest.cc | 2 +- google_apis/gcm/base/socket_stream_unittest.cc | 2 +- google_apis/gcm/engine/connection_handler_impl_unittest.cc | 2 +- gpu/ipc/host/shader_disk_cache_unittest.cc | 2 +- headless/test/headless_origin_trials_browsertest.cc | 2 +- ios/chrome/browser/history/history_tab_helper_unittest.mm | 2 +- .../passwords/ios_chrome_password_check_manager_unittest.mm | 2 +- .../policy/reporting/browser_report_generator_ios_unittest.mm | 2 +- .../policy/reporting/profile_report_generator_ios_unittest.mm | 2 +- .../browser/policy/reporting/report_generator_ios_unittest.mm | 2 +- .../browser/safe_browsing/safe_browsing_service_unittest.mm | 2 +- ios/chrome/browser/signin/authentication_service_unittest.mm | 2 +- .../gaia_auth_fetcher_ios_ns_url_session_bridge_unittests.mm | 2 +- .../password/passwords_table_view_controller_unittest.mm | 2 +- ios/net/cookies/cookie_store_ios_unittest.mm | 2 +- ios/web/cookie_blocking_inttest.mm | 2 +- ios/web/url_loader_inttest.mm | 2 +- .../internal/autofill/cwv_credit_card_saver_unittest.mm | 2 +- .../signin/web_view_device_accounts_provider_impl_unittest.mm | 2 +- ios/web_view/internal/sync/cwv_sync_controller_unittest.mm | 2 +- ipc/ipc_channel_mojo_unittest.cc | 2 +- media/audio/audio_output_unittest.cc | 2 +- media/base/offloading_video_encoder_unittest.cc | 2 +- media/blink/webmediaplayer_impl_unittest.cc | 2 +- .../capture/video/chromeos/camera_device_delegate_unittest.cc | 2 +- media/capture/video/chromeos/camera_hal_delegate_unittest.cc | 2 +- media/capture/video/fake_video_capture_device_unittest.cc | 2 +- .../fuchsia/video_capture_device_factory_fuchsia_test.cc | 2 +- .../video/fuchsia/video_capture_device_fuchsia_test.cc | 2 +- .../linux/video_capture_device_factory_linux_unittest.cc | 2 +- media/capture/video/mac/test/video_capture_test_utils_mac.mm | 2 +- .../video/mac/video_capture_device_factory_mac_unittest.mm | 2 +- media/capture/video/video_capture_device_unittest.cc | 2 +- .../video/win/video_capture_device_factory_win_unittest.cc | 2 +- media/filters/fuchsia/fuchsia_video_decoder_unittest.cc | 2 +- media/fuchsia/cdm/service/fuchsia_cdm_manager_test.cc | 2 +- media/fuchsia/cdm/service/provisioning_fetcher_impl_test.cc | 2 +- media/gpu/android/frame_info_helper_unittest.cc | 2 +- media/mojo/services/video_decode_perf_history_unittest.cc | 2 +- mojo/core/channel_unittest.cc | 2 +- mojo/core/invitation_unittest.cc | 2 +- mojo/core/trap_unittest.cc | 2 +- .../cpp/bindings/tests/associated_interface_unittest.cc | 2 +- mojo/public/cpp/bindings/tests/bind_task_runner_unittest.cc | 2 +- mojo/public/cpp/bindings/tests/binder_map_unittest.cc | 2 +- mojo/public/cpp/bindings/tests/connection_group_unittest.cc | 2 +- mojo/public/cpp/bindings/tests/flush_async_unittest.cc | 2 +- mojo/public/cpp/bindings/tests/idle_tracking_unittest.cc | 2 +- mojo/public/cpp/bindings/tests/lazy_serialization_unittest.cc | 2 +- mojo/public/cpp/bindings/tests/receiver_callback_unittest.cc | 2 +- mojo/public/cpp/bindings/tests/receiver_set_unittest.cc | 2 +- mojo/public/cpp/bindings/tests/receiver_unittest.cc | 2 +- mojo/public/cpp/bindings/tests/remote_unittest.cc | 2 +- mojo/public/cpp/bindings/tests/report_bad_message_unittest.cc | 2 +- mojo/public/cpp/bindings/tests/request_response_unittest.cc | 2 +- mojo/public/cpp/bindings/tests/service_factory_unittest.cc | 2 +- mojo/public/cpp/bindings/tests/sync_method_unittest.cc | 2 +- mojo/public/cpp/system/tests/invitation_unittest.cc | 2 +- .../public/cpp/system/tests/scope_to_message_pipe_unittest.cc | 2 +- net/cert/coalescing_cert_verifier_unittest.cc | 2 +- net/cert/trial_comparison_cert_verifier_unittest.cc | 2 +- net/cookies/cookie_monster_unittest.cc | 2 +- net/cookies/cookie_util_unittest.cc | 2 +- net/dns/host_resolver_manager_unittest.cc | 2 +- net/extras/sqlite/sqlite_persistent_cookie_store_unittest.cc | 2 +- .../sqlite_persistent_reporting_and_nel_store_unittest.cc | 2 +- net/http/http_server_properties_manager_unittest.cc | 2 +- .../mock_persistent_nel_store_unittest.cc | 2 +- net/nqe/connectivity_monitor_unittest.cc | 2 +- net/reporting/mock_persistent_reporting_store_unittest.cc | 2 +- net/socket/tcp_client_socket_unittest.cc | 2 +- net/socket/tcp_socket_unittest.cc | 2 +- net/socket/transport_client_socket_pool_unittest.cc | 2 +- net/spdy/spdy_session_pool_unittest.cc | 2 +- net/test/embedded_test_server/embedded_test_server.cc | 2 +- net/url_request/url_request_http_job_unittest.cc | 2 +- net/url_request/url_request_quic_unittest.cc | 2 +- net/url_request/url_request_unittest.cc | 2 +- remoting/base/protobuf_http_client_unittest.cc | 2 +- remoting/host/heartbeat_sender_unittest.cc | 2 +- remoting/host/zombie_host_detector_unittest.cc | 2 +- remoting/ios/audio/audio_playback_sink_ios_unittest.cc | 2 +- remoting/protocol/webrtc_transport_unittest.cc | 2 +- remoting/signaling/ftl_message_reception_channel_unittest.cc | 2 +- remoting/signaling/ftl_messaging_client_unittest.cc | 2 +- .../integration_tests/seccomp_broker_process_unittest.cc | 2 +- .../linux/syscall_broker/broker_simple_message_unittest.cc | 2 +- .../syscall_broker/remote_syscall_arg_handler_unittest.cc | 2 +- .../cert_verifier/cert_verifier_service_factory_unittest.cc | 2 +- services/cert_verifier/cert_verifier_service_unittest.cc | 2 +- .../integration_tests/network_service_unittest.cc | 2 +- services/data_decoder/public/cpp/json_sanitizer_unittest.cc | 2 +- services/data_decoder/public/cpp/safe_xml_parser_unittest.cc | 2 +- services/device/bluetooth/bluetooth_system_unittest.cc | 2 +- .../platform_sensor_and_provider_unittest_linux.cc | 2 +- .../generic_sensor/platform_sensor_provider_winrt_unittest.cc | 2 +- .../generic_sensor/platform_sensor_reader_winrt_unittests.cc | 2 +- .../device/geolocation/core_location_provider_unittest.mm | 2 +- services/device/geolocation/geolocation_service_unittest.cc | 2 +- services/device/serial/bluetooth_serial_port_impl_unittest.cc | 2 +- services/device/serial/serial_port_impl_unittest.cc | 2 +- services/device/serial/serial_port_manager_impl_unittest.cc | 2 +- services/device/usb/mojo/device_impl_unittest.cc | 2 +- services/network/cookie_manager_unittest.cc | 2 +- services/network/expect_ct_reporter_unittest.cc | 2 +- services/network/host_resolver_unittest.cc | 2 +- services/network/http_cache_data_counter_unittest.cc | 2 +- services/network/network_context_unittest.cc | 2 +- services/network/network_service_unittest.cc | 2 +- services/network/p2p/socket_tcp_unittest.cc | 2 +- services/network/p2p/socket_test_utils.cc | 2 +- services/network/pending_callback_chain_unittest.cc | 2 +- services/network/proxy_resolving_socket_mojo_unittest.cc | 2 +- .../public/cpp/cert_verifier/mojo_cert_verifier_unittest.cc | 2 +- ...cross_thread_pending_shared_url_loader_factory_unittest.cc | 2 +- services/network/public/cpp/simple_url_loader_unittest.cc | 2 +- services/network/quic_transport_unittest.cc | 2 +- services/network/restricted_cookie_manager_unittest.cc | 2 +- services/network/tcp_bound_socket_unittest.cc | 2 +- services/network/tcp_socket_unittest.cc | 2 +- services/network/test/udp_socket_test_util.cc | 2 +- services/network/tls_client_socket_unittest.cc | 2 +- .../network/transitional_url_loader_factory_owner_unittest.cc | 2 +- .../trust_tokens/has_trust_tokens_answerer_unittest.cc | 2 +- .../local_trust_token_operation_delegate_impl_unittest.cc | 2 +- .../trust_tokens/pending_trust_token_store_unittest.cc | 2 +- .../trust_tokens/sqlite_trust_token_persister_unittest.cc | 2 +- .../trust_tokens/test/test_server_handler_registration.cc | 2 +- .../network/trust_tokens/test/trust_token_request_handler.cc | 2 +- services/network/trust_tokens/test/trust_token_test_util.cc | 2 +- .../trust_tokens/trust_token_database_owner_unittest.cc | 2 +- .../trust_token_key_commitment_controller_unittest.cc | 2 +- .../trust_token_key_commitment_parser_unittest.cc | 2 +- .../trust_tokens/trust_token_key_commitments_unittest.cc | 2 +- .../network/trust_tokens/trust_token_persister_unittest.cc | 2 +- .../trust_token_request_helper_factory_unittest.cc | 2 +- .../trust_token_request_issuance_helper_unittest.cc | 2 +- .../trust_token_request_signing_helper_unittest.cc | 2 +- services/network/url_loader_unittest.cc | 2 +- .../public/cpp/standalone_connector_impl_unittest.cc | 2 +- services/service_manager/tests/connect/connect_unittest.cc | 2 +- .../barcode_detection_impl_barhopper_unittest.cc | 2 +- .../barcode_detection_provider_mac_unittest.mm | 2 +- services/tracing/perfetto/consumer_host_unittest.cc | 2 +- services/tracing/perfetto/perfetto_integration_unittest.cc | 2 +- services/tracing/perfetto/system_perfetto_unittest.cc | 2 +- .../cpp/stack_sampling/loader_lock_sampler_win_unittest.cc | 2 +- services/tracing/tracing_service_unittest.cc | 2 +- storage/browser/blob/blob_builder_from_stream_unittest.cc | 2 +- storage/browser/blob/blob_reader_unittest.cc | 2 +- storage/browser/blob/blob_registry_impl_unittest.cc | 2 +- storage/browser/blob/blob_storage_context_mojo_unittest.cc | 2 +- storage/browser/blob/blob_url_store_impl_unittest.cc | 2 +- storage/browser/database/database_quota_client_unittest.cc | 2 +- storage/browser/database/database_tracker_unittest.cc | 2 +- storage/browser/quota/quota_manager_unittest.cc | 2 +- storage/browser/quota/quota_settings_unittest.cc | 2 +- .../blink/common/loader/throttling_url_loader_unittest.cc | 2 +- third_party/blink/renderer/core/DEPS | 2 +- third_party/blink/renderer/core/input/event_handler_test.cc | 2 +- .../core/loader/resource_load_observer_for_frame_test.cc | 2 +- .../page/scrolling/text_fragment_selector_generator_test.cc | 2 +- .../core/scheduler_integration_tests/frame_throttling_test.cc | 2 +- third_party/blink/renderer/core/scroll/scroll_test.cc | 2 +- third_party/blink/renderer/core/testing/page_test_base.cc | 2 +- third_party/blink/renderer/modules/DEPS | 2 +- third_party/blink/renderer/modules/canvas/canvas_fuzzer.cc | 2 +- third_party/blink/renderer/modules/media/audio/DEPS | 2 +- .../modules/media/audio/web_audio_output_ipc_factory_test.cc | 2 +- third_party/blink/renderer/modules/media_capabilities/DEPS | 2 +- .../modules/media_capabilities/media_capabilities_test.cc | 2 +- third_party/blink/renderer/modules/mediastream/DEPS | 2 +- .../modules/mediastream/media_stream_video_track_test.cc | 2 +- .../modules/mediastream/video_track_adapter_unittest.cc | 2 +- third_party/blink/renderer/modules/nfc/DEPS | 2 +- third_party/blink/renderer/modules/nfc/nfc_proxy_test.cc | 2 +- .../renderer/platform/graphics/video_frame_submitter_test.cc | 2 +- .../common/throttling/task_queue_throttler_unittest.cc | 2 +- .../scheduler/main_thread/frame_scheduler_impl_unittest.cc | 2 +- .../main_thread/main_thread_scheduler_impl_unittest.cc | 2 +- .../platform/video_capture/video_capture_impl_test.cc | 2 +- .../platform/widget/input/input_handler_proxy_unittest.cc | 2 +- ui/aura/window_event_dispatcher_unittest.cc | 2 +- ui/aura/window_occlusion_tracker_unittest.cc | 2 +- ui/aura/window_unittest.cc | 2 +- ui/aura_extra/window_position_in_root_monitor_unittest.cc | 2 +- ui/base/clipboard/test/clipboard_test_util.cc | 2 +- ui/base/ime/chromeos/input_method_chromeos_unittest.cc | 2 +- ui/base/pointer/touch_ui_controller_unittest.cc | 2 +- ui/compositor/animation_throughput_reporter_unittest.cc | 2 +- ui/compositor/compositor_unittest.cc | 2 +- ui/compositor/layer_unittest.cc | 2 +- ui/compositor/test/test_utils.cc | 2 +- ui/gfx/animation/animation_runner_unittest.cc | 2 +- ui/gfx/codec/jpeg_codec_unittest.cc | 2 +- ui/views/animation/compositor_animation_runner_unittest.cc | 2 +- ui/views/controls/menu/menu_closure_animation_mac_unittest.cc | 2 +- ui/views/controls/menu/menu_controller_unittest.cc | 2 +- ui/views/controls/menu/menu_item_view_unittest.cc | 2 +- ui/views/test/widget_test.cc | 2 +- ui/views/test/widget_test.h | 2 +- ui/views/widget/any_widget_observer_unittest.cc | 2 +- ui/views/widget/widget_delegate_unittest.cc | 2 +- ui/views/window/dialog_delegate_unittest.cc | 2 +- weblayer/browser/android/metrics/metrics_browsertest.cc | 2 +- weblayer/browser/android/metrics/ukm_browsertest.cc | 2 +- weblayer/browser/cookie_manager_browsertest.cc | 2 +- weblayer/browser/download_browsertest.cc | 2 +- weblayer/browser/errorpage_browsertest.cc | 2 +- weblayer/browser/navigation_browsertest.cc | 2 +- weblayer/browser/page_load_metrics_browsertest.cc | 2 +- weblayer/browser/persistence/browser_persister_browsertest.cc | 2 +- weblayer/browser/prefetch_browsertest.cc | 2 +- weblayer/browser/profile_browsertest.cc | 2 +- weblayer/test/test_navigation_observer.cc | 2 +- weblayer/test/weblayer_browser_test_utils.cc | 2 +- 1065 files changed, 1067 insertions(+), 1067 deletions(-) rename base/test/{bind_test_util.cc => bind.cc} (98%) rename base/test/{bind_test_util.h => bind.h} (97%) diff --git a/android_webview/test/shell/memory_metrics_logger_utils.cc b/android_webview/test/shell/memory_metrics_logger_utils.cc index 8ca09fcb5f7904..df558387f3ae9b 100644 --- a/android_webview/test/shell/memory_metrics_logger_utils.cc +++ b/android_webview/test/shell/memory_metrics_logger_utils.cc @@ -5,7 +5,7 @@ #include "android_webview/test/webview_instrumentation_test_native_jni/MemoryMetricsLoggerUtils_jni.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/test/test_timeouts.h" #include "components/embedder_support/android/metrics/memory_metrics_logger.h" diff --git a/ash/ambient/ambient_controller_unittest.cc b/ash/ambient/ambient_controller_unittest.cc index 1133e2adda1caf..f53983a8682d9d 100644 --- a/ash/ambient/ambient_controller_unittest.cc +++ b/ash/ambient/ambient_controller_unittest.cc @@ -14,7 +14,7 @@ #include "ash/shell.h" #include "ash/system/power/power_status.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/time/time.h" #include "chromeos/dbus/power/fake_power_manager_client.h" #include "chromeos/dbus/power/power_manager_client.h" diff --git a/ash/ambient/ambient_photo_controller_unittest.cc b/ash/ambient/ambient_photo_controller_unittest.cc index 6cdf0831f535b4..df249d1b6e5613 100644 --- a/ash/ambient/ambient_photo_controller_unittest.cc +++ b/ash/ambient/ambient_photo_controller_unittest.cc @@ -27,7 +27,7 @@ #include "base/run_loop.h" #include "base/scoped_observer.h" #include "base/system/sys_info.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/timer/timer.h" #include "testing/gmock/include/gmock/gmock.h" #include "ui/gfx/image/image_skia.h" diff --git a/ash/in_session_auth/in_session_auth_dialog_controller_impl_unittest.cc b/ash/in_session_auth/in_session_auth_dialog_controller_impl_unittest.cc index d8b810ffd99cfd..61d4d9ef06f424 100644 --- a/ash/in_session_auth/in_session_auth_dialog_controller_impl_unittest.cc +++ b/ash/in_session_auth/in_session_auth_dialog_controller_impl_unittest.cc @@ -8,7 +8,7 @@ #include "ash/shell.h" #include "ash/test/ash_test_base.h" #include "base/callback.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" using ::testing::_; diff --git a/ash/keyboard/keyboard_controller_impl_unittest.cc b/ash/keyboard/keyboard_controller_impl_unittest.cc index 4aa5d57b7ec2c4..19ce0675eb1aec 100644 --- a/ash/keyboard/keyboard_controller_impl_unittest.cc +++ b/ash/keyboard/keyboard_controller_impl_unittest.cc @@ -24,7 +24,7 @@ #include "base/optional.h" #include "base/run_loop.h" #include "base/stl_util.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/aura/window.h" diff --git a/ash/login/login_screen_controller_unittest.cc b/ash/login/login_screen_controller_unittest.cc index d0320cf1b2f3e7..298e8d91d038d1 100644 --- a/ash/login/login_screen_controller_unittest.cc +++ b/ash/login/login_screen_controller_unittest.cc @@ -18,7 +18,7 @@ #include "ash/wallpaper/wallpaper_controller_impl.h" #include "base/bind.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "components/prefs/pref_service.h" #include "components/session_manager/session_manager_types.h" diff --git a/ash/login/ui/pin_request_view_unittest.cc b/ash/login/ui/pin_request_view_unittest.cc index 8118afcfef50a6..2b8c3f2b2a62d4 100644 --- a/ash/login/ui/pin_request_view_unittest.cc +++ b/ash/login/ui/pin_request_view_unittest.cc @@ -26,7 +26,7 @@ #include "base/bind_helpers.h" #include "base/macros.h" #include "base/optional.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/time/time.h" #include "components/account_id/account_id.h" diff --git a/ash/metrics/presentation_time_recorder_unittest.cc b/ash/metrics/presentation_time_recorder_unittest.cc index f28c6edee1b698..76b3c36a4b7b97 100644 --- a/ash/metrics/presentation_time_recorder_unittest.cc +++ b/ash/metrics/presentation_time_recorder_unittest.cc @@ -6,7 +6,7 @@ #include "ash/test/ash_test_base.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "ui/aura/window.h" #include "ui/compositor/compositor.h" diff --git a/ash/public/cpp/external_arc/message_center/arc_notification_content_view_unittest.cc b/ash/public/cpp/external_arc/message_center/arc_notification_content_view_unittest.cc index 61424035af573b..400958932e95d0 100644 --- a/ash/public/cpp/external_arc/message_center/arc_notification_content_view_unittest.cc +++ b/ash/public/cpp/external_arc/message_center/arc_notification_content_view_unittest.cc @@ -25,7 +25,7 @@ #include "ash/test/ash_test_base.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "components/exo/buffer.h" #include "components/exo/keyboard.h" #include "components/exo/keyboard_delegate.h" diff --git a/ash/public/cpp/holding_space/holding_space_item_unittest.cc b/ash/public/cpp/holding_space/holding_space_item_unittest.cc index 46669aa7269efd..935b49040fdc88 100644 --- a/ash/public/cpp/holding_space/holding_space_item_unittest.cc +++ b/ash/public/cpp/holding_space/holding_space_item_unittest.cc @@ -9,7 +9,7 @@ #include "ash/public/cpp/holding_space/holding_space_image.h" #include "base/bind_helpers.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/gfx/image/image_skia.h" #include "ui/gfx/image/image_unittest_util.h" diff --git a/ash/public/cpp/metrics_util_unittest.cc b/ash/public/cpp/metrics_util_unittest.cc index f62dc8cb8490c1..f98208ea99e7c6 100644 --- a/ash/public/cpp/metrics_util_unittest.cc +++ b/ash/public/cpp/metrics_util_unittest.cc @@ -5,7 +5,7 @@ #include "ash/public/cpp/metrics_util.h" #include "base/optional.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "cc/metrics/frame_sequence_metrics.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/ash/system/holding_space/holding_space_tray_unittest.cc b/ash/system/holding_space/holding_space_tray_unittest.cc index 81ed1de78edaf3..66221d46ece734 100644 --- a/ash/system/holding_space/holding_space_tray_unittest.cc +++ b/ash/system/holding_space/holding_space_tray_unittest.cc @@ -19,7 +19,7 @@ #include "ash/test/ash_test_base.h" #include "base/files/file_path.h" #include "base/strings/strcat.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "ui/gfx/image/image_skia.h" #include "url/gurl.h" diff --git a/ash/wallpaper/wallpaper_controller_unittest.cc b/ash/wallpaper/wallpaper_controller_unittest.cc index d6dec6f28f4acc..f807b5f5b246a1 100644 --- a/ash/wallpaper/wallpaper_controller_unittest.cc +++ b/ash/wallpaper/wallpaper_controller_unittest.cc @@ -33,7 +33,7 @@ #include "base/task/post_task.h" #include "base/task/task_observer.h" #include "base/task/thread_pool/thread_pool_instance.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/time/time_override.h" #include "chromeos/constants/chromeos_switches.h" #include "components/prefs/scoped_user_pref_update.h" diff --git a/ash/wm/overview/overview_test_util.cc b/ash/wm/overview/overview_test_util.cc index 919b6e49a835aa..ba645bc36b89a2 100644 --- a/ash/wm/overview/overview_test_util.cc +++ b/ash/wm/overview/overview_test_util.cc @@ -12,7 +12,7 @@ #include "ash/wm/overview/overview_highlight_controller.h" #include "ash/wm/overview/overview_item.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "ui/compositor/scoped_animation_duration_scale_mode.h" #include "ui/events/test/event_generator.h" diff --git a/base/allocator/partition_allocator/partition_lock_unittest.cc b/base/allocator/partition_allocator/partition_lock_unittest.cc index db70a9624d75b4..080155d9afad8f 100644 --- a/base/allocator/partition_allocator/partition_lock_unittest.cc +++ b/base/allocator/partition_allocator/partition_lock_unittest.cc @@ -7,7 +7,7 @@ #include "base/bind.h" #include "base/callback.h" #include "base/macros.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/gtest_util.h" #include "base/threading/platform_thread.h" #include "base/time/time.h" diff --git a/base/allocator/partition_allocator/thread_cache_unittest.cc b/base/allocator/partition_allocator/thread_cache_unittest.cc index 5a787d762516d5..e11e3fcf7a9cf1 100644 --- a/base/allocator/partition_allocator/thread_cache_unittest.cc +++ b/base/allocator/partition_allocator/thread_cache_unittest.cc @@ -12,7 +12,7 @@ #include "base/bind.h" #include "base/callback.h" #include "base/synchronization/lock.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/threading/platform_thread.h" #include "build/build_config.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/base/android/java_handler_thread_unittest.cc b/base/android/java_handler_thread_unittest.cc index 9c03bf183c0019..f3267129e53f14 100644 --- a/base/android/java_handler_thread_unittest.cc +++ b/base/android/java_handler_thread_unittest.cc @@ -8,7 +8,7 @@ #include "base/task/sequence_manager/sequence_manager_impl.h" #include "base/task/task_observer.h" #include "base/test/android/java_handler_thread_helpers.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "testing/gtest/include/gtest/gtest.h" namespace base { diff --git a/base/bind_unittest.cc b/base/bind_unittest.cc index e758e09a03b57e..d4d07002889ba2 100644 --- a/base/bind_unittest.cc +++ b/base/bind_unittest.cc @@ -14,7 +14,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/strings/string_number_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/gtest_util.h" #include "build/build_config.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/base/bind_unittest.nc b/base/bind_unittest.nc index a7cd3b124865cd..0fcef725032d76 100644 --- a/base/bind_unittest.nc +++ b/base/bind_unittest.nc @@ -11,7 +11,7 @@ #include "base/callback.h" #include "base/macros.h" #include "base/memory/ref_counted.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" namespace base { diff --git a/base/debug/task_trace_unittest.cc b/base/debug/task_trace_unittest.cc index 5f3d811710761b..fdb6c6208cb188 100644 --- a/base/debug/task_trace_unittest.cc +++ b/base/debug/task_trace_unittest.cc @@ -7,7 +7,7 @@ #include #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/base/files/important_file_writer_cleaner_unittest.cc b/base/files/important_file_writer_cleaner_unittest.cc index 6c2a921e177011..8e4d91fa477071 100644 --- a/base/files/important_file_writer_cleaner_unittest.cc +++ b/base/files/important_file_writer_cleaner_unittest.cc @@ -12,7 +12,7 @@ #include "base/optional.h" #include "base/strings/stringprintf.h" #include "base/task/thread_pool.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/task_environment.h" #include "base/test/test_waitable_event.h" diff --git a/base/fuchsia/intl_profile_watcher_unittest.cc b/base/fuchsia/intl_profile_watcher_unittest.cc index 6368000da607be..8a8093c8c5636c 100644 --- a/base/fuchsia/intl_profile_watcher_unittest.cc +++ b/base/fuchsia/intl_profile_watcher_unittest.cc @@ -13,7 +13,7 @@ #include "base/check.h" #include "base/memory/ptr_util.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/mock_callback.h" #include "base/test/task_environment.h" #include "base/threading/sequence_bound.h" diff --git a/base/logging_unittest.cc b/base/logging_unittest.cc index 304c5e2e98be7e..7fd8a0af8256bb 100644 --- a/base/logging_unittest.cc +++ b/base/logging_unittest.cc @@ -15,7 +15,7 @@ #include "base/run_loop.h" #include "base/sanitizer_buildflags.h" #include "base/strings/string_piece.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_logging_settings.h" #include "base/test/task_environment.h" #include "build/build_config.h" diff --git a/base/message_loop/message_pump_mac_unittest.mm b/base/message_loop/message_pump_mac_unittest.mm index 942ab8a36fd3e8..807c73192bbdfb 100644 --- a/base/message_loop/message_pump_mac_unittest.mm +++ b/base/message_loop/message_pump_mac_unittest.mm @@ -10,7 +10,7 @@ #import "base/mac/scoped_nsobject.h" #include "base/macros.h" #include "base/task/current_thread.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/threading/thread_task_runner_handle.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/base/message_loop/message_pump_unittest.cc b/base/message_loop/message_pump_unittest.cc index c1517d152f9284..a76fdcdedfb151 100644 --- a/base/message_loop/message_pump_unittest.cc +++ b/base/message_loop/message_pump_unittest.cc @@ -12,7 +12,7 @@ #include "base/message_loop/message_pump_type.h" #include "base/run_loop.h" #include "base/task/single_thread_task_executor.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/test_timeouts.h" #include "base/threading/thread.h" #include "build/build_config.h" diff --git a/base/message_loop/work_id_provider_unittest.cc b/base/message_loop/work_id_provider_unittest.cc index 5a6b93ef45aa39..1258e1c713e7b9 100644 --- a/base/message_loop/work_id_provider_unittest.cc +++ b/base/message_loop/work_id_provider_unittest.cc @@ -9,7 +9,7 @@ #include #include "base/callback.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/threading/simple_thread.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/base/observer_list_threadsafe_unittest.cc b/base/observer_list_threadsafe_unittest.cc index 446c5169b6f076..b86531bfaf6644 100644 --- a/base/observer_list_threadsafe_unittest.cc +++ b/base/observer_list_threadsafe_unittest.cc @@ -19,7 +19,7 @@ #include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/task/thread_pool/thread_pool_instance.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/threading/platform_thread.h" #include "base/threading/thread_restrictions.h" diff --git a/base/profiler/module_cache_unittest.cc b/base/profiler/module_cache_unittest.cc index b6eb063f008b31..57986440945f30 100644 --- a/base/profiler/module_cache_unittest.cc +++ b/base/profiler/module_cache_unittest.cc @@ -12,7 +12,7 @@ #include "base/callback_helpers.h" #include "base/profiler/module_cache.h" #include "base/strings/string_piece.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "build/build_config.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/base/profiler/native_unwinder_android_unittest.cc b/base/profiler/native_unwinder_android_unittest.cc index 7bcbecedbecee5..477c26f34b5874 100644 --- a/base/profiler/native_unwinder_android_unittest.cc +++ b/base/profiler/native_unwinder_android_unittest.cc @@ -24,7 +24,7 @@ #include "base/profiler/stack_sampling_profiler_test_util.h" #include "base/profiler/thread_delegate_posix.h" #include "base/strings/stringprintf.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "build/build_config.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/base/profiler/stack_sampling_profiler_test_util.cc b/base/profiler/stack_sampling_profiler_test_util.cc index 7685106d1b00ad..0bb9fb9d542401 100644 --- a/base/profiler/stack_sampling_profiler_test_util.cc +++ b/base/profiler/stack_sampling_profiler_test_util.cc @@ -16,7 +16,7 @@ #include "base/profiler/stack_sampling_profiler.h" #include "base/profiler/unwinder.h" #include "base/strings/stringprintf.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "build/build_config.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/base/profiler/stack_sampling_profiler_unittest.cc b/base/profiler/stack_sampling_profiler_unittest.cc index e99ba1fa16dc4e..6c8c3a3299e0a1 100644 --- a/base/profiler/stack_sampling_profiler_unittest.cc +++ b/base/profiler/stack_sampling_profiler_unittest.cc @@ -32,7 +32,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/synchronization/lock.h" #include "base/synchronization/waitable_event.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/threading/simple_thread.h" #include "base/time/time.h" #include "build/build_config.h" diff --git a/base/run_loop_unittest.cc b/base/run_loop_unittest.cc index 25ebfd3428da2d..7dd59bce596753 100644 --- a/base/run_loop_unittest.cc +++ b/base/run_loop_unittest.cc @@ -17,7 +17,7 @@ #include "base/single_thread_task_runner.h" #include "base/synchronization/lock.h" #include "base/synchronization/waitable_event.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/gtest_util.h" #include "base/test/scoped_run_loop_timeout.h" #include "base/test/task_environment.h" diff --git a/base/sequence_checker_unittest.cc b/base/sequence_checker_unittest.cc index d2b40bd22ed805..bd72555d5f3a84 100644 --- a/base/sequence_checker_unittest.cc +++ b/base/sequence_checker_unittest.cc @@ -17,7 +17,7 @@ #include "base/single_thread_task_runner.h" #include "base/task/post_task.h" #include "base/task/thread_pool.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/gtest_util.h" #include "base/test/task_environment.h" #include "base/threading/simple_thread.h" diff --git a/base/task/cancelable_task_tracker_unittest.cc b/base/task/cancelable_task_tracker_unittest.cc index 7bd0192d6ef8b5..09bf7c8a9bbc20 100644 --- a/base/task/cancelable_task_tracker_unittest.cc +++ b/base/task/cancelable_task_tracker_unittest.cc @@ -14,7 +14,7 @@ #include "base/memory/weak_ptr.h" #include "base/run_loop.h" #include "base/single_thread_task_runner.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/gtest_util.h" #include "base/test/task_environment.h" #include "base/test/test_simple_task_runner.h" diff --git a/base/task/common/task_annotator_unittest.cc b/base/task/common/task_annotator_unittest.cc index 64be6aabe9215a..c6762d7ea6b292 100644 --- a/base/task/common/task_annotator_unittest.cc +++ b/base/task/common/task_annotator_unittest.cc @@ -17,7 +17,7 @@ #include "base/synchronization/lock.h" #include "base/synchronization/waitable_event.h" #include "base/task/post_task.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/threading/thread.h" #include "base/threading/thread_task_runner_handle.h" diff --git a/base/task/job_perftest.cc b/base/task/job_perftest.cc index 18e168818e4e36..05dc0833c8be8d 100644 --- a/base/task/job_perftest.cc +++ b/base/task/job_perftest.cc @@ -14,7 +14,7 @@ #include "base/synchronization/lock.h" #include "base/task/post_job.h" #include "base/task/post_task.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/perf/perf_result_reporter.h" diff --git a/base/task/post_job_unittest.cc b/base/task/post_job_unittest.cc index 41579129311a3f..df8cb175c99b8b 100644 --- a/base/task/post_job_unittest.cc +++ b/base/task/post_job_unittest.cc @@ -9,7 +9,7 @@ #include #include "base/task/test_task_traits_extension.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/gtest_util.h" #include "base/test/task_environment.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/base/task/post_task_unittest.cc b/base/task/post_task_unittest.cc index b54872791a4d76..aef581cb774554 100644 --- a/base/task/post_task_unittest.cc +++ b/base/task/post_task_unittest.cc @@ -8,7 +8,7 @@ #include "base/run_loop.h" #include "base/task/task_executor.h" #include "base/task/test_task_traits_extension.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/gtest_util.h" #include "base/test/task_environment.h" #include "base/test/test_simple_task_runner.h" diff --git a/base/task/sequence_manager/atomic_flag_set_unittest.cc b/base/task/sequence_manager/atomic_flag_set_unittest.cc index 99e3070288df0c..644ca532d1f7fb 100644 --- a/base/task/sequence_manager/atomic_flag_set_unittest.cc +++ b/base/task/sequence_manager/atomic_flag_set_unittest.cc @@ -8,7 +8,7 @@ #include #include -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "testing/gmock/include/gmock/gmock.h" using testing::ElementsAre; diff --git a/base/task/sequence_manager/sequence_manager_impl_unittest.cc b/base/task/sequence_manager/sequence_manager_impl_unittest.cc index 9f8997fc60688d..65982ae97bdd0d 100644 --- a/base/task/sequence_manager/sequence_manager_impl_unittest.cc +++ b/base/task/sequence_manager/sequence_manager_impl_unittest.cc @@ -43,7 +43,7 @@ #include "base/task/sequence_manager/thread_controller_with_message_pump_impl.h" #include "base/task/sequence_manager/work_queue.h" #include "base/task/sequence_manager/work_queue_sets.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/mock_callback.h" #include "base/test/null_task_runner.h" #include "base/test/simple_test_tick_clock.h" diff --git a/base/task/sequence_manager/thread_controller_with_message_pump_impl_unittest.cc b/base/task/sequence_manager/thread_controller_with_message_pump_impl_unittest.cc index b01bbcef7a2ca4..deab435a5cf6a9 100644 --- a/base/task/sequence_manager/thread_controller_with_message_pump_impl_unittest.cc +++ b/base/task/sequence_manager/thread_controller_with_message_pump_impl_unittest.cc @@ -16,7 +16,7 @@ #include "base/single_thread_task_runner.h" #include "base/stl_util.h" #include "base/task/sequence_manager/thread_controller_power_monitor.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/mock_callback.h" #include "base/test/simple_test_tick_clock.h" #include "base/threading/thread_task_runner_handle.h" diff --git a/base/task/single_thread_task_executor_unittest.cc b/base/task/single_thread_task_executor_unittest.cc index 33bff01cf18a42..63117f4a945d4b 100644 --- a/base/task/single_thread_task_executor_unittest.cc +++ b/base/task/single_thread_task_executor_unittest.cc @@ -27,7 +27,7 @@ #include "base/task/post_task.h" #include "base/task/task_observer.h" #include "base/task/thread_pool/thread_pool_instance.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/gtest_util.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/test_simple_task_runner.h" diff --git a/base/task/thread_pool/can_run_policy_test.h b/base/task/thread_pool/can_run_policy_test.h index 96294d1fb2c03b..71a2ae8f566dd7 100644 --- a/base/task/thread_pool/can_run_policy_test.h +++ b/base/task/thread_pool/can_run_policy_test.h @@ -9,7 +9,7 @@ #include "base/task/thread_pool/task_tracker.h" #include "base/task/thread_pool/test_utils.h" #include "base/task_runner.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/test_timeouts.h" #include "base/test/test_waitable_event.h" #include "base/threading/platform_thread.h" diff --git a/base/task/thread_pool/delayed_task_manager_unittest.cc b/base/task/thread_pool/delayed_task_manager_unittest.cc index 1c209cf9a5ffcf..ddd3db97bc8edf 100644 --- a/base/task/thread_pool/delayed_task_manager_unittest.cc +++ b/base/task/thread_pool/delayed_task_manager_unittest.cc @@ -12,7 +12,7 @@ #include "base/memory/ref_counted.h" #include "base/synchronization/waitable_event.h" #include "base/task/thread_pool/task.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/test_mock_time_task_runner.h" #include "base/threading/thread.h" #include "base/time/time.h" diff --git a/base/task/thread_pool/job_task_source_unittest.cc b/base/task/thread_pool/job_task_source_unittest.cc index 8fef2849feeca7..9a8be5f9fbcf28 100644 --- a/base/task/thread_pool/job_task_source_unittest.cc +++ b/base/task/thread_pool/job_task_source_unittest.cc @@ -10,7 +10,7 @@ #include "base/memory/ptr_util.h" #include "base/task/thread_pool/pooled_task_runner_delegate.h" #include "base/task/thread_pool/test_utils.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/gtest_util.h" #include "base/test/test_timeouts.h" #include "build/build_config.h" diff --git a/base/task/thread_pool/pooled_single_thread_task_runner_manager_unittest.cc b/base/task/thread_pool/pooled_single_thread_task_runner_manager_unittest.cc index ec106091b8858b..9d0eff3e3a78ae 100644 --- a/base/task/thread_pool/pooled_single_thread_task_runner_manager_unittest.cc +++ b/base/task/thread_pool/pooled_single_thread_task_runner_manager_unittest.cc @@ -15,7 +15,7 @@ #include "base/task/thread_pool/environment_config.h" #include "base/task/thread_pool/task_tracker.h" #include "base/task/thread_pool/test_utils.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/gtest_util.h" #include "base/test/test_timeouts.h" #include "base/test/test_waitable_event.h" diff --git a/base/task/thread_pool/task_tracker_unittest.cc b/base/task/thread_pool/task_tracker_unittest.cc index 87f5622a51e56f..c289825859dc78 100644 --- a/base/task/thread_pool/task_tracker_unittest.cc +++ b/base/task/thread_pool/task_tracker_unittest.cc @@ -26,7 +26,7 @@ #include "base/task/task_traits.h" #include "base/task/thread_pool/task.h" #include "base/task/thread_pool/test_utils.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/gtest_util.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/test_simple_task_runner.h" diff --git a/base/task/thread_pool/test_utils.cc b/base/task/thread_pool/test_utils.cc index 0fa6f2544a3eec..feab509f703a23 100644 --- a/base/task/thread_pool/test_utils.cc +++ b/base/task/thread_pool/test_utils.cc @@ -10,7 +10,7 @@ #include "base/synchronization/condition_variable.h" #include "base/task/thread_pool/pooled_parallel_task_runner.h" #include "base/task/thread_pool/pooled_sequenced_task_runner.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/threading/scoped_blocking_call_internal.h" #include "base/threading/thread_restrictions.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/base/task/thread_pool/thread_group_impl_unittest.cc b/base/task/thread_pool/thread_group_impl_unittest.cc index 3054a02352b509..0a6bd108fe4efb 100644 --- a/base/task/thread_pool/thread_group_impl_unittest.cc +++ b/base/task/thread_pool/thread_group_impl_unittest.cc @@ -36,7 +36,7 @@ #include "base/task/thread_pool/test_utils.h" #include "base/task/thread_pool/worker_thread_observer.h" #include "base/task_runner.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/gtest_util.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/test_simple_task_runner.h" diff --git a/base/task/thread_pool/thread_group_unittest.cc b/base/task/thread_pool/thread_group_unittest.cc index ca1e46d5cee869..60d82cbf3cd321 100644 --- a/base/task/thread_pool/thread_group_unittest.cc +++ b/base/task/thread_pool/thread_group_unittest.cc @@ -22,7 +22,7 @@ #include "base/task/thread_pool/test_utils.h" #include "base/task/thread_pool/thread_group_impl.h" #include "base/task_runner.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/test_timeouts.h" #include "base/test/test_waitable_event.h" #include "base/threading/platform_thread.h" diff --git a/base/task/thread_pool/thread_pool_impl_unittest.cc b/base/task/thread_pool/thread_pool_impl_unittest.cc index e3c460020150ea..18cc255254519b 100644 --- a/base/task/thread_pool/thread_pool_impl_unittest.cc +++ b/base/task/thread_pool/thread_pool_impl_unittest.cc @@ -26,7 +26,7 @@ #include "base/task/thread_pool/test_task_factory.h" #include "base/task/thread_pool/test_utils.h" #include "base/task/thread_pool/worker_thread_observer.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/gtest_util.h" #include "base/test/scoped_feature_list.h" #include "base/test/test_timeouts.h" diff --git a/base/task/thread_pool_unittest.cc b/base/task/thread_pool_unittest.cc index 867068bfd9def0..c16a7aead5609e 100644 --- a/base/task/thread_pool_unittest.cc +++ b/base/task/thread_pool_unittest.cc @@ -7,7 +7,7 @@ #include "base/bind.h" #include "base/location.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/base/test/BUILD.gn b/base/test/BUILD.gn index 2983d7f0e1f7ea..3380c4bbda04c2 100644 --- a/base/test/BUILD.gn +++ b/base/test/BUILD.gn @@ -43,8 +43,8 @@ static_library("test_support") { "../task/sequence_manager/test/test_task_time_observer.h", "../timer/mock_timer.cc", "../timer/mock_timer.h", - "bind_test_util.cc", - "bind_test_util.h", + "bind.cc", + "bind.h", "copy_only_int.cc", "copy_only_int.h", "gmock_callback_support.h", diff --git a/base/test/bind_test_util.cc b/base/test/bind.cc similarity index 98% rename from base/test/bind_test_util.cc rename to base/test/bind.cc index 9b1cef836e824a..6d4202408aa7ae 100644 --- a/base/test/bind_test_util.cc +++ b/base/test/bind.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include diff --git a/base/test/bind_test_util.h b/base/test/bind.h similarity index 97% rename from base/test/bind_test_util.h rename to base/test/bind.h index 85e1f918cff21a..4479001f3f7d0c 100644 --- a/base/test/bind_test_util.h +++ b/base/test/bind.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BASE_TEST_BIND_TEST_UTIL_H_ -#define BASE_TEST_BIND_TEST_UTIL_H_ +#ifndef BASE_TEST_BIND_H_ +#define BASE_TEST_BIND_H_ #include #include diff --git a/base/test/scoped_run_loop_timeout_unittest.cc b/base/test/scoped_run_loop_timeout_unittest.cc index c60bf71569e6d9..cfc141e98c959a 100644 --- a/base/test/scoped_run_loop_timeout_unittest.cc +++ b/base/test/scoped_run_loop_timeout_unittest.cc @@ -7,7 +7,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/location.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/gtest_util.h" #include "base/test/task_environment.h" #include "base/threading/sequenced_task_runner_handle.h" diff --git a/base/test/task_environment.cc b/base/test/task_environment.cc index 779c014f237b97..82acfddaccb0f5 100644 --- a/base/test/task_environment.cc +++ b/base/test/task_environment.cc @@ -24,7 +24,7 @@ #include "base/task/simple_task_executor.h" #include "base/task/thread_pool/thread_pool_impl.h" #include "base/task/thread_pool/thread_pool_instance.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/test_mock_time_task_runner.h" #include "base/test/test_timeouts.h" #include "base/thread_annotations.h" diff --git a/base/test/task_environment_unittest.cc b/base/test/task_environment_unittest.cc index 87e99e21f2df3e..f776b42a8b21ae 100644 --- a/base/test/task_environment_unittest.cc +++ b/base/test/task_environment_unittest.cc @@ -19,7 +19,7 @@ #include "base/task/sequence_manager/time_domain.h" #include "base/task/thread_pool.h" #include "base/task/thread_pool/thread_pool_instance.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/gtest_util.h" #include "base/test/mock_callback.h" #include "base/test/mock_log.h" diff --git a/base/test/test_mock_time_task_runner_unittest.cc b/base/test/test_mock_time_task_runner_unittest.cc index 80805298ada507..ea73bf3d7985ac 100644 --- a/base/test/test_mock_time_task_runner_unittest.cc +++ b/base/test/test_mock_time_task_runner_unittest.cc @@ -9,7 +9,7 @@ #include "base/cancelable_callback.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/gtest_util.h" #include "base/test/test_timeouts.h" #include "base/threading/sequenced_task_runner_handle.h" diff --git a/base/threading/hang_watcher_unittest.cc b/base/threading/hang_watcher_unittest.cc index 94b57d3d002bfa..d029e5553c7a0c 100644 --- a/base/threading/hang_watcher_unittest.cc +++ b/base/threading/hang_watcher_unittest.cc @@ -15,7 +15,7 @@ #include "base/strings/string_number_conversions.h" #include "base/synchronization/lock.h" #include "base/synchronization/waitable_event.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/simple_test_tick_clock.h" #include "base/test/task_environment.h" #include "base/test/test_timeouts.h" diff --git a/base/threading/scoped_blocking_call_unittest.cc b/base/threading/scoped_blocking_call_unittest.cc index 813cdcdca2da16..1481fbca262502 100644 --- a/base/threading/scoped_blocking_call_unittest.cc +++ b/base/threading/scoped_blocking_call_unittest.cc @@ -14,7 +14,7 @@ #include "base/macros.h" #include "base/task/thread_pool/environment_config.h" #include "base/task/thread_pool/thread_pool_impl.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/gtest_util.h" #include "base/test/task_environment.h" #include "base/test/test_waitable_event.h" diff --git a/base/threading/sequence_bound_unittest.cc b/base/threading/sequence_bound_unittest.cc index c9d9c00c168a6d..f9074580463c89 100644 --- a/base/threading/sequence_bound_unittest.cc +++ b/base/threading/sequence_bound_unittest.cc @@ -8,7 +8,7 @@ #include "base/macros.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/threading/sequenced_task_runner_handle.h" #include "build/build_config.h" diff --git a/base/threading/thread_checker_unittest.cc b/base/threading/thread_checker_unittest.cc index b6d4b9fb7fb365..d22169d9515299 100644 --- a/base/threading/thread_checker_unittest.cc +++ b/base/threading/thread_checker_unittest.cc @@ -11,7 +11,7 @@ #include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/sequence_token.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/gtest_util.h" #include "base/test/test_simple_task_runner.h" #include "base/threading/simple_thread.h" diff --git a/base/threading/thread_local_storage_perftest.cc b/base/threading/thread_local_storage_perftest.cc index 0ad614641f1023..2804aed4cc2ab8 100644 --- a/base/threading/thread_local_storage_perftest.cc +++ b/base/threading/thread_local_storage_perftest.cc @@ -11,7 +11,7 @@ #include "base/bind_helpers.h" #include "base/callback.h" #include "base/synchronization/waitable_event.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/threading/simple_thread.h" #include "base/threading/thread_local_storage.h" #include "base/time/time.h" diff --git a/base/threading/thread_local_unittest.cc b/base/threading/thread_local_unittest.cc index ac0c74109438e2..cc71c6be22ba34 100644 --- a/base/threading/thread_local_unittest.cc +++ b/base/threading/thread_local_unittest.cc @@ -7,7 +7,7 @@ #include "base/macros.h" #include "base/optional.h" #include "base/synchronization/waitable_event.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/gtest_util.h" #include "base/threading/simple_thread.h" #include "base/threading/thread.h" diff --git a/base/threading/thread_unittest.cc b/base/threading/thread_unittest.cc index 717756c1134fae..1a71f856dcb930 100644 --- a/base/threading/thread_unittest.cc +++ b/base/threading/thread_unittest.cc @@ -22,7 +22,7 @@ #include "base/task/post_task.h" #include "base/task/sequence_manager/sequence_manager_impl.h" #include "base/task/task_executor.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/gtest_util.h" #include "base/third_party/dynamic_annotations/dynamic_annotations.h" #include "base/threading/platform_thread.h" diff --git a/base/timer/timer_unittest.cc b/base/timer/timer_unittest.cc index afc0684368aeae..8d422ce21e7692 100644 --- a/base/timer/timer_unittest.cc +++ b/base/timer/timer_unittest.cc @@ -19,7 +19,7 @@ #include "base/stl_util.h" #include "base/synchronization/waitable_event.h" #include "base/task/post_task.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/test/test_mock_time_task_runner.h" #include "base/test/test_simple_task_runner.h" diff --git a/base/util/memory_pressure/multi_source_memory_pressure_monitor_unittest.cc b/base/util/memory_pressure/multi_source_memory_pressure_monitor_unittest.cc index f1b75e7af75aef..e22ccb6cea4bd4 100644 --- a/base/util/memory_pressure/multi_source_memory_pressure_monitor_unittest.cc +++ b/base/util/memory_pressure/multi_source_memory_pressure_monitor_unittest.cc @@ -5,7 +5,7 @@ #include "base/util/memory_pressure/multi_source_memory_pressure_monitor.h" #include "base/macros.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/task_environment.h" #include "base/time/time.h" diff --git a/base/util/memory_pressure/system_memory_pressure_evaluator_win_unittest.cc b/base/util/memory_pressure/system_memory_pressure_evaluator_win_unittest.cc index 7cc1403a8722fc..205d999ef24dfa 100644 --- a/base/util/memory_pressure/system_memory_pressure_evaluator_win_unittest.cc +++ b/base/util/memory_pressure/system_memory_pressure_evaluator_win_unittest.cc @@ -7,7 +7,7 @@ #include "base/bind.h" #include "base/macros.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/util/memory_pressure/multi_source_memory_pressure_monitor.h" #include "build/build_config.h" diff --git a/base/win/post_async_results_unittest.cc b/base/win/post_async_results_unittest.cc index 6e0c7bae0c6b1b..dcef38a947990a 100644 --- a/base/win/post_async_results_unittest.cc +++ b/base/win/post_async_results_unittest.cc @@ -5,7 +5,7 @@ #include "base/win/post_async_results.h" #include "base/test/async_results_test_values_win.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/fake_iasync_operation_win.h" #include "base/test/task_environment.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/cc/metrics/frame_sequence_tracker_unittest.cc b/cc/metrics/frame_sequence_tracker_unittest.cc index 72c22aed54d22f..ba8f2b1f7e2175 100644 --- a/cc/metrics/frame_sequence_tracker_unittest.cc +++ b/cc/metrics/frame_sequence_tracker_unittest.cc @@ -9,7 +9,7 @@ #include #include "base/macros.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "cc/metrics/compositor_frame_reporting_controller.h" #include "cc/metrics/frame_sequence_tracker_collection.h" diff --git a/cc/metrics/video_playback_roughness_reporter_unittest.cc b/cc/metrics/video_playback_roughness_reporter_unittest.cc index 81d48b1c396af2..d8ec5aa8ab8448 100644 --- a/cc/metrics/video_playback_roughness_reporter_unittest.cc +++ b/cc/metrics/video_playback_roughness_reporter_unittest.cc @@ -11,7 +11,7 @@ #include "base/bind_helpers.h" #include "base/callback.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "testing/gtest/include/gtest/gtest.h" using VideoFrame = media::VideoFrame; diff --git a/cc/trees/layer_tree_host_impl_unittest.cc b/cc/trees/layer_tree_host_impl_unittest.cc index aa6cf2013bd28c..4d2b43f3c5c814 100644 --- a/cc/trees/layer_tree_host_impl_unittest.cc +++ b/cc/trees/layer_tree_host_impl_unittest.cc @@ -19,7 +19,7 @@ #include "base/memory/ptr_util.h" #include "base/optional.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/threading/thread_task_runner_handle.h" #include "base/time/time.h" diff --git a/chrome/browser/about_flags_browsertest.cc b/chrome/browser/about_flags_browsertest.cc index 9811f3ffe1d0a6..206e81316e8701 100644 --- a/chrome/browser/about_flags_browsertest.cc +++ b/chrome/browser/about_flags_browsertest.cc @@ -5,7 +5,7 @@ #include "base/command_line.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "build/build_config.h" #include "chrome/browser/about_flags.h" diff --git a/chrome/browser/android/customtabs/custom_tabs_browsertest.cc b/chrome/browser/android/customtabs/custom_tabs_browsertest.cc index 9e386ea34eb79e..493be98c879400 100644 --- a/chrome/browser/android/customtabs/custom_tabs_browsertest.cc +++ b/chrome/browser/android/customtabs/custom_tabs_browsertest.cc @@ -5,7 +5,7 @@ #include "base/run_loop.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/android/customtabs/client_data_header_web_contents_observer.h" #include "chrome/test/base/android/android_browser_test.h" #include "chrome/test/base/chrome_test_utils.h" diff --git a/chrome/browser/android/customtabs/detached_resource_request_unittest.cc b/chrome/browser/android/customtabs/detached_resource_request_unittest.cc index 632f24e5375207..c5bd4d3a9899bd 100644 --- a/chrome/browser/android/customtabs/detached_resource_request_unittest.cc +++ b/chrome/browser/android/customtabs/detached_resource_request_unittest.cc @@ -11,7 +11,7 @@ #include "base/run_loop.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "chrome/browser/android/customtabs/detached_resource_request.h" #include "chrome/test/base/testing_profile.h" diff --git a/chrome/browser/android/explore_sites/block_site_task_unittest.cc b/chrome/browser/android/explore_sites/block_site_task_unittest.cc index 511897a486084d..7769afe9ab00ae 100644 --- a/chrome/browser/android/explore_sites/block_site_task_unittest.cc +++ b/chrome/browser/android/explore_sites/block_site_task_unittest.cc @@ -7,7 +7,7 @@ #include #include "base/bind.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/mock_callback.h" #include "chrome/browser/android/explore_sites/explore_sites_schema.h" #include "components/offline_pages/task/task.h" diff --git a/chrome/browser/android/explore_sites/clear_activities_task_unittest.cc b/chrome/browser/android/explore_sites/clear_activities_task_unittest.cc index d7500e66d49102..2673b0bd890b4b 100644 --- a/chrome/browser/android/explore_sites/clear_activities_task_unittest.cc +++ b/chrome/browser/android/explore_sites/clear_activities_task_unittest.cc @@ -7,7 +7,7 @@ #include #include "base/bind.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/mock_callback.h" #include "chrome/browser/android/explore_sites/explore_sites_schema.h" #include "components/offline_pages/core/offline_store_utils.h" diff --git a/chrome/browser/android/explore_sites/clear_catalog_task_unittest.cc b/chrome/browser/android/explore_sites/clear_catalog_task_unittest.cc index 8b8f9795d99b96..7be68bce9607f8 100644 --- a/chrome/browser/android/explore_sites/clear_catalog_task_unittest.cc +++ b/chrome/browser/android/explore_sites/clear_catalog_task_unittest.cc @@ -8,7 +8,7 @@ #include #include "base/bind.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/mock_callback.h" #include "chrome/browser/android/explore_sites/explore_sites_schema.h" #include "components/offline_pages/task/task.h" diff --git a/chrome/browser/android/explore_sites/explore_sites_fetcher_unittest.cc b/chrome/browser/android/explore_sites/explore_sites_fetcher_unittest.cc index 4df8a54fa7af05..707bf342490a62 100644 --- a/chrome/browser/android/explore_sites/explore_sites_fetcher_unittest.cc +++ b/chrome/browser/android/explore_sites/explore_sites_fetcher_unittest.cc @@ -7,7 +7,7 @@ #include #include "base/bind.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/mock_callback.h" #include "base/test/scoped_feature_list.h" diff --git a/chrome/browser/android/explore_sites/explore_sites_service_impl_unittest.cc b/chrome/browser/android/explore_sites/explore_sites_service_impl_unittest.cc index 7569f32de69634..515f18d28c9761 100644 --- a/chrome/browser/android/explore_sites/explore_sites_service_impl_unittest.cc +++ b/chrome/browser/android/explore_sites/explore_sites_service_impl_unittest.cc @@ -5,7 +5,7 @@ #include "chrome/browser/android/explore_sites/explore_sites_service_impl.h" #include "base/bind.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/mock_entropy_provider.h" #include "base/test/scoped_feature_list.h" diff --git a/chrome/browser/android/explore_sites/explore_sites_store_unittest.cc b/chrome/browser/android/explore_sites/explore_sites_store_unittest.cc index dabb0a5360b65f..305567a7ea26ab 100644 --- a/chrome/browser/android/explore_sites/explore_sites_store_unittest.cc +++ b/chrome/browser/android/explore_sites/explore_sites_store_unittest.cc @@ -14,7 +14,7 @@ #include "base/memory/ref_counted.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/test_mock_time_task_runner.h" #include "base/threading/thread_task_runner_handle.h" #include "sql/database.h" diff --git a/chrome/browser/android/explore_sites/get_catalog_task_unittest.cc b/chrome/browser/android/explore_sites/get_catalog_task_unittest.cc index de35e4ab9cc4f5..3f26ca78337551 100644 --- a/chrome/browser/android/explore_sites/get_catalog_task_unittest.cc +++ b/chrome/browser/android/explore_sites/get_catalog_task_unittest.cc @@ -7,7 +7,7 @@ #include #include "base/bind.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/mock_callback.h" #include "chrome/browser/android/explore_sites/block_site_task.h" #include "chrome/browser/android/explore_sites/explore_sites_schema.h" diff --git a/chrome/browser/android/explore_sites/get_images_task_unittest.cc b/chrome/browser/android/explore_sites/get_images_task_unittest.cc index 9e1c192f182470..9a13361a1e0f02 100644 --- a/chrome/browser/android/explore_sites/get_images_task_unittest.cc +++ b/chrome/browser/android/explore_sites/get_images_task_unittest.cc @@ -7,7 +7,7 @@ #include #include "base/bind.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/mock_callback.h" #include "chrome/browser/android/explore_sites/explore_sites_schema.h" #include "components/offline_pages/task/task.h" diff --git a/chrome/browser/android/explore_sites/get_version_task_unittest.cc b/chrome/browser/android/explore_sites/get_version_task_unittest.cc index 4b19d71b3d925d..851ec8929629ff 100644 --- a/chrome/browser/android/explore_sites/get_version_task_unittest.cc +++ b/chrome/browser/android/explore_sites/get_version_task_unittest.cc @@ -7,7 +7,7 @@ #include #include "base/bind.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/mock_callback.h" #include "chrome/browser/android/explore_sites/explore_sites_schema.h" #include "components/offline_pages/task/task.h" diff --git a/chrome/browser/android/explore_sites/history_statistics_reporter_unittest.cc b/chrome/browser/android/explore_sites/history_statistics_reporter_unittest.cc index 3171f1ddb3dcc6..7eb841635e8fbc 100644 --- a/chrome/browser/android/explore_sites/history_statistics_reporter_unittest.cc +++ b/chrome/browser/android/explore_sites/history_statistics_reporter_unittest.cc @@ -5,7 +5,7 @@ #include "chrome/browser/android/explore_sites/history_statistics_reporter.h" #include "base/files/scoped_temp_dir.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/task_environment.h" #include "base/time/clock.h" diff --git a/chrome/browser/android/explore_sites/image_helper_unittest.cc b/chrome/browser/android/explore_sites/image_helper_unittest.cc index 2595b68f1abbee..96be7e046339d1 100644 --- a/chrome/browser/android/explore_sites/image_helper_unittest.cc +++ b/chrome/browser/android/explore_sites/image_helper_unittest.cc @@ -8,7 +8,7 @@ #include #include "base/bind.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/task_environment.h" #include "base/test/test_simple_task_runner.h" diff --git a/chrome/browser/android/explore_sites/import_catalog_task_unittest.cc b/chrome/browser/android/explore_sites/import_catalog_task_unittest.cc index d16ff352dfdd71..1aa89daffcc401 100644 --- a/chrome/browser/android/explore_sites/import_catalog_task_unittest.cc +++ b/chrome/browser/android/explore_sites/import_catalog_task_unittest.cc @@ -7,7 +7,7 @@ #include #include "base/bind.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/mock_callback.h" #include "chrome/browser/android/explore_sites/catalog.pb.h" #include "chrome/browser/android/explore_sites/explore_sites_schema.h" diff --git a/chrome/browser/android/explore_sites/increment_shown_count_task_unittest.cc b/chrome/browser/android/explore_sites/increment_shown_count_task_unittest.cc index 4a58908d73c647..dab3e6e26365e0 100644 --- a/chrome/browser/android/explore_sites/increment_shown_count_task_unittest.cc +++ b/chrome/browser/android/explore_sites/increment_shown_count_task_unittest.cc @@ -5,7 +5,7 @@ #include "chrome/browser/android/explore_sites/increment_shown_count_task.h" #include "base/bind.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/android/explore_sites/explore_sites_schema.h" #include "components/offline_pages/task/task.h" #include "components/offline_pages/task/task_test_base.h" diff --git a/chrome/browser/android/explore_sites/record_site_click_task_unittest.cc b/chrome/browser/android/explore_sites/record_site_click_task_unittest.cc index 45e5beb5f4350d..eb792286d967ec 100644 --- a/chrome/browser/android/explore_sites/record_site_click_task_unittest.cc +++ b/chrome/browser/android/explore_sites/record_site_click_task_unittest.cc @@ -5,7 +5,7 @@ #include "chrome/browser/android/explore_sites/record_site_click_task.h" #include "base/bind.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/mock_callback.h" #include "chrome/browser/android/explore_sites/explore_sites_schema.h" #include "components/offline_pages/task/task.h" diff --git a/chrome/browser/android/feed/history/feed_history_helper_unittest.cc b/chrome/browser/android/feed/history/feed_history_helper_unittest.cc index af0e95bd2cadfd..44344fbacbe50d 100644 --- a/chrome/browser/android/feed/history/feed_history_helper_unittest.cc +++ b/chrome/browser/android/feed/history/feed_history_helper_unittest.cc @@ -7,7 +7,7 @@ #include #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/history/history_service_factory.h" #include "chrome/test/base/testing_profile.h" #include "components/history/core/browser/history_service.h" diff --git a/chrome/browser/android/webapk/webapk_icon_hasher_unittest.cc b/chrome/browser/android/webapk/webapk_icon_hasher_unittest.cc index 92cc43a0df134b..81f8920cb9ba94 100644 --- a/chrome/browser/android/webapk/webapk_icon_hasher_unittest.cc +++ b/chrome/browser/android/webapk/webapk_icon_hasher_unittest.cc @@ -13,7 +13,7 @@ #include "base/memory/ref_counted.h" #include "base/path_service.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/threading/thread_task_runner_handle.h" #include "content/public/test/browser_task_environment.h" #include "net/http/http_util.h" diff --git a/chrome/browser/apps/app_service/app_icon_factory_unittest.cc b/chrome/browser/apps/app_service/app_icon_factory_unittest.cc index 318aaacc4faf01..8ad0fc1a0a5b4f 100644 --- a/chrome/browser/apps/app_service/app_icon_factory_unittest.cc +++ b/chrome/browser/apps/app_service/app_icon_factory_unittest.cc @@ -11,7 +11,7 @@ #include "base/files/scoped_temp_dir.h" #include "base/path_service.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "cc/test/pixel_comparator.h" #include "cc/test/pixel_test_utils.h" #include "chrome/browser/apps/app_service/app_icon_factory.h" diff --git a/chrome/browser/apps/app_service/web_apps_base_browsertest.cc b/chrome/browser/apps/app_service/web_apps_base_browsertest.cc index a0827f7f1aef95..d197812dda1786 100644 --- a/chrome/browser/apps/app_service/web_apps_base_browsertest.cc +++ b/chrome/browser/apps/app_service/web_apps_base_browsertest.cc @@ -8,7 +8,7 @@ #include "base/files/file_path.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "chrome/browser/apps/app_service/app_service_proxy.h" #include "chrome/browser/apps/app_service/app_service_proxy_factory.h" diff --git a/chrome/browser/autofill/autofill_interactive_uitest.cc b/chrome/browser/autofill/autofill_interactive_uitest.cc index a816e70a2ac05f..2cb8f740964457 100644 --- a/chrome/browser/autofill/autofill_interactive_uitest.cc +++ b/chrome/browser/autofill/autofill_interactive_uitest.cc @@ -22,7 +22,7 @@ #include "base/strings/string_split.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/mock_entropy_provider.h" #include "base/test/scoped_feature_list.h" diff --git a/chrome/browser/autofill/automated_tests/cache_replayer.cc b/chrome/browser/autofill/automated_tests/cache_replayer.cc index e01b6b29799293..6470a98fce8122 100644 --- a/chrome/browser/autofill/automated_tests/cache_replayer.cc +++ b/chrome/browser/autofill/automated_tests/cache_replayer.cc @@ -19,7 +19,7 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/values.h" #include "net/base/url_util.h" #include "services/network/public/cpp/data_element.h" diff --git a/chrome/browser/banners/app_banner_manager_browsertest.cc b/chrome/browser/banners/app_banner_manager_browsertest.cc index 9d569a6745f868..e8109c2adc9197 100644 --- a/chrome/browser/banners/app_banner_manager_browsertest.cc +++ b/chrome/browser/banners/app_banner_manager_browsertest.cc @@ -11,7 +11,7 @@ #include "base/optional.h" #include "base/run_loop.h" #include "base/strings/string16.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/threading/thread_task_runner_handle.h" #include "chrome/browser/banners/app_banner_manager.h" diff --git a/chrome/browser/banners/app_banner_manager_desktop_browsertest.cc b/chrome/browser/banners/app_banner_manager_desktop_browsertest.cc index 6d158b3a9514af..3b993efd15c05b 100644 --- a/chrome/browser/banners/app_banner_manager_desktop_browsertest.cc +++ b/chrome/browser/banners/app_banner_manager_desktop_browsertest.cc @@ -10,7 +10,7 @@ #include "base/run_loop.h" #include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h" #include "chrome/app/chrome_command_ids.h" diff --git a/chrome/browser/browsing_data/access_context_audit_browsertest.cc b/chrome/browser/browsing_data/access_context_audit_browsertest.cc index 0666bb09181036..4995c0830d2f7f 100644 --- a/chrome/browser/browsing_data/access_context_audit_browsertest.cc +++ b/chrome/browser/browsing_data/access_context_audit_browsertest.cc @@ -5,7 +5,7 @@ #include #include "base/path_service.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/simple_test_clock.h" #include "base/test/test_timeouts.h" #include "chrome/browser/browsing_data/access_context_audit_service.h" diff --git a/chrome/browser/browsing_data/access_context_audit_database_unittest.cc b/chrome/browser/browsing_data/access_context_audit_database_unittest.cc index eb4602a999845b..af261e932a858e 100644 --- a/chrome/browser/browsing_data/access_context_audit_database_unittest.cc +++ b/chrome/browser/browsing_data/access_context_audit_database_unittest.cc @@ -7,7 +7,7 @@ #include "base/bind_helpers.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "components/content_settings/core/common/content_settings_utils.h" #include "sql/database.h" diff --git a/chrome/browser/browsing_data/access_context_audit_service_unittest.cc b/chrome/browser/browsing_data/access_context_audit_service_unittest.cc index a96c96115a0c1f..238b65fa1735db 100644 --- a/chrome/browser/browsing_data/access_context_audit_service_unittest.cc +++ b/chrome/browser/browsing_data/access_context_audit_service_unittest.cc @@ -6,7 +6,7 @@ #include "base/files/scoped_temp_dir.h" #include "base/i18n/time_formatting.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/test/simple_test_clock.h" #include "base/test/test_simple_task_runner.h" diff --git a/chrome/browser/browsing_data/browsing_data_remover_browsertest.cc b/chrome/browser/browsing_data/browsing_data_remover_browsertest.cc index 6d8f016e5aa3cc..b43d52f346cd82 100644 --- a/chrome/browser/browsing_data/browsing_data_remover_browsertest.cc +++ b/chrome/browser/browsing_data/browsing_data_remover_browsertest.cc @@ -15,7 +15,7 @@ #include "base/path_service.h" #include "base/run_loop.h" #include "base/strings/string_util.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h" #include "base/threading/thread_restrictions.h" diff --git a/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager_browsertest.cc b/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager_browsertest.cc index b6ad3549e6f9ed..da27698a4c1342 100644 --- a/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager_browsertest.cc +++ b/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager_browsertest.cc @@ -12,7 +12,7 @@ #include "base/optional.h" #include "base/path_service.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/test/test_mock_time_task_runner.h" #include "base/time/time.h" diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_unittest.cc b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_unittest.cc index 579827e64a8ea4..d569ed37a5605e 100644 --- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_unittest.cc +++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_unittest.cc @@ -22,7 +22,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/task/post_task.h" #include "base/task/thread_pool/thread_pool_instance.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h" #include "base/test/simple_test_clock.h" diff --git a/chrome/browser/browsing_data/counters/site_data_counting_helper_unittest.cc b/chrome/browser/browsing_data/counters/site_data_counting_helper_unittest.cc index 9cb0710c06e100..a7d245ec06ebc9 100644 --- a/chrome/browser/browsing_data/counters/site_data_counting_helper_unittest.cc +++ b/chrome/browser/browsing_data/counters/site_data_counting_helper_unittest.cc @@ -11,7 +11,7 @@ #include "base/files/file_util.h" #include "base/run_loop.h" #include "base/task/post_task.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/browsing_data/counters/site_data_counting_helper.h" #include "chrome/browser/profiles/profile.h" #include "chrome/test/base/testing_profile.h" diff --git a/chrome/browser/captive_portal/captive_portal_browsertest.cc b/chrome/browser/captive_portal/captive_portal_browsertest.cc index 47c173dfb8d10c..5b9a5dea16a2a5 100644 --- a/chrome/browser/captive_portal/captive_portal_browsertest.cc +++ b/chrome/browser/captive_portal/captive_portal_browsertest.cc @@ -25,7 +25,7 @@ #include "base/sequence_checker.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/values.h" #include "build/build_config.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/chromeos/account_manager/account_manager_policy_controller_browsertest.cc b/chrome/browser/chromeos/account_manager/account_manager_policy_controller_browsertest.cc index 93dfdf540d869e..0312c148a7b944 100644 --- a/chrome/browser/chromeos/account_manager/account_manager_policy_controller_browsertest.cc +++ b/chrome/browser/chromeos/account_manager/account_manager_policy_controller_browsertest.cc @@ -4,7 +4,7 @@ #include "base/files/scoped_temp_dir.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/browser_process_platform_part.h" #include "chrome/browser/chromeos/account_manager/account_manager_policy_controller.h" diff --git a/chrome/browser/chromeos/app_mode/app_session_unittest.cc b/chrome/browser/chromeos/app_mode/app_session_unittest.cc index ade25f4793f426..3a8c54f565f376 100644 --- a/chrome/browser/chromeos/app_mode/app_session_unittest.cc +++ b/chrome/browser/chromeos/app_mode/app_session_unittest.cc @@ -5,7 +5,7 @@ #include #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/chromeos/app_mode/app_session.h" #include "chrome/browser/ui/browser.h" #include "chrome/test/base/test_browser_window.h" diff --git a/chrome/browser/chromeos/apps/apk_web_app_installer_browsertest.cc b/chrome/browser/chromeos/apps/apk_web_app_installer_browsertest.cc index e68cb82e2ea774..c3985577e8a774 100644 --- a/chrome/browser/chromeos/apps/apk_web_app_installer_browsertest.cc +++ b/chrome/browser/chromeos/apps/apk_web_app_installer_browsertest.cc @@ -12,7 +12,7 @@ #include "base/macros.h" #include "base/run_loop.h" #include "base/scoped_observer.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/apps/app_service/app_service_proxy.h" #include "chrome/browser/apps/app_service/app_service_proxy_factory.h" #include "chrome/browser/chromeos/apps/apk_web_app_installer.h" diff --git a/chrome/browser/chromeos/arc/app_shortcuts/arc_app_shortcuts_menu_builder_unittest.cc b/chrome/browser/chromeos/arc/app_shortcuts/arc_app_shortcuts_menu_builder_unittest.cc index 40871b34094ca3..36bfcff235bf42 100644 --- a/chrome/browser/chromeos/arc/app_shortcuts/arc_app_shortcuts_menu_builder_unittest.cc +++ b/chrome/browser/chromeos/arc/app_shortcuts/arc_app_shortcuts_menu_builder_unittest.cc @@ -11,7 +11,7 @@ #include "base/run_loop.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/chromeos/arc/icon_decode_request.h" #include "chrome/browser/ui/app_list/arc/arc_app_test.h" #include "chrome/test/base/testing_profile.h" diff --git a/chrome/browser/chromeos/arc/app_shortcuts/arc_app_shortcuts_request_unittest.cc b/chrome/browser/chromeos/arc/app_shortcuts/arc_app_shortcuts_request_unittest.cc index 195774281f6d76..df9ef5f0cc69d2 100644 --- a/chrome/browser/chromeos/arc/app_shortcuts/arc_app_shortcuts_request_unittest.cc +++ b/chrome/browser/chromeos/arc/app_shortcuts/arc_app_shortcuts_request_unittest.cc @@ -11,7 +11,7 @@ #include "base/run_loop.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/chromeos/arc/app_shortcuts/arc_app_shortcut_item.h" #include "chrome/browser/chromeos/arc/icon_decode_request.h" #include "chrome/browser/ui/app_list/arc/arc_app_test.h" diff --git a/chrome/browser/chromeos/arc/auth/arc_active_directory_enrollment_token_fetcher_browsertest.cc b/chrome/browser/chromeos/arc/auth/arc_active_directory_enrollment_token_fetcher_browsertest.cc index b77d65b48dc454..534834f9f5ac7a 100644 --- a/chrome/browser/chromeos/arc/auth/arc_active_directory_enrollment_token_fetcher_browsertest.cc +++ b/chrome/browser/chromeos/arc/auth/arc_active_directory_enrollment_token_fetcher_browsertest.cc @@ -10,7 +10,7 @@ #include "base/command_line.h" #include "base/run_loop.h" #include "base/task/post_task.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/browser_process_platform_part.h" #include "chrome/browser/chromeos/arc/arc_support_host.h" diff --git a/chrome/browser/chromeos/arc/auth/arc_auth_service_browsertest.cc b/chrome/browser/chromeos/arc/auth/arc_auth_service_browsertest.cc index 871515a6510e60..45a74f877bab8d 100644 --- a/chrome/browser/chromeos/arc/auth/arc_auth_service_browsertest.cc +++ b/chrome/browser/chromeos/arc/auth/arc_auth_service_browsertest.cc @@ -17,7 +17,7 @@ #include "base/run_loop.h" #include "base/strings/stringprintf.h" #include "base/task/post_task.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/browser_process_platform_part.h" diff --git a/chrome/browser/chromeos/arc/auth/arc_robot_auth_code_fetcher_browsertest.cc b/chrome/browser/chromeos/arc/auth/arc_robot_auth_code_fetcher_browsertest.cc index 69e97ac554bad8..28568f130c4ee4 100644 --- a/chrome/browser/chromeos/arc/auth/arc_robot_auth_code_fetcher_browsertest.cc +++ b/chrome/browser/chromeos/arc/auth/arc_robot_auth_code_fetcher_browsertest.cc @@ -11,7 +11,7 @@ #include "base/macros.h" #include "base/run_loop.h" #include "base/task/post_task.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/browser_process_platform_part.h" #include "chrome/browser/chromeos/arc/auth/arc_auth_service.h" diff --git a/chrome/browser/chromeos/attestation/attestation_ca_client_unittest.cc b/chrome/browser/chromeos/attestation/attestation_ca_client_unittest.cc index 989b17c3c8929f..9c344372687288 100644 --- a/chrome/browser/chromeos/attestation/attestation_ca_client_unittest.cc +++ b/chrome/browser/chromeos/attestation/attestation_ca_client_unittest.cc @@ -6,7 +6,7 @@ #include "base/bind.h" #include "base/command_line.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/test/base/testing_browser_process.h" #include "chromeos/constants/chromeos_switches.h" #include "content/public/test/browser_task_environment.h" diff --git a/chrome/browser/chromeos/attestation/enrollment_certificate_uploader_impl_unittest.cc b/chrome/browser/chromeos/attestation/enrollment_certificate_uploader_impl_unittest.cc index 6e831873d58ee9..2db1ed9e56fe81 100644 --- a/chrome/browser/chromeos/attestation/enrollment_certificate_uploader_impl_unittest.cc +++ b/chrome/browser/chromeos/attestation/enrollment_certificate_uploader_impl_unittest.cc @@ -11,7 +11,7 @@ #include "base/location.h" #include "base/run_loop.h" #include "base/single_thread_task_runner.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/threading/thread_task_runner_handle.h" #include "chrome/browser/chromeos/attestation/attestation_key_payload.pb.h" #include "chrome/browser/chromeos/attestation/enrollment_certificate_uploader_impl.h" diff --git a/chrome/browser/chromeos/borealis/borealis_app_launcher_unittest.cc b/chrome/browser/chromeos/borealis/borealis_app_launcher_unittest.cc index e7535967d69417..98bce646d4dbc3 100644 --- a/chrome/browser/chromeos/borealis/borealis_app_launcher_unittest.cc +++ b/chrome/browser/chromeos/borealis/borealis_app_launcher_unittest.cc @@ -7,7 +7,7 @@ #include "base/bind.h" #include "base/callback_forward.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/chromeos/borealis/borealis_context.h" #include "chrome/browser/chromeos/borealis/borealis_util.h" #include "chrome/browser/chromeos/guest_os/guest_os_registry_service.h" diff --git a/chrome/browser/chromeos/borealis/borealis_context_manager_unittest.cc b/chrome/browser/chromeos/borealis/borealis_context_manager_unittest.cc index df564307525654..f3c7e1497f3809 100644 --- a/chrome/browser/chromeos/borealis/borealis_context_manager_unittest.cc +++ b/chrome/browser/chromeos/borealis/borealis_context_manager_unittest.cc @@ -9,7 +9,7 @@ #include "base/bind_helpers.h" #include "base/callback_forward.h" #include "base/containers/queue.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/chromeos/borealis/borealis_context_manager.h" #include "chrome/browser/chromeos/borealis/borealis_context_manager_factory.h" #include "chrome/browser/chromeos/borealis/borealis_task.h" diff --git a/chrome/browser/chromeos/child_accounts/time_limits/app_service_wrapper_unittest.cc b/chrome/browser/chromeos/child_accounts/time_limits/app_service_wrapper_unittest.cc index 8a3ca03a9a25af..3a98408aa9e23c 100644 --- a/chrome/browser/chromeos/child_accounts/time_limits/app_service_wrapper_unittest.cc +++ b/chrome/browser/chromeos/child_accounts/time_limits/app_service_wrapper_unittest.cc @@ -16,7 +16,7 @@ #include "base/optional.h" #include "base/run_loop.h" #include "base/strings/strcat.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/values.h" #include "chrome/browser/apps/app_service/app_service_test.h" diff --git a/chrome/browser/chromeos/chromebox_for_meetings/service_adaptor_unittest.cc b/chrome/browser/chromeos/chromebox_for_meetings/service_adaptor_unittest.cc index bccf34f8926f4c..8978cb45f54aa2 100644 --- a/chrome/browser/chromeos/chromebox_for_meetings/service_adaptor_unittest.cc +++ b/chrome/browser/chromeos/chromebox_for_meetings/service_adaptor_unittest.cc @@ -11,7 +11,7 @@ #include "base/macros.h" #include "base/optional.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/mock_callback.h" #include "base/test/task_environment.h" #include "chrome/browser/chromeos/chromebox_for_meetings/fake_service_context.h" diff --git a/chrome/browser/chromeos/crosapi/account_manager_ash_unittest.cc b/chrome/browser/chromeos/crosapi/account_manager_ash_unittest.cc index 9ce7a817d7ec7a..83bc6208571112 100644 --- a/chrome/browser/chromeos/crosapi/account_manager_ash_unittest.cc +++ b/chrome/browser/chromeos/crosapi/account_manager_ash_unittest.cc @@ -10,7 +10,7 @@ #include #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "chromeos/components/account_manager/tokens.pb.h" #include "chromeos/crosapi/mojom/account_manager.mojom-test-utils.h" diff --git a/chrome/browser/chromeos/crosapi/test_mojo_connection_manager_unittest.cc b/chrome/browser/chromeos/crosapi/test_mojo_connection_manager_unittest.cc index 3c3c70dbfaa1c8..f0535ec64ed6e0 100644 --- a/chrome/browser/chromeos/crosapi/test_mojo_connection_manager_unittest.cc +++ b/chrome/browser/chromeos/crosapi/test_mojo_connection_manager_unittest.cc @@ -16,7 +16,7 @@ #include "base/run_loop.h" #include "base/strings/string_number_conversions.h" #include "base/task/thread_pool.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/multiprocess_test.h" #include "base/test/task_environment.h" #include "base/test/test_timeouts.h" diff --git a/chrome/browser/chromeos/crostini/crostini_disk_unittest.cc b/chrome/browser/chromeos/crostini/crostini_disk_unittest.cc index 7df05ae0881cf5..edc8d84f12a83b 100644 --- a/chrome/browser/chromeos/crostini/crostini_disk_unittest.cc +++ b/chrome/browser/chromeos/crostini/crostini_disk_unittest.cc @@ -7,7 +7,7 @@ #include #include -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/chromeos/crostini/crostini_manager.h" #include "chrome/browser/chromeos/crostini/crostini_test_helper.h" #include "chrome/browser/chromeos/crostini/crostini_types.mojom.h" diff --git a/chrome/browser/chromeos/crostini/crostini_features_unittest.cc b/chrome/browser/chromeos/crostini/crostini_features_unittest.cc index e059db600b4bab..f6fe9f394aaa03 100644 --- a/chrome/browser/chromeos/crostini/crostini_features_unittest.cc +++ b/chrome/browser/chromeos/crostini/crostini_features_unittest.cc @@ -5,7 +5,7 @@ #include "chrome/browser/chromeos/crostini/crostini_features.h" #include "base/callback.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "chrome/browser/chromeos/crostini/crostini_pref_names.h" #include "chrome/browser/chromeos/crostini/fake_crostini_features.h" diff --git a/chrome/browser/chromeos/crostini/crostini_installer_unittest.cc b/chrome/browser/chromeos/crostini/crostini_installer_unittest.cc index 47d66350e7835d..5adad1ad5b8e11 100644 --- a/chrome/browser/chromeos/crostini/crostini_installer_unittest.cc +++ b/chrome/browser/chromeos/crostini/crostini_installer_unittest.cc @@ -10,7 +10,7 @@ #include "base/memory/ptr_util.h" #include "base/optional.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "chrome/browser/chromeos/crostini/ansible/ansible_management_test_helper.h" #include "chrome/browser/chromeos/crostini/crostini_installer_ui_delegate.h" diff --git a/chrome/browser/chromeos/crostini/crostini_manager_unittest.cc b/chrome/browser/chromeos/crostini/crostini_manager_unittest.cc index d694b3506a22e3..6f6b7230273623 100644 --- a/chrome/browser/chromeos/crostini/crostini_manager_unittest.cc +++ b/chrome/browser/chromeos/crostini/crostini_manager_unittest.cc @@ -13,7 +13,7 @@ #include "base/files/file_util.h" #include "base/memory/ptr_util.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h" #include "chrome/browser/chromeos/crostini/ansible/ansible_management_test_helper.h" diff --git a/chrome/browser/chromeos/customization/customization_wallpaper_downloader_browsertest.cc b/chrome/browser/chromeos/customization/customization_wallpaper_downloader_browsertest.cc index f8a2387ddaa227..de642336c80df6 100644 --- a/chrome/browser/chromeos/customization/customization_wallpaper_downloader_browsertest.cc +++ b/chrome/browser/chromeos/customization/customization_wallpaper_downloader_browsertest.cc @@ -12,7 +12,7 @@ #include "base/macros.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/time/time.h" #include "chrome/browser/chromeos/customization/customization_document.h" #include "chrome/browser/chromeos/customization/customization_wallpaper_downloader.h" diff --git a/chrome/browser/chromeos/dbus/cryptohome_key_delegate_service_provider_browsertest.cc b/chrome/browser/chromeos/dbus/cryptohome_key_delegate_service_provider_browsertest.cc index 77eabcda373c22..e30d96bfc089ea 100644 --- a/chrome/browser/chromeos/dbus/cryptohome_key_delegate_service_provider_browsertest.cc +++ b/chrome/browser/chromeos/dbus/cryptohome_key_delegate_service_provider_browsertest.cc @@ -11,7 +11,7 @@ #include "base/macros.h" #include "base/run_loop.h" #include "base/strings/string_piece.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/chromeos/certificate_provider/certificate_provider.h" #include "chrome/browser/chromeos/certificate_provider/certificate_provider_service.h" #include "chrome/browser/chromeos/certificate_provider/certificate_provider_service_factory.h" diff --git a/chrome/browser/chromeos/display/quirks_browsertest.cc b/chrome/browser/chromeos/display/quirks_browsertest.cc index 0c32b4203a1147..c9eb27f082c9e5 100644 --- a/chrome/browser/chromeos/display/quirks_browsertest.cc +++ b/chrome/browser/chromeos/display/quirks_browsertest.cc @@ -6,7 +6,7 @@ #include "base/files/file_util.h" #include "base/memory/ptr_util.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/threading/thread_restrictions.h" #include "chrome/test/base/in_process_browser_test.h" #include "components/quirks/quirks_manager.h" diff --git a/chrome/browser/chromeos/drive/drive_integration_service_browsertest.cc b/chrome/browser/chromeos/drive/drive_integration_service_browsertest.cc index 51a386653434aa..3a8a926e53cd6e 100644 --- a/chrome/browser/chromeos/drive/drive_integration_service_browsertest.cc +++ b/chrome/browser/chromeos/drive/drive_integration_service_browsertest.cc @@ -7,7 +7,7 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/files/file_util.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/threading/thread_restrictions.h" #include "chrome/browser/chromeos/drive/drivefs_test_support.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/chromeos/drive/drivefs_test_support.cc b/chrome/browser/chromeos/drive/drivefs_test_support.cc index e4d160e8668b4b..68d5406e87440f 100644 --- a/chrome/browser/chromeos/drive/drivefs_test_support.cc +++ b/chrome/browser/chromeos/drive/drivefs_test_support.cc @@ -12,7 +12,7 @@ #include "base/hash/md5.h" #include "base/json/json_writer.h" #include "base/path_service.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/chromeos/profiles/profile_helper.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_constants.h" diff --git a/chrome/browser/chromeos/extensions/autotest_private/autotest_private_apitest.cc b/chrome/browser/chromeos/extensions/autotest_private/autotest_private_apitest.cc index 54547be2f12452..dba5c17e233c2e 100644 --- a/chrome/browser/chromeos/extensions/autotest_private/autotest_private_apitest.cc +++ b/chrome/browser/chromeos/extensions/autotest_private/autotest_private_apitest.cc @@ -6,7 +6,7 @@ #include "ash/public/cpp/test/shell_test_api.h" #include "base/callback_forward.h" #include "base/macros.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "build/build_config.h" #include "chrome/browser/chromeos/arc/arc_util.h" #include "chrome/browser/chromeos/arc/session/arc_session_manager.h" diff --git a/chrome/browser/chromeos/extensions/quick_unlock_private/quick_unlock_private_api_unittest.cc b/chrome/browser/chromeos/extensions/quick_unlock_private/quick_unlock_private_api_unittest.cc index 9186e052e79a58..dd7b3a32127a51 100644 --- a/chrome/browser/chromeos/extensions/quick_unlock_private/quick_unlock_private_api_unittest.cc +++ b/chrome/browser/chromeos/extensions/quick_unlock_private/quick_unlock_private_api_unittest.cc @@ -17,7 +17,7 @@ #include "base/stl_util.h" #include "base/strings/strcat.h" #include "base/strings/string_piece_forward.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h" #include "base/threading/thread_task_runner_handle.h" diff --git a/chrome/browser/chromeos/file_manager/file_manager_browsertest_base.cc b/chrome/browser/chromeos/file_manager/file_manager_browsertest_base.cc index 4aa1642b1aecc6..eb6fb17e15e6f3 100644 --- a/chrome/browser/chromeos/file_manager/file_manager_browsertest_base.cc +++ b/chrome/browser/chromeos/file_manager/file_manager_browsertest_base.cc @@ -25,7 +25,7 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_piece.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/threading/thread_restrictions.h" #include "base/time/time.h" #include "chrome/browser/apps/app_service/app_launch_params.h" diff --git a/chrome/browser/chromeos/file_manager/file_manager_test_util.cc b/chrome/browser/chromeos/file_manager/file_manager_test_util.cc index bf8db02a3c003e..bc772c172c1877 100644 --- a/chrome/browser/chromeos/file_manager/file_manager_test_util.cc +++ b/chrome/browser/chromeos/file_manager/file_manager_test_util.cc @@ -7,7 +7,7 @@ #include "base/files/file_enumerator.h" #include "base/files/file_util.h" #include "base/path_service.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/apps/app_service/app_service_proxy.h" #include "chrome/browser/apps/app_service/app_service_proxy_factory.h" #include "chrome/browser/chromeos/file_manager/app_id.h" diff --git a/chrome/browser/chromeos/file_manager/file_tasks_browsertest.cc b/chrome/browser/chromeos/file_manager/file_tasks_browsertest.cc index fe218ad9b7843c..f23957bcad0b80 100644 --- a/chrome/browser/chromeos/file_manager/file_tasks_browsertest.cc +++ b/chrome/browser/chromeos/file_manager/file_tasks_browsertest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/bind.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/chromeos/file_manager/app_id.h" #include "chrome/browser/chromeos/file_manager/file_manager_test_util.h" #include "chrome/browser/chromeos/file_manager/file_tasks.h" diff --git a/chrome/browser/chromeos/file_manager/file_tasks_notifier_unittest.cc b/chrome/browser/chromeos/file_manager/file_tasks_notifier_unittest.cc index 7269cd71b9bbf5..2666b431ea00a7 100644 --- a/chrome/browser/chromeos/file_manager/file_tasks_notifier_unittest.cc +++ b/chrome/browser/chromeos/file_manager/file_tasks_notifier_unittest.cc @@ -11,7 +11,7 @@ #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/scoped_observer.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/chromeos/file_manager/file_tasks_observer.h" #include "chrome/browser/chromeos/file_manager/path_util.h" #include "chrome/test/base/testing_profile.h" diff --git a/chrome/browser/chromeos/file_manager/file_watcher_unittest.cc b/chrome/browser/chromeos/file_manager/file_watcher_unittest.cc index 9c7cab38e4b536..fc3533b07d06ae 100644 --- a/chrome/browser/chromeos/file_manager/file_watcher_unittest.cc +++ b/chrome/browser/chromeos/file_manager/file_watcher_unittest.cc @@ -11,7 +11,7 @@ #include "base/files/scoped_temp_dir.h" #include "base/run_loop.h" #include "base/task/thread_pool/thread_pool_instance.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/chromeos/crostini/crostini_util.h" #include "chrome/browser/chromeos/file_manager/path_util.h" #include "chrome/test/base/testing_profile.h" diff --git a/chrome/browser/chromeos/kerberos/kerberos_credentials_manager_test.cc b/chrome/browser/chromeos/kerberos/kerberos_credentials_manager_test.cc index feac3de226fb22..81e12bbeb2cce6 100644 --- a/chrome/browser/chromeos/kerberos/kerberos_credentials_manager_test.cc +++ b/chrome/browser/chromeos/kerberos/kerberos_credentials_manager_test.cc @@ -14,7 +14,7 @@ #include "base/optional.h" #include "base/run_loop.h" #include "base/stl_util.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "chrome/browser/chromeos/authpolicy/kerberos_files_handler.h" #include "chrome/browser/chromeos/login/session/user_session_manager.h" diff --git a/chrome/browser/chromeos/login/challenge_response_auth_keys_loader_browsertest.cc b/chrome/browser/chromeos/login/challenge_response_auth_keys_loader_browsertest.cc index 0553bd89f69d2d..18fc172cd27e47 100644 --- a/chrome/browser/chromeos/login/challenge_response_auth_keys_loader_browsertest.cc +++ b/chrome/browser/chromeos/login/challenge_response_auth_keys_loader_browsertest.cc @@ -8,7 +8,7 @@ #include "base/run_loop.h" #include "base/scoped_observer.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/chromeos/certificate_provider/test_certificate_provider_extension.h" #include "chrome/browser/chromeos/login/test/device_state_mixin.h" #include "chrome/browser/chromeos/login/test/oobe_base_test.h" diff --git a/chrome/browser/chromeos/login/error_screen_browsertest.cc b/chrome/browser/chromeos/login/error_screen_browsertest.cc index d585a80f6d010d..3c794284b0aec8 100644 --- a/chrome/browser/chromeos/login/error_screen_browsertest.cc +++ b/chrome/browser/chromeos/login/error_screen_browsertest.cc @@ -5,7 +5,7 @@ #include "ash/public/cpp/login_screen_test_api.h" #include "base/run_loop.h" #include "base/strings/strcat.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/chromeos/app_mode/fake_cws.h" #include "chrome/browser/chromeos/login/app_mode/kiosk_launch_controller.h" diff --git a/chrome/browser/chromeos/login/eula_browsertest.cc b/chrome/browser/chromeos/login/eula_browsertest.cc index 397309c66ff052..075f397849ac58 100644 --- a/chrome/browser/chromeos/login/eula_browsertest.cc +++ b/chrome/browser/chromeos/login/eula_browsertest.cc @@ -14,7 +14,7 @@ #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/task/post_task.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/login/test/dialog_window_waiter.h" diff --git a/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc b/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc index 854b45fc275b2d..1c9dbbb1fea7f9 100644 --- a/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc +++ b/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc @@ -17,7 +17,7 @@ #include "base/path_service.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/threading/thread_restrictions.h" #include "base/threading/thread_task_runner_handle.h" #include "base/timer/timer.h" diff --git a/chrome/browser/chromeos/login/login_screen_policy_browsertest.cc b/chrome/browser/chromeos/login/login_screen_policy_browsertest.cc index 65019f970d7aa4..9d3a9d8f44299f 100644 --- a/chrome/browser/chromeos/login/login_screen_policy_browsertest.cc +++ b/chrome/browser/chromeos/login/login_screen_policy_browsertest.cc @@ -14,7 +14,7 @@ #include "base/memory/ref_counted.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/threading/thread_task_runner_handle.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" diff --git a/chrome/browser/chromeos/login/profile_auth_data_unittest.cc b/chrome/browser/chromeos/login/profile_auth_data_unittest.cc index 9a4761abcb6232..97a4d9eca4c9e2 100644 --- a/chrome/browser/chromeos/login/profile_auth_data_unittest.cc +++ b/chrome/browser/chromeos/login/profile_auth_data_unittest.cc @@ -14,7 +14,7 @@ #include "base/run_loop.h" #include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/time/time.h" #include "chrome/test/base/testing_profile.h" #include "content/public/browser/browser_context.h" diff --git a/chrome/browser/chromeos/login/quick_unlock/pin_migration_browsertest.cc b/chrome/browser/chromeos/login/quick_unlock/pin_migration_browsertest.cc index 84bab5a2e91470..e47b82dac26eb6 100644 --- a/chrome/browser/chromeos/login/quick_unlock/pin_migration_browsertest.cc +++ b/chrome/browser/chromeos/login/quick_unlock/pin_migration_browsertest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/chromeos/login/login_manager_test.h" #include "chrome/browser/chromeos/login/quick_unlock/pin_backend.h" #include "chrome/browser/chromeos/login/quick_unlock/pin_storage_prefs.h" diff --git a/chrome/browser/chromeos/login/saml/saml_browsertest.cc b/chrome/browser/chromeos/login/saml/saml_browsertest.cc index 1fd40811ee5285..b38ff05813e1c6 100644 --- a/chrome/browser/chromeos/login/saml/saml_browsertest.cc +++ b/chrome/browser/chromeos/login/saml/saml_browsertest.cc @@ -25,7 +25,7 @@ #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/task/post_task.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/gmock_callback_support.h" #include "base/test/metrics/histogram_tester.h" #include "base/threading/thread_restrictions.h" diff --git a/chrome/browser/chromeos/login/webview_login_browsertest.cc b/chrome/browser/chromeos/login/webview_login_browsertest.cc index 19299d1b0e123e..63dc78b0bed023 100644 --- a/chrome/browser/chromeos/login/webview_login_browsertest.cc +++ b/chrome/browser/chromeos/login/webview_login_browsertest.cc @@ -20,7 +20,7 @@ #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/threading/platform_thread.h" #include "base/threading/thread_restrictions.h" diff --git a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc index aa48c59b6a3843..4cb56aa51fd179 100644 --- a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc +++ b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc @@ -13,7 +13,7 @@ #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/test_mock_time_task_runner.h" #include "base/time/time.h" diff --git a/chrome/browser/chromeos/nearby/nearby_process_manager_impl_unittest.cc b/chrome/browser/chromeos/nearby/nearby_process_manager_impl_unittest.cc index 50601a29eaffad..3decc2ee053f58 100644 --- a/chrome/browser/chromeos/nearby/nearby_process_manager_impl_unittest.cc +++ b/chrome/browser/chromeos/nearby/nearby_process_manager_impl_unittest.cc @@ -11,7 +11,7 @@ #include "base/memory/ptr_util.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/nearby/nearby_connections_dependencies_provider.h" diff --git a/chrome/browser/chromeos/plugin_vm/plugin_vm_files_unittest.cc b/chrome/browser/chromeos/plugin_vm/plugin_vm_files_unittest.cc index 70f7fe4740ed5c..08cf22e21cf15a 100644 --- a/chrome/browser/chromeos/plugin_vm/plugin_vm_files_unittest.cc +++ b/chrome/browser/chromeos/plugin_vm/plugin_vm_files_unittest.cc @@ -7,7 +7,7 @@ #include "ash/public/cpp/shelf_model.h" #include "base/bind.h" #include "base/files/file_util.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/mock_callback.h" #include "chrome/browser/chromeos/crostini/crostini_test_helper.h" #include "chrome/browser/chromeos/file_manager/path_util.h" diff --git a/chrome/browser/chromeos/plugin_vm/plugin_vm_installer_unittest.cc b/chrome/browser/chromeos/plugin_vm/plugin_vm_installer_unittest.cc index 2f4cbe0b7289d7..0f7013a5cdedae 100644 --- a/chrome/browser/chromeos/plugin_vm/plugin_vm_installer_unittest.cc +++ b/chrome/browser/chromeos/plugin_vm/plugin_vm_installer_unittest.cc @@ -14,7 +14,7 @@ #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/optional.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/gmock_callback_support.h" #include "base/test/metrics/histogram_tester.h" #include "chrome/browser/chromeos/login/users/mock_user_manager.h" diff --git a/chrome/browser/chromeos/plugin_vm/plugin_vm_manager_impl_unittest.cc b/chrome/browser/chromeos/plugin_vm/plugin_vm_manager_impl_unittest.cc index 5f7e1590a1b468..f9c8eb974ac906 100644 --- a/chrome/browser/chromeos/plugin_vm/plugin_vm_manager_impl_unittest.cc +++ b/chrome/browser/chromeos/plugin_vm/plugin_vm_manager_impl_unittest.cc @@ -6,7 +6,7 @@ #include "ash/public/cpp/shelf_model.h" #include "base/files/file_util.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/mock_callback.h" #include "chrome/browser/chromeos/file_manager/path_util.h" diff --git a/chrome/browser/chromeos/policy/minimum_version_policy_handler_unittest.cc b/chrome/browser/chromeos/policy/minimum_version_policy_handler_unittest.cc index 99dbde83aa4c2e..9b188051d5363d 100644 --- a/chrome/browser/chromeos/policy/minimum_version_policy_handler_unittest.cc +++ b/chrome/browser/chromeos/policy/minimum_version_policy_handler_unittest.cc @@ -5,7 +5,7 @@ #include "chrome/browser/chromeos/policy/minimum_version_policy_handler.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h" #include "base/time/default_clock.h" diff --git a/chrome/browser/chromeos/policy/remote_commands/device_command_get_available_routines_job_unittest.cc b/chrome/browser/chromeos/policy/remote_commands/device_command_get_available_routines_job_unittest.cc index 5bd96bcb550944..23c713939d680d 100644 --- a/chrome/browser/chromeos/policy/remote_commands/device_command_get_available_routines_job_unittest.cc +++ b/chrome/browser/chromeos/policy/remote_commands/device_command_get_available_routines_job_unittest.cc @@ -9,7 +9,7 @@ #include "base/json/json_writer.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/time/time.h" #include "base/values.h" diff --git a/chrome/browser/chromeos/policy/remote_commands/device_command_get_routine_update_job_unittest.cc b/chrome/browser/chromeos/policy/remote_commands/device_command_get_routine_update_job_unittest.cc index defe0ce00cc2e9..858802ec402669 100644 --- a/chrome/browser/chromeos/policy/remote_commands/device_command_get_routine_update_job_unittest.cc +++ b/chrome/browser/chromeos/policy/remote_commands/device_command_get_routine_update_job_unittest.cc @@ -10,7 +10,7 @@ #include "base/json/json_writer.h" #include "base/optional.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/time/time.h" #include "base/values.h" diff --git a/chrome/browser/chromeos/policy/remote_commands/device_command_remote_powerwash_job_unittest.cc b/chrome/browser/chromeos/policy/remote_commands/device_command_remote_powerwash_job_unittest.cc index 2a3f6dc426a355..bcb0c6b9198e50 100644 --- a/chrome/browser/chromeos/policy/remote_commands/device_command_remote_powerwash_job_unittest.cc +++ b/chrome/browser/chromeos/policy/remote_commands/device_command_remote_powerwash_job_unittest.cc @@ -10,7 +10,7 @@ #include "base/location.h" #include "base/macros.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/test_mock_time_task_runner.h" #include "base/threading/sequenced_task_runner_handle.h" #include "base/time/time.h" diff --git a/chrome/browser/chromeos/policy/remote_commands/device_command_run_routine_job_unittest.cc b/chrome/browser/chromeos/policy/remote_commands/device_command_run_routine_job_unittest.cc index c3b0b6745428ce..b5e9e2fd914705 100644 --- a/chrome/browser/chromeos/policy/remote_commands/device_command_run_routine_job_unittest.cc +++ b/chrome/browser/chromeos/policy/remote_commands/device_command_run_routine_job_unittest.cc @@ -10,7 +10,7 @@ #include "base/json/json_writer.h" #include "base/optional.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/time/time.h" #include "base/values.h" diff --git a/chrome/browser/chromeos/policy/status_collector/app_info_generator_unittest.cc b/chrome/browser/chromeos/policy/status_collector/app_info_generator_unittest.cc index a0bcddd965541b..4f079b3c0fea4e 100644 --- a/chrome/browser/chromeos/policy/status_collector/app_info_generator_unittest.cc +++ b/chrome/browser/chromeos/policy/status_collector/app_info_generator_unittest.cc @@ -7,7 +7,7 @@ #include #include "base/strings/stringprintf.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/simple_test_clock.h" #include "chrome/browser/apps/app_service/app_service_proxy.h" #include "chrome/browser/apps/app_service/app_service_proxy_factory.h" diff --git a/chrome/browser/chromeos/policy/system_proxy_manager_browsertest.cc b/chrome/browser/chromeos/policy/system_proxy_manager_browsertest.cc index c47a79fea59d47..74d435df413822 100644 --- a/chrome/browser/chromeos/policy/system_proxy_manager_browsertest.cc +++ b/chrome/browser/chromeos/policy/system_proxy_manager_browsertest.cc @@ -9,7 +9,7 @@ #include "base/run_loop.h" #include "base/strings/stringprintf.h" #include "base/task/current_thread.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/chromeos/login/test/device_state_mixin.h" #include "chrome/browser/chromeos/policy/affiliation_test_helper.h" #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" diff --git a/chrome/browser/chromeos/scanning/lorgnette_scanner_manager_unittest.cc b/chrome/browser/chromeos/scanning/lorgnette_scanner_manager_unittest.cc index f87ad9a7523adb..c6e4fd4f806c94 100644 --- a/chrome/browser/chromeos/scanning/lorgnette_scanner_manager_unittest.cc +++ b/chrome/browser/chromeos/scanning/lorgnette_scanner_manager_unittest.cc @@ -15,7 +15,7 @@ #include "base/containers/flat_map.h" #include "base/optional.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "chrome/browser/chromeos/scanning/zeroconf_scanner_detector.h" #include "chrome/browser/chromeos/scanning/zeroconf_scanner_detector_utils.h" diff --git a/chrome/browser/chromeos/secure_channel/nearby_connection_broker_impl_unittest.cc b/chrome/browser/chromeos/secure_channel/nearby_connection_broker_impl_unittest.cc index 973e9d97de096f..ec79e2cf8979fd 100644 --- a/chrome/browser/chromeos/secure_channel/nearby_connection_broker_impl_unittest.cc +++ b/chrome/browser/chromeos/secure_channel/nearby_connection_broker_impl_unittest.cc @@ -8,7 +8,7 @@ #include #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "chrome/browser/chromeos/secure_channel/fake_nearby_endpoint_finder.h" #include "chromeos/services/nearby/public/cpp/mock_nearby_connections.h" diff --git a/chrome/browser/chromeos/secure_channel/nearby_connector_impl_unittest.cc b/chrome/browser/chromeos/secure_channel/nearby_connector_impl_unittest.cc index 72f0dbf9b04303..29fbacb963900e 100644 --- a/chrome/browser/chromeos/secure_channel/nearby_connector_impl_unittest.cc +++ b/chrome/browser/chromeos/secure_channel/nearby_connector_impl_unittest.cc @@ -9,7 +9,7 @@ #include "base/containers/flat_map.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "chrome/browser/chromeos/secure_channel/fake_nearby_connection_broker.h" #include "chrome/browser/chromeos/secure_channel/fake_nearby_endpoint_finder.h" diff --git a/chrome/browser/chromeos/smb_client/smb_file_system_unittest.cc b/chrome/browser/chromeos/smb_client/smb_file_system_unittest.cc index f7bf19033a2a3a..09908ebb1a7776 100644 --- a/chrome/browser/chromeos/smb_client/smb_file_system_unittest.cc +++ b/chrome/browser/chromeos/smb_client/smb_file_system_unittest.cc @@ -10,7 +10,7 @@ #include "base/bind.h" #include "base/files/file_path.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/chromeos/file_system_provider/provided_file_system_info.h" #include "chromeos/dbus/dbus_thread_manager.h" #include "chromeos/dbus/fake_smb_provider_client.h" diff --git a/chrome/browser/chromeos/smb_client/smb_kerberos_credentials_updater_unittest.cc b/chrome/browser/chromeos/smb_client/smb_kerberos_credentials_updater_unittest.cc index 84a8762f345d79..39dee2ada8c0d0 100644 --- a/chrome/browser/chromeos/smb_client/smb_kerberos_credentials_updater_unittest.cc +++ b/chrome/browser/chromeos/smb_client/smb_kerberos_credentials_updater_unittest.cc @@ -7,7 +7,7 @@ #include #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/chromeos/kerberos/kerberos_credentials_manager.h" #include "chrome/browser/chromeos/login/users/mock_user_manager.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/chromeos/smb_client/smb_service_unittest.cc b/chrome/browser/chromeos/smb_client/smb_service_unittest.cc index 0a2834689ad326..fbd998ef7e0919 100644 --- a/chrome/browser/chromeos/smb_client/smb_service_unittest.cc +++ b/chrome/browser/chromeos/smb_client/smb_service_unittest.cc @@ -18,7 +18,7 @@ #include "base/strings/strcat.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/gmock_callback_support.h" #include "base/test/scoped_feature_list.h" #include "base/test/simple_test_tick_clock.h" diff --git a/chrome/browser/chromeos/smb_client/smbfs_share_unittest.cc b/chrome/browser/chromeos/smb_client/smbfs_share_unittest.cc index 97e4e847a44ee6..1997fb9ed12074 100644 --- a/chrome/browser/chromeos/smb_client/smbfs_share_unittest.cc +++ b/chrome/browser/chromeos/smb_client/smbfs_share_unittest.cc @@ -8,7 +8,7 @@ #include "base/run_loop.h" #include "base/strings/string_split.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/gmock_callback_support.h" #include "base/test/task_environment.h" #include "chrome/browser/chromeos/file_manager/fake_disk_mount_manager.h" diff --git a/chrome/browser/chromeos/ui/update_required_notification_unittest.cc b/chrome/browser/chromeos/ui/update_required_notification_unittest.cc index 63106399d39d8f..5c2fea7fd4914b 100644 --- a/chrome/browser/chromeos/ui/update_required_notification_unittest.cc +++ b/chrome/browser/chromeos/ui/update_required_notification_unittest.cc @@ -7,7 +7,7 @@ #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" #include "base/system/sys_info.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/time/default_clock.h" #include "base/values.h" diff --git a/chrome/browser/chromeos/web_applications/media_app_integration_browsertest.cc b/chrome/browser/chromeos/web_applications/media_app_integration_browsertest.cc index 68a6af00b7b380..7bbeed6801ada8 100644 --- a/chrome/browser/chromeos/web_applications/media_app_integration_browsertest.cc +++ b/chrome/browser/chromeos/web_applications/media_app_integration_browsertest.cc @@ -6,7 +6,7 @@ #include "base/files/file_util.h" #include "base/path_service.h" #include "base/strings/string_util.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "chrome/browser/apps/app_service/app_launch_params.h" #include "chrome/browser/chromeos/file_manager/file_manager_test_util.h" diff --git a/chrome/browser/chromeos/wilco_dtc_supportd/testing_wilco_dtc_supportd_bridge_wrapper.cc b/chrome/browser/chromeos/wilco_dtc_supportd/testing_wilco_dtc_supportd_bridge_wrapper.cc index 9135dae5274b2d..7dcee9d44343dc 100644 --- a/chrome/browser/chromeos/wilco_dtc_supportd/testing_wilco_dtc_supportd_bridge_wrapper.cc +++ b/chrome/browser/chromeos/wilco_dtc_supportd/testing_wilco_dtc_supportd_bridge_wrapper.cc @@ -14,7 +14,7 @@ #include "base/memory/ptr_util.h" #include "base/posix/eintr_wrapper.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/chromeos/wilco_dtc_supportd/fake_wilco_dtc_supportd_client.h" #include "chrome/browser/chromeos/wilco_dtc_supportd/wilco_dtc_supportd_bridge.h" #include "chrome/browser/chromeos/wilco_dtc_supportd/wilco_dtc_supportd_client.h" diff --git a/chrome/browser/component_updater/autofill_states_component_installer_unittest.cc b/chrome/browser/component_updater/autofill_states_component_installer_unittest.cc index 6d0f065e72d272..f71ae10efb350f 100644 --- a/chrome/browser/component_updater/autofill_states_component_installer_unittest.cc +++ b/chrome/browser/component_updater/autofill_states_component_installer_unittest.cc @@ -8,7 +8,7 @@ #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "components/autofill/core/browser/autofill_test_utils.h" #include "components/autofill/core/browser/geo/state_names.h" #include "components/autofill/core/common/autofill_prefs.h" diff --git a/chrome/browser/component_updater/first_party_sets_component_installer_unittest.cc b/chrome/browser/component_updater/first_party_sets_component_installer_unittest.cc index 97c4f072a2341a..f988d4b849db3a 100644 --- a/chrome/browser/component_updater/first_party_sets_component_installer_unittest.cc +++ b/chrome/browser/component_updater/first_party_sets_component_installer_unittest.cc @@ -8,7 +8,7 @@ #include "base/files/scoped_temp_dir.h" #include "base/run_loop.h" #include "base/sequence_checker.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h" #include "base/threading/thread_task_runner_handle.h" diff --git a/chrome/browser/component_updater/floc_component_installer_unittest.cc b/chrome/browser/component_updater/floc_component_installer_unittest.cc index 2f1717894ce772..7ed34d3f268914 100644 --- a/chrome/browser/component_updater/floc_component_installer_unittest.cc +++ b/chrome/browser/component_updater/floc_component_installer_unittest.cc @@ -15,7 +15,7 @@ #include "base/run_loop.h" #include "base/sequenced_task_runner.h" #include "base/strings/string_util.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/threading/sequenced_task_runner_handle.h" #include "chrome/test/base/testing_browser_process.h" #include "components/component_updater/mock_component_updater_service.h" diff --git a/chrome/browser/component_updater/games_component_installer_unittest.cc b/chrome/browser/component_updater/games_component_installer_unittest.cc index 79a2413e23f734..18a2c6fc325b24 100644 --- a/chrome/browser/component_updater/games_component_installer_unittest.cc +++ b/chrome/browser/component_updater/games_component_installer_unittest.cc @@ -5,7 +5,7 @@ #include "chrome/browser/component_updater/games_component_installer.h" #include "base/files/file_path.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/values.h" #include "base/version.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/component_updater/soda_component_installer_unittest.cc b/chrome/browser/component_updater/soda_component_installer_unittest.cc index 983fe7baf7aba4..067182a92c0d24 100644 --- a/chrome/browser/component_updater/soda_component_installer_unittest.cc +++ b/chrome/browser/component_updater/soda_component_installer_unittest.cc @@ -5,7 +5,7 @@ #include "chrome/browser/component_updater/soda_component_installer.h" #include "base/files/file_path.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/version.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/component_updater/soda_en_us_component_installer_unittest.cc b/chrome/browser/component_updater/soda_en_us_component_installer_unittest.cc index e494c73ca125f1..204b0a838e0800 100644 --- a/chrome/browser/component_updater/soda_en_us_component_installer_unittest.cc +++ b/chrome/browser/component_updater/soda_en_us_component_installer_unittest.cc @@ -5,7 +5,7 @@ #include "chrome/browser/component_updater/soda_en_us_component_installer.h" #include "base/files/file_path.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/version.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/component_updater/soda_ja_jp_component_installer_unittest.cc b/chrome/browser/component_updater/soda_ja_jp_component_installer_unittest.cc index 5dffba3e7186ee..a4d12dcea396f3 100644 --- a/chrome/browser/component_updater/soda_ja_jp_component_installer_unittest.cc +++ b/chrome/browser/component_updater/soda_ja_jp_component_installer_unittest.cc @@ -5,7 +5,7 @@ #include "chrome/browser/component_updater/soda_ja_jp_component_installer.h" #include "base/files/file_path.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/version.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/component_updater/trust_token_key_commitments_component_installer_unittest.cc b/chrome/browser/component_updater/trust_token_key_commitments_component_installer_unittest.cc index d5bfae29b4f730..0f33baacfe32b8 100644 --- a/chrome/browser/component_updater/trust_token_key_commitments_component_installer_unittest.cc +++ b/chrome/browser/component_updater/trust_token_key_commitments_component_installer_unittest.cc @@ -11,7 +11,7 @@ #include "base/files/scoped_temp_dir.h" #include "base/run_loop.h" #include "base/sequence_checker.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h" #include "base/threading/thread_task_runner_handle.h" diff --git a/chrome/browser/content_index/content_index_browsertest.cc b/chrome/browser/content_index/content_index_browsertest.cc index c34f22c712fadc..076f787965390d 100644 --- a/chrome/browser/content_index/content_index_browsertest.cc +++ b/chrome/browser/content_index/content_index_browsertest.cc @@ -10,7 +10,7 @@ #include "base/optional.h" #include "base/run_loop.h" #include "base/strings/string_util.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "build/build_config.h" #include "chrome/browser/content_index/content_index_provider_impl.h" diff --git a/chrome/browser/content_index/content_index_provider_unittest.cc b/chrome/browser/content_index/content_index_provider_unittest.cc index 648eeb314a1c19..415fb2ccd073b7 100644 --- a/chrome/browser/content_index/content_index_provider_unittest.cc +++ b/chrome/browser/content_index/content_index_provider_unittest.cc @@ -10,7 +10,7 @@ #include "base/files/scoped_temp_dir.h" #include "base/memory/weak_ptr.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/time/time.h" #include "chrome/browser/engagement/site_engagement_service.h" #include "chrome/browser/engagement/site_engagement_service_factory.h" diff --git a/chrome/browser/content_settings/content_settings_browsertest.cc b/chrome/browser/content_settings/content_settings_browsertest.cc index 037ef598e22d6a..c8b27a14222436 100644 --- a/chrome/browser/content_settings/content_settings_browsertest.cc +++ b/chrome/browser/content_settings/content_settings_browsertest.cc @@ -8,7 +8,7 @@ #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/task/post_task.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "build/build_config.h" #include "chrome/browser/content_settings/cookie_settings_factory.h" diff --git a/chrome/browser/data_reduction_proxy/data_reduction_proxy_browsertest.cc b/chrome/browser/data_reduction_proxy/data_reduction_proxy_browsertest.cc index 9a71f9c00af6e4..48e1c210b8960f 100644 --- a/chrome/browser/data_reduction_proxy/data_reduction_proxy_browsertest.cc +++ b/chrome/browser/data_reduction_proxy/data_reduction_proxy_browsertest.cc @@ -13,7 +13,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/synchronization/lock.h" #include "base/task/thread_pool/thread_pool_instance.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h" #include "build/build_config.h" diff --git a/chrome/browser/device_identity/chromeos/device_oauth2_token_store_chromeos_unittest.cc b/chrome/browser/device_identity/chromeos/device_oauth2_token_store_chromeos_unittest.cc index e54bb4d935e4e4..c1cbc77b5d759e 100644 --- a/chrome/browser/device_identity/chromeos/device_oauth2_token_store_chromeos_unittest.cc +++ b/chrome/browser/device_identity/chromeos/device_oauth2_token_store_chromeos_unittest.cc @@ -6,7 +6,7 @@ #include "base/run_loop.h" #include "base/task/thread_pool/thread_pool_instance.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/chromeos/policy/device_policy_builder.h" #include "chrome/browser/chromeos/settings/cros_settings.h" #include "chrome/browser/chromeos/settings/device_settings_service.h" diff --git a/chrome/browser/device_identity/device_oauth2_token_store_desktop_unittest.cc b/chrome/browser/device_identity/device_oauth2_token_store_desktop_unittest.cc index a4643a99cb63dc..c015fa0a2fc236 100644 --- a/chrome/browser/device_identity/device_oauth2_token_store_desktop_unittest.cc +++ b/chrome/browser/device_identity/device_oauth2_token_store_desktop_unittest.cc @@ -5,7 +5,7 @@ #include "chrome/browser/device_identity/device_oauth2_token_store_desktop.h" #include "base/base64.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/scoped_testing_local_state.h" #include "chrome/test/base/testing_browser_process.h" diff --git a/chrome/browser/download/android/available_offline_content_provider_unittest.cc b/chrome/browser/download/android/available_offline_content_provider_unittest.cc index ba1b5ed3c42235..234760aff0fc4d 100644 --- a/chrome/browser/download/android/available_offline_content_provider_unittest.cc +++ b/chrome/browser/download/android/available_offline_content_provider_unittest.cc @@ -10,7 +10,7 @@ #include "base/bind.h" #include "base/strings/string_util.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "chrome/browser/offline_items_collection/offline_content_aggregator_factory.h" #include "chrome/browser/profiles/profile_key.h" diff --git a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc index ea18e535b1644b..a090e7521d0c8a 100644 --- a/chrome/browser/download/download_browsertest.cc +++ b/chrome/browser/download/download_browsertest.cc @@ -34,7 +34,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/system/sys_info.h" #include "base/task/post_task.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h" #include "base/test/test_file_util.h" diff --git a/chrome/browser/enterprise/connectors/connectors_manager_unittest.cc b/chrome/browser/enterprise/connectors/connectors_manager_unittest.cc index a1ec9b847016d7..bdea8608f4be21 100644 --- a/chrome/browser/enterprise/connectors/connectors_manager_unittest.cc +++ b/chrome/browser/enterprise/connectors/connectors_manager_unittest.cc @@ -6,7 +6,7 @@ #include "base/json/json_reader.h" #include "base/optional.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h" #include "base/values.h" diff --git a/chrome/browser/enterprise/connectors/content_analysis_delegate_browsertest.cc b/chrome/browser/enterprise/connectors/content_analysis_delegate_browsertest.cc index 8b5dc53af44266..3c3c562e9f4cbb 100644 --- a/chrome/browser/enterprise/connectors/content_analysis_delegate_browsertest.cc +++ b/chrome/browser/enterprise/connectors/content_analysis_delegate_browsertest.cc @@ -8,7 +8,7 @@ #include "base/path_service.h" #include "base/stl_util.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/enterprise/connectors/common.h" #include "chrome/browser/enterprise/connectors/content_analysis_delegate.h" diff --git a/chrome/browser/enterprise/connectors/content_analysis_delegate_unittest.cc b/chrome/browser/enterprise/connectors/content_analysis_delegate_unittest.cc index 97a52b94e044c1..a55b0f88b264e9 100644 --- a/chrome/browser/enterprise/connectors/content_analysis_delegate_unittest.cc +++ b/chrome/browser/enterprise/connectors/content_analysis_delegate_unittest.cc @@ -17,7 +17,7 @@ #include "base/path_service.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "chrome/browser/enterprise/connectors/common.h" #include "chrome/browser/enterprise/connectors/connectors_manager.h" diff --git a/chrome/browser/enterprise/connectors/content_analysis_dialog_browsertest.cc b/chrome/browser/enterprise/connectors/content_analysis_dialog_browsertest.cc index 2658fdbd81588f..61b8368177b22a 100644 --- a/chrome/browser/enterprise/connectors/content_analysis_dialog_browsertest.cc +++ b/chrome/browser/enterprise/connectors/content_analysis_dialog_browsertest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "build/build_config.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/enterprise/remote_commands/clear_browsing_data_job_unittest.cc b/chrome/browser/enterprise/remote_commands/clear_browsing_data_job_unittest.cc index d1f43df037406d..ddab665d0778f8 100644 --- a/chrome/browser/enterprise/remote_commands/clear_browsing_data_job_unittest.cc +++ b/chrome/browser/enterprise/remote_commands/clear_browsing_data_job_unittest.cc @@ -6,7 +6,7 @@ #include "base/json/json_writer.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/values.h" #include "chrome/browser/nacl_host/nacl_browser_delegate_impl.h" #include "chrome/test/base/testing_browser_process.h" diff --git a/chrome/browser/enterprise/reporting/browser_report_generator_unittest.cc b/chrome/browser/enterprise/reporting/browser_report_generator_unittest.cc index 45eac724e74833..ee1a7ce599df04 100644 --- a/chrome/browser/enterprise/reporting/browser_report_generator_unittest.cc +++ b/chrome/browser/enterprise/reporting/browser_report_generator_unittest.cc @@ -9,7 +9,7 @@ #include "base/files/file_path.h" #include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/time/time.h" #include "base/version.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/enterprise/reporting/report_generator_unittest.cc b/chrome/browser/enterprise/reporting/report_generator_unittest.cc index 7ef6c974f67ef5..02c4a06da61338 100644 --- a/chrome/browser/enterprise/reporting/report_generator_unittest.cc +++ b/chrome/browser/enterprise/reporting/report_generator_unittest.cc @@ -10,7 +10,7 @@ #include "base/strings/string16.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "build/build_config.h" #include "chrome/browser/enterprise/reporting/reporting_delegate_factory_desktop.h" diff --git a/chrome/browser/enterprise/reporting/report_request_queue_generator_unittest.cc b/chrome/browser/enterprise/reporting/report_request_queue_generator_unittest.cc index fceb6094eb112c..55450ab235ca3c 100644 --- a/chrome/browser/enterprise/reporting/report_request_queue_generator_unittest.cc +++ b/chrome/browser/enterprise/reporting/report_request_queue_generator_unittest.cc @@ -8,7 +8,7 @@ #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "build/build_config.h" #include "chrome/browser/enterprise/reporting/reporting_delegate_factory_desktop.h" diff --git a/chrome/browser/enterprise/util/android_enterprise_info_unittest.cc b/chrome/browser/enterprise/util/android_enterprise_info_unittest.cc index 09edbdab89b8a7..9c721adf84f4ea 100644 --- a/chrome/browser/enterprise/util/android_enterprise_info_unittest.cc +++ b/chrome/browser/enterprise/util/android_enterprise_info_unittest.cc @@ -6,7 +6,7 @@ #include "base/bind.h" #include "base/optional.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "testing/gtest/include/gtest/gtest.h" class AndroidEnterpriseInfoTest : public ::testing::Test { diff --git a/chrome/browser/extensions/api/browsing_data/browsing_data_test.cc b/chrome/browser/extensions/api/browsing_data/browsing_data_test.cc index cbd20bc051c88c..5c619106d8379c 100644 --- a/chrome/browser/extensions/api/browsing_data/browsing_data_test.cc +++ b/chrome/browser/extensions/api/browsing_data/browsing_data_test.cc @@ -7,7 +7,7 @@ #include "base/callback.h" #include "base/memory/ref_counted.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/values.h" #include "chrome/browser/extensions/api/browsing_data/browsing_data_api.h" #include "chrome/browser/extensions/extension_function_test_utils.h" diff --git a/chrome/browser/extensions/api/declarative_net_request/declarative_net_request_browsertest.cc b/chrome/browser/extensions/api/declarative_net_request/declarative_net_request_browsertest.cc index 9c14382e21c3e3..90cda02fb75d53 100644 --- a/chrome/browser/extensions/api/declarative_net_request/declarative_net_request_browsertest.cc +++ b/chrome/browser/extensions/api/declarative_net_request/declarative_net_request_browsertest.cc @@ -27,7 +27,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/synchronization/lock.h" #include "base/task/post_task.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h" #include "base/test/simple_test_clock.h" diff --git a/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc b/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc index 1747903be5ffef..68b877b4f0c05b 100644 --- a/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc +++ b/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc @@ -18,7 +18,7 @@ #include "base/run_loop.h" #include "base/stl_util.h" #include "base/strings/stringprintf.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/threading/thread_restrictions.h" #include "base/threading/thread_task_runner_handle.h" diff --git a/chrome/browser/extensions/api/identity/identity_apitest.cc b/chrome/browser/extensions/api/identity/identity_apitest.cc index e571fb213be0e0..6f030dfbf36955 100644 --- a/chrome/browser/extensions/api/identity/identity_apitest.cc +++ b/chrome/browser/extensions/api/identity/identity_apitest.cc @@ -15,7 +15,7 @@ #include "base/run_loop.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h" #include "base/values.h" diff --git a/chrome/browser/extensions/api/management/management_browsertest.cc b/chrome/browser/extensions/api/management/management_browsertest.cc index 62d5b2a72b9654..c8cb0468a4374d 100644 --- a/chrome/browser/extensions/api/management/management_browsertest.cc +++ b/chrome/browser/extensions/api/management/management_browsertest.cc @@ -11,7 +11,7 @@ #include "base/stl_util.h" #include "base/strings/stringprintf.h" #include "base/task/post_task.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "build/build_config.h" #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/extensions/extension_management.h" diff --git a/chrome/browser/extensions/api/networking_private/networking_private_chromeos_apitest.cc b/chrome/browser/extensions/api/networking_private/networking_private_chromeos_apitest.cc index 0375df78bd4898..c81bdabbc7372d 100644 --- a/chrome/browser/extensions/api/networking_private/networking_private_chromeos_apitest.cc +++ b/chrome/browser/extensions/api/networking_private/networking_private_chromeos_apitest.cc @@ -14,7 +14,7 @@ #include "base/optional.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/threading/thread_restrictions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/login/helper.h" diff --git a/chrome/browser/extensions/api/passwords_private/password_check_delegate_unittest.cc b/chrome/browser/extensions/api/passwords_private/password_check_delegate_unittest.cc index ca221d2c075c81..3fcee4cb072f8b 100644 --- a/chrome/browser/extensions/api/passwords_private/password_check_delegate_unittest.cc +++ b/chrome/browser/extensions/api/passwords_private/password_check_delegate_unittest.cc @@ -18,7 +18,7 @@ #include "base/strings/string_piece.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/mock_callback.h" #include "base/test/scoped_feature_list.h" #include "base/time/time.h" diff --git a/chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl_unittest.cc b/chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl_unittest.cc index 1f796b463efb3f..dfed30badacd79 100644 --- a/chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl_unittest.cc +++ b/chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl_unittest.cc @@ -14,7 +14,7 @@ #include "base/optional.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/gmock_move_support.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/mock_callback.h" diff --git a/chrome/browser/extensions/api/sessions/sessions_apitest.cc b/chrome/browser/extensions/api/sessions/sessions_apitest.cc index 71097a37fc8001..f029d53a22af69 100644 --- a/chrome/browser/extensions/api/sessions/sessions_apitest.cc +++ b/chrome/browser/extensions/api/sessions/sessions_apitest.cc @@ -15,7 +15,7 @@ #include "base/stl_util.h" #include "base/strings/pattern.h" #include "base/strings/stringprintf.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "build/build_config.h" #include "chrome/browser/extensions/api/sessions/sessions_api.h" #include "chrome/browser/extensions/api/tabs/tabs_api.h" diff --git a/chrome/browser/extensions/api/socket/tcp_socket_unittest.cc b/chrome/browser/extensions/api/socket/tcp_socket_unittest.cc index ff673e3e694ec3..834481508e9213 100644 --- a/chrome/browser/extensions/api/socket/tcp_socket_unittest.cc +++ b/chrome/browser/extensions/api/socket/tcp_socket_unittest.cc @@ -6,7 +6,7 @@ #include "base/macros.h" #include "base/memory/scoped_refptr.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/extensions/extension_service_test_base.h" #include "chrome/test/base/testing_profile.h" #include "content/public/browser/browser_context.h" diff --git a/chrome/browser/extensions/api/socket/tls_socket_unittest.cc b/chrome/browser/extensions/api/socket/tls_socket_unittest.cc index 9ff019adcd8fa2..ddd5100a78b786 100644 --- a/chrome/browser/extensions/api/socket/tls_socket_unittest.cc +++ b/chrome/browser/extensions/api/socket/tls_socket_unittest.cc @@ -6,7 +6,7 @@ #include #include "base/macros.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/extensions/extension_service_test_base.h" #include "chrome/test/base/testing_profile.h" #include "content/public/browser/browser_context.h" diff --git a/chrome/browser/extensions/api/web_request/web_request_apitest.cc b/chrome/browser/extensions/api/web_request/web_request_apitest.cc index fb415bb3c54c58..a00ccbb0661b9a 100644 --- a/chrome/browser/extensions/api/web_request/web_request_apitest.cc +++ b/chrome/browser/extensions/api/web_request/web_request_apitest.cc @@ -18,7 +18,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/synchronization/lock.h" #include "base/task/post_task.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h" #include "base/time/time.h" diff --git a/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.cc b/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.cc index 67ab7165b90cf3..033c66b9f32364 100644 --- a/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.cc +++ b/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.cc @@ -14,7 +14,7 @@ #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/synchronization/waitable_event.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/threading/platform_thread.h" #include "base/time/time.h" #include "build/build_config.h" diff --git a/chrome/browser/extensions/browsertest_util.cc b/chrome/browser/extensions/browsertest_util.cc index 1d765ef57ed456..2879cdb9bffbca 100644 --- a/chrome/browser/extensions/browsertest_util.cc +++ b/chrome/browser/extensions/browsertest_util.cc @@ -10,7 +10,7 @@ #include "base/files/file_util.h" #include "base/path_service.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/apps/app_service/app_launch_params.h" #include "chrome/browser/apps/app_service/app_service_proxy.h" #include "chrome/browser/apps/app_service/app_service_proxy_factory.h" diff --git a/chrome/browser/extensions/content_verifier_hash_fetch_behavior_browsertest.cc b/chrome/browser/extensions/content_verifier_hash_fetch_behavior_browsertest.cc index b30888b19b3cbf..61d4c02e2cf3e9 100644 --- a/chrome/browser/extensions/content_verifier_hash_fetch_behavior_browsertest.cc +++ b/chrome/browser/extensions/content_verifier_hash_fetch_behavior_browsertest.cc @@ -8,7 +8,7 @@ #include "base/bind.h" #include "base/files/file_util.h" #include "base/macros.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/extensions/browsertest_util.h" #include "chrome/browser/extensions/chrome_content_verifier_delegate.h" #include "chrome/browser/extensions/extension_browsertest.h" diff --git a/chrome/browser/extensions/corb_and_cors_extension_browsertest.cc b/chrome/browser/extensions/corb_and_cors_extension_browsertest.cc index 14264e52c4813d..a8e29a59415e7f 100644 --- a/chrome/browser/extensions/corb_and_cors_extension_browsertest.cc +++ b/chrome/browser/extensions/corb_and_cors_extension_browsertest.cc @@ -11,7 +11,7 @@ #include "base/strings/string16.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/values.h" #include "build/build_config.h" diff --git a/chrome/browser/extensions/extension_disabled_ui_browsertest.cc b/chrome/browser/extensions/extension_disabled_ui_browsertest.cc index 75d6d10a226652..187aeac8216ca3 100644 --- a/chrome/browser/extensions/extension_disabled_ui_browsertest.cc +++ b/chrome/browser/extensions/extension_disabled_ui_browsertest.cc @@ -8,7 +8,7 @@ #include "base/files/scoped_temp_dir.h" #include "base/memory/ptr_util.h" #include "base/task/post_task.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/extensions/extension_service.h" diff --git a/chrome/browser/extensions/extension_nacl_browsertest.cc b/chrome/browser/extensions/extension_nacl_browsertest.cc index 2afea7a6493358..2c3c6959e67471 100644 --- a/chrome/browser/extensions/extension_nacl_browsertest.cc +++ b/chrome/browser/extensions/extension_nacl_browsertest.cc @@ -5,7 +5,7 @@ #include "base/command_line.h" #include "base/files/file_path.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/extensions/crx_installer.h" #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc index 370d9206e29e3c..eab7bc4d5c7e17 100644 --- a/chrome/browser/extensions/extension_service_unittest.cc +++ b/chrome/browser/extensions/extension_service_unittest.cc @@ -35,7 +35,7 @@ #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/time/time.h" #include "base/values.h" #include "base/version.h" diff --git a/chrome/browser/extensions/service_worker_apitest.cc b/chrome/browser/extensions/service_worker_apitest.cc index 2223bc50400948..fb477437ebfc10 100644 --- a/chrome/browser/extensions/service_worker_apitest.cc +++ b/chrome/browser/extensions/service_worker_apitest.cc @@ -12,7 +12,7 @@ #include "base/run_loop.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/threading/thread_restrictions.h" #include "build/build_config.h" diff --git a/chrome/browser/extensions/updater/extension_updater_unittest.cc b/chrome/browser/extensions/updater/extension_updater_unittest.cc index f652f7c2c1b8ff..216edcacdd58e4 100644 --- a/chrome/browser/extensions/updater/extension_updater_unittest.cc +++ b/chrome/browser/extensions/updater/extension_updater_unittest.cc @@ -26,7 +26,7 @@ #include "base/strings/string_split.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/threading/thread.h" #include "base/threading/thread_task_runner_handle.h" diff --git a/chrome/browser/extensions/updater/update_service_browsertest.cc b/chrome/browser/extensions/updater/update_service_browsertest.cc index 1126d92cb2930e..54a94fdc81efbb 100644 --- a/chrome/browser/extensions/updater/update_service_browsertest.cc +++ b/chrome/browser/extensions/updater/update_service_browsertest.cc @@ -6,7 +6,7 @@ #include "base/json/json_reader.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/task_environment.h" #include "chrome/browser/extensions/content_verifier_test_utils.h" diff --git a/chrome/browser/federated_learning/floc_id_provider_browsertest.cc b/chrome/browser/federated_learning/floc_id_provider_browsertest.cc index f3399d8ca5a9cf..b99f3f8a7542a8 100644 --- a/chrome/browser/federated_learning/floc_id_provider_browsertest.cc +++ b/chrome/browser/federated_learning/floc_id_provider_browsertest.cc @@ -5,7 +5,7 @@ #include "chrome/browser/federated_learning/floc_id_provider_impl.h" #include "base/strings/strcat.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/threading/thread_restrictions.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/federated_learning/floc_id_provider_unittest.cc b/chrome/browser/federated_learning/floc_id_provider_unittest.cc index 7574eab6c74ae5..bd110231c77e87 100644 --- a/chrome/browser/federated_learning/floc_id_provider_unittest.cc +++ b/chrome/browser/federated_learning/floc_id_provider_unittest.cc @@ -6,7 +6,7 @@ #include "base/files/scoped_temp_dir.h" #include "base/strings/strcat.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "build/build_config.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/federated_learning/floc_origin_trial_browsertest.cc b/chrome/browser/federated_learning/floc_origin_trial_browsertest.cc index 7d98f8fc6d720a..0ba1ae4de4c25c 100644 --- a/chrome/browser/federated_learning/floc_origin_trial_browsertest.cc +++ b/chrome/browser/federated_learning/floc_origin_trial_browsertest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/strings/strcat.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/ui/browser.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" diff --git a/chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source_unittest.cc b/chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source_unittest.cc index 5834a043c8fcce..655e09b296cd99 100644 --- a/chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source_unittest.cc +++ b/chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source_unittest.cc @@ -5,7 +5,7 @@ #include "chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "build/build_config.h" #include "chrome/common/channel_info.h" #include "chrome/test/base/browser_with_test_window_test.h" diff --git a/chrome/browser/games/games_service_browsertest.cc b/chrome/browser/games/games_service_browsertest.cc index 9ebf9ba013b11d..f784b85fe56519 100644 --- a/chrome/browser/games/games_service_browsertest.cc +++ b/chrome/browser/games/games_service_browsertest.cc @@ -10,7 +10,7 @@ #include "base/run_loop.h" #include "base/task/post_task.h" #include "base/task/thread_pool.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/time/time.h" #include "build/build_config.h" #include "chrome/browser/games/games_service_factory.h" diff --git a/chrome/browser/google/google_update_policy_fetcher_win_util_unittest.cc b/chrome/browser/google/google_update_policy_fetcher_win_util_unittest.cc index f051bb115abe6b..2526b0f84736f2 100644 --- a/chrome/browser/google/google_update_policy_fetcher_win_util_unittest.cc +++ b/chrome/browser/google/google_update_policy_fetcher_win_util_unittest.cc @@ -7,7 +7,7 @@ #include #include -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/values.h" #include "base/win/scoped_bstr.h" #include "components/policy/core/common/policy_map.h" diff --git a/chrome/browser/hid/hid_chooser_context_unittest.cc b/chrome/browser/hid/hid_chooser_context_unittest.cc index 5410d2872ba575..8eacd87369c335 100644 --- a/chrome/browser/hid/hid_chooser_context_unittest.cc +++ b/chrome/browser/hid/hid_chooser_context_unittest.cc @@ -5,7 +5,7 @@ #include "chrome/browser/hid/hid_chooser_context.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/gmock_callback_support.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" #include "chrome/browser/hid/hid_chooser_context_factory.h" diff --git a/chrome/browser/history/domain_diversity_reporter_unittest.cc b/chrome/browser/history/domain_diversity_reporter_unittest.cc index f9a4dc4240fdbd..6dc5307fb5b195 100644 --- a/chrome/browser/history/domain_diversity_reporter_unittest.cc +++ b/chrome/browser/history/domain_diversity_reporter_unittest.cc @@ -6,7 +6,7 @@ #include "base/feature_list.h" #include "base/files/scoped_temp_dir.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/task_environment.h" #include "base/time/clock.h" diff --git a/chrome/browser/history/history_browsertest.cc b/chrome/browser/history/history_browsertest.cc index c7faf8535b9ffd..f2f46f8639c814 100644 --- a/chrome/browser/history/history_browsertest.cc +++ b/chrome/browser/history/history_browsertest.cc @@ -11,7 +11,7 @@ #include "base/macros.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "build/build_config.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/history/history_service_factory.h" diff --git a/chrome/browser/history/history_tab_helper_unittest.cc b/chrome/browser/history/history_tab_helper_unittest.cc index 4d43a9ef27c49f..48cea53de94f69 100644 --- a/chrome/browser/history/history_tab_helper_unittest.cc +++ b/chrome/browser/history/history_tab_helper_unittest.cc @@ -8,7 +8,7 @@ #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/task/cancelable_task_tracker.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/history/history_service_factory.h" #include "chrome/test/base/chrome_render_view_host_test_harness.h" #include "chrome/test/base/testing_profile.h" diff --git a/chrome/browser/importer/profile_writer_unittest.cc b/chrome/browser/importer/profile_writer_unittest.cc index f9f73314263cd1..5fa9c90aaa3e88 100644 --- a/chrome/browser/importer/profile_writer_unittest.cc +++ b/chrome/browser/importer/profile_writer_unittest.cc @@ -13,7 +13,7 @@ #include "base/macros.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/history/history_service_factory.h" #include "chrome/browser/importer/importer_unittest_utils.h" diff --git a/chrome/browser/installable/installable_manager_browsertest.cc b/chrome/browser/installable/installable_manager_browsertest.cc index 4590b0cb402aef..47b95ee0169be2 100644 --- a/chrome/browser/installable/installable_manager_browsertest.cc +++ b/chrome/browser/installable/installable_manager_browsertest.cc @@ -12,7 +12,7 @@ #include "base/run_loop.h" #include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h" #include "base/threading/sequenced_task_runner_handle.h" diff --git a/chrome/browser/media/feeds/media_feeds_browsertest.cc b/chrome/browser/media/feeds/media_feeds_browsertest.cc index 954b8dd338ceac..d24b16460a2726 100644 --- a/chrome/browser/media/feeds/media_feeds_browsertest.cc +++ b/chrome/browser/media/feeds/media_feeds_browsertest.cc @@ -10,7 +10,7 @@ #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/task/post_task.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/media/feeds/media_feeds_contents_observer.h" diff --git a/chrome/browser/media/feeds/media_feeds_converter_unittest.cc b/chrome/browser/media/feeds/media_feeds_converter_unittest.cc index 6b5dff9bba0533..c69024b4c0b13f 100644 --- a/chrome/browser/media/feeds/media_feeds_converter_unittest.cc +++ b/chrome/browser/media/feeds/media_feeds_converter_unittest.cc @@ -6,7 +6,7 @@ #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/time/time.h" #include "chrome/browser/media/feeds/media_feeds_store.mojom-forward.h" diff --git a/chrome/browser/media/feeds/media_feeds_fetcher_unittest.cc b/chrome/browser/media/feeds/media_feeds_fetcher_unittest.cc index dce0cf3e3c53af..a7ad89fe4b2564 100644 --- a/chrome/browser/media/feeds/media_feeds_fetcher_unittest.cc +++ b/chrome/browser/media/feeds/media_feeds_fetcher_unittest.cc @@ -7,7 +7,7 @@ #include #include "base/bind.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/mock_callback.h" #include "base/test/task_environment.h" #include "chrome/browser/media/history/media_history_keyed_service.h" diff --git a/chrome/browser/media/feeds/media_feeds_service_unittest.cc b/chrome/browser/media/feeds/media_feeds_service_unittest.cc index 698b62fcec9b97..06dc835c41da47 100644 --- a/chrome/browser/media/feeds/media_feeds_service_unittest.cc +++ b/chrome/browser/media/feeds/media_feeds_service_unittest.cc @@ -8,7 +8,7 @@ #include "base/files/file_util.h" #include "base/path_service.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h" #include "base/test/simple_test_clock.h" diff --git a/chrome/browser/media/history/media_history_browsertest.cc b/chrome/browser/media/history/media_history_browsertest.cc index 53eabf535cfa18..4c35053b581db8 100644 --- a/chrome/browser/media/history/media_history_browsertest.cc +++ b/chrome/browser/media/history/media_history_browsertest.cc @@ -9,7 +9,7 @@ #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/task/post_task.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "build/build_config.h" #include "chrome/browser/media/feeds/media_feeds_service.h" diff --git a/chrome/browser/media/history/media_history_keyed_service_unittest.cc b/chrome/browser/media/history/media_history_keyed_service_unittest.cc index 7771b7ea40ab48..eb9011a4730fdc 100644 --- a/chrome/browser/media/history/media_history_keyed_service_unittest.cc +++ b/chrome/browser/media/history/media_history_keyed_service_unittest.cc @@ -9,7 +9,7 @@ #include "base/bind.h" #include "base/files/scoped_temp_dir.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/gmock_callback_support.h" #include "base/test/mock_callback.h" #include "base/test/scoped_feature_list.h" diff --git a/chrome/browser/media/history/media_history_store_unittest.cc b/chrome/browser/media/history/media_history_store_unittest.cc index 0889a2e126d54b..e20b3835e1fe56 100644 --- a/chrome/browser/media/history/media_history_store_unittest.cc +++ b/chrome/browser/media/history/media_history_store_unittest.cc @@ -13,7 +13,7 @@ #include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/task/thread_pool/pooled_sequenced_task_runner.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h" #include "base/test/test_timeouts.h" diff --git a/chrome/browser/media/history/media_history_test_utils.cc b/chrome/browser/media/history/media_history_test_utils.cc index c66191fecb5518..eb25c118f53ab3 100644 --- a/chrome/browser/media/history/media_history_test_utils.cc +++ b/chrome/browser/media/history/media_history_test_utils.cc @@ -5,7 +5,7 @@ #include "chrome/browser/media/history/media_history_test_utils.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/media/history/media_history_keyed_service.h" namespace media_history { diff --git a/chrome/browser/media/kaleidoscope/kaleidoscope_service_unittest.cc b/chrome/browser/media/kaleidoscope/kaleidoscope_service_unittest.cc index 17928bc693a499..afdbeb636f59ed 100644 --- a/chrome/browser/media/kaleidoscope/kaleidoscope_service_unittest.cc +++ b/chrome/browser/media/kaleidoscope/kaleidoscope_service_unittest.cc @@ -7,7 +7,7 @@ #include #include "base/strings/strcat.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h" #include "base/test/simple_test_clock.h" diff --git a/chrome/browser/media/router/providers/cast/app_activity_unittest.cc b/chrome/browser/media/router/providers/cast/app_activity_unittest.cc index 6af87d831c1a92..05200b762e9015 100644 --- a/chrome/browser/media/router/providers/cast/app_activity_unittest.cc +++ b/chrome/browser/media/router/providers/cast/app_activity_unittest.cc @@ -13,7 +13,7 @@ #include "base/bind.h" #include "base/optional.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/mock_callback.h" #include "base/test/values_test_util.h" #include "base/values.h" diff --git a/chrome/browser/media/router/providers/cast/cast_activity_manager_unittest.cc b/chrome/browser/media/router/providers/cast/cast_activity_manager_unittest.cc index 2dfae7c5aa8405..1f0efc7614ca45 100644 --- a/chrome/browser/media/router/providers/cast/cast_activity_manager_unittest.cc +++ b/chrome/browser/media/router/providers/cast/cast_activity_manager_unittest.cc @@ -16,7 +16,7 @@ #include "base/optional.h" #include "base/run_loop.h" #include "base/strings/strcat.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/mock_callback.h" #include "base/test/values_test_util.h" #include "base/values.h" diff --git a/chrome/browser/media/router/providers/cast/cast_activity_test_base.cc b/chrome/browser/media/router/providers/cast/cast_activity_test_base.cc index bafddf3fa39665..47910bae2c1043 100644 --- a/chrome/browser/media/router/providers/cast/cast_activity_test_base.cc +++ b/chrome/browser/media/router/providers/cast/cast_activity_test_base.cc @@ -15,7 +15,7 @@ #include "base/optional.h" #include "base/run_loop.h" #include "base/stl_util.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/mock_callback.h" #include "base/test/values_test_util.h" #include "base/values.h" diff --git a/chrome/browser/media/router/providers/cast/mirroring_activity_unittest.cc b/chrome/browser/media/router/providers/cast/mirroring_activity_unittest.cc index 4681c60615665f..09a7d1c20576c4 100644 --- a/chrome/browser/media/router/providers/cast/mirroring_activity_unittest.cc +++ b/chrome/browser/media/router/providers/cast/mirroring_activity_unittest.cc @@ -4,7 +4,7 @@ #include "chrome/browser/media/router/providers/cast/mirroring_activity.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/mock_callback.h" #include "base/test/values_test_util.h" diff --git a/chrome/browser/media/webrtc/webrtc_browsertest.cc b/chrome/browser/media/webrtc/webrtc_browsertest.cc index a6e3bb62386276..1fd5074030beb9 100644 --- a/chrome/browser/media/webrtc/webrtc_browsertest.cc +++ b/chrome/browser/media/webrtc/webrtc_browsertest.cc @@ -4,7 +4,7 @@ #include "base/command_line.h" #include "base/deferred_sequenced_task_runner.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "build/build_config.h" #include "chrome/browser/media/webrtc/webrtc_browsertest_base.h" #include "chrome/browser/media/webrtc/webrtc_browsertest_common.h" diff --git a/chrome/browser/memory/enterprise_memory_limit_evaluator_unittest.cc b/chrome/browser/memory/enterprise_memory_limit_evaluator_unittest.cc index eb64769acad5c9..0c7e54f8276693 100644 --- a/chrome/browser/memory/enterprise_memory_limit_evaluator_unittest.cc +++ b/chrome/browser/memory/enterprise_memory_limit_evaluator_unittest.cc @@ -4,7 +4,7 @@ #include "chrome/browser/memory/enterprise_memory_limit_evaluator.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/util/memory_pressure/multi_source_memory_pressure_monitor.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/metrics/cros_healthd_metrics_provider_unittest.cc b/chrome/browser/metrics/cros_healthd_metrics_provider_unittest.cc index fdb18f0a5a6998..5c371c170dc4bd 100644 --- a/chrome/browser/metrics/cros_healthd_metrics_provider_unittest.cc +++ b/chrome/browser/metrics/cros_healthd_metrics_provider_unittest.cc @@ -9,7 +9,7 @@ #include #include "base/bind.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/time/time.h" #include "chromeos/dbus/cros_healthd/cros_healthd_client.h" diff --git a/chrome/browser/metrics/perf/metric_collector_unittest.cc b/chrome/browser/metrics/perf/metric_collector_unittest.cc index 9cb55a0a760186..f4231032eda60b 100644 --- a/chrome/browser/metrics/perf/metric_collector_unittest.cc +++ b/chrome/browser/metrics/perf/metric_collector_unittest.cc @@ -14,7 +14,7 @@ #include "base/macros.h" #include "base/memory/scoped_refptr.h" #include "base/task/post_task.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/test/browser_task_environment.h" diff --git a/chrome/browser/metrics/perf/metric_provider_unittest.cc b/chrome/browser/metrics/perf/metric_provider_unittest.cc index c136a8a393d56b..510b3a4c920a7d 100644 --- a/chrome/browser/metrics/perf/metric_provider_unittest.cc +++ b/chrome/browser/metrics/perf/metric_provider_unittest.cc @@ -13,7 +13,7 @@ #include "base/macros.h" #include "base/memory/scoped_refptr.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "content/public/test/browser_task_environment.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/metrics_proto/sampled_profile.pb.h" diff --git a/chrome/browser/metrics/perf/perf_events_collector_unittest.cc b/chrome/browser/metrics/perf/perf_events_collector_unittest.cc index ac05300338af62..dd9ce539a8553f 100644 --- a/chrome/browser/metrics/perf/perf_events_collector_unittest.cc +++ b/chrome/browser/metrics/perf/perf_events_collector_unittest.cc @@ -16,7 +16,7 @@ #include "base/metrics/field_trial.h" #include "base/strings/string_split.h" #include "base/task/post_task.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "chrome/browser/metrics/perf/cpu_identity.h" #include "chrome/browser/metrics/perf/windowed_incognito_observer.h" diff --git a/chrome/browser/metrics/perf/profile_provider_chromeos_unittest.cc b/chrome/browser/metrics/perf/profile_provider_chromeos_unittest.cc index cfc24507df93ae..501f56268b962c 100644 --- a/chrome/browser/metrics/perf/profile_provider_chromeos_unittest.cc +++ b/chrome/browser/metrics/perf/profile_provider_chromeos_unittest.cc @@ -12,7 +12,7 @@ #include #include "base/macros.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h" #include "base/time/time.h" diff --git a/chrome/browser/metrics/perf/profile_provider_unittest_main.cc b/chrome/browser/metrics/perf/profile_provider_unittest_main.cc index 6d7b8ba9fcb4aa..c1e34e57250aa2 100644 --- a/chrome/browser/metrics/perf/profile_provider_unittest_main.cc +++ b/chrome/browser/metrics/perf/profile_provider_unittest_main.cc @@ -10,7 +10,7 @@ #include "base/metrics/statistics_recorder.h" #include "base/run_loop.h" #include "base/synchronization/waitable_event.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/test_suite.h" #include "base/timer/timer.h" #include "chrome/browser/metrics/perf/collection_params.h" diff --git a/chrome/browser/metrics/perf/windowed_incognito_observer_unittest.cc b/chrome/browser/metrics/perf/windowed_incognito_observer_unittest.cc index 5c93251560ebcd..41e2f43a8cd484 100644 --- a/chrome/browser/metrics/perf/windowed_incognito_observer_unittest.cc +++ b/chrome/browser/metrics/perf/windowed_incognito_observer_unittest.cc @@ -5,7 +5,7 @@ #include "chrome/browser/metrics/perf/windowed_incognito_observer.h" #include "base/macros.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/threading/thread_task_runner_handle.h" #include "chrome/test/base/test_browser_window.h" #include "chrome/test/base/testing_profile.h" diff --git a/chrome/browser/metrics/power_metrics_provider_mac_unittest.cc b/chrome/browser/metrics/power_metrics_provider_mac_unittest.cc index 587357a20548bb..0f7c6dc7af50cd 100644 --- a/chrome/browser/metrics/power_metrics_provider_mac_unittest.cc +++ b/chrome/browser/metrics/power_metrics_provider_mac_unittest.cc @@ -8,7 +8,7 @@ #include "base/callback.h" #include "base/metrics/histogram.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/metrics/thread_watcher_unittest.cc b/chrome/browser/metrics/thread_watcher_unittest.cc index cc679d96593a49..cc35a550f9d398 100644 --- a/chrome/browser/metrics/thread_watcher_unittest.cc +++ b/chrome/browser/metrics/thread_watcher_unittest.cc @@ -22,7 +22,7 @@ #include "base/synchronization/condition_variable.h" #include "base/synchronization/lock.h" #include "base/synchronization/waitable_event.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/threading/platform_thread.h" #include "base/threading/thread_task_runner_handle.h" #include "base/time/time.h" diff --git a/chrome/browser/native_file_system/chrome_native_file_system_permission_context_unittest.cc b/chrome/browser/native_file_system/chrome_native_file_system_permission_context_unittest.cc index 62eff4ae015459..357aa74bcd7cec 100644 --- a/chrome/browser/native_file_system/chrome_native_file_system_permission_context_unittest.cc +++ b/chrome/browser/native_file_system/chrome_native_file_system_permission_context_unittest.cc @@ -12,7 +12,7 @@ #include "base/files/scoped_temp_dir.h" #include "base/json/json_reader.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_path_override.h" #include "build/build_config.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" diff --git a/chrome/browser/native_file_system/origin_scoped_native_file_system_permission_context_unittest.cc b/chrome/browser/native_file_system/origin_scoped_native_file_system_permission_context_unittest.cc index 1aaeb98a299d0a..753ee5454237ca 100644 --- a/chrome/browser/native_file_system/origin_scoped_native_file_system_permission_context_unittest.cc +++ b/chrome/browser/native_file_system/origin_scoped_native_file_system_permission_context_unittest.cc @@ -11,7 +11,7 @@ #include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_path_override.h" #include "build/build_config.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" diff --git a/chrome/browser/nearby_sharing/fast_initiation_manager_unittest.cc b/chrome/browser/nearby_sharing/fast_initiation_manager_unittest.cc index 0b3098c7baf82a..bfb7c7b54d4801 100644 --- a/chrome/browser/nearby_sharing/fast_initiation_manager_unittest.cc +++ b/chrome/browser/nearby_sharing/fast_initiation_manager_unittest.cc @@ -10,7 +10,7 @@ #include "base/bind_helpers.h" #include "base/memory/ptr_util.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/time/time.h" #include "build/build_config.h" #include "device/bluetooth/test/mock_bluetooth_adapter.h" diff --git a/chrome/browser/nearby_sharing/incoming_frames_reader_unittest.cc b/chrome/browser/nearby_sharing/incoming_frames_reader_unittest.cc index 8d778ed037b461..a6f8026ab893a4 100644 --- a/chrome/browser/nearby_sharing/incoming_frames_reader_unittest.cc +++ b/chrome/browser/nearby_sharing/incoming_frames_reader_unittest.cc @@ -7,7 +7,7 @@ #include #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/time/time.h" #include "chrome/browser/nearby_sharing/fake_nearby_connection.h" #include "chrome/browser/nearby_sharing/mock_nearby_process_manager.h" diff --git a/chrome/browser/nearby_sharing/instantmessaging/receive_messages_express_unittest.cc b/chrome/browser/nearby_sharing/instantmessaging/receive_messages_express_unittest.cc index f1b733eb5bd7c4..e20778231f912e 100644 --- a/chrome/browser/nearby_sharing/instantmessaging/receive_messages_express_unittest.cc +++ b/chrome/browser/nearby_sharing/instantmessaging/receive_messages_express_unittest.cc @@ -5,7 +5,7 @@ #include "chrome/browser/nearby_sharing/instantmessaging/receive_messages_express.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "chrome/browser/nearby_sharing/instantmessaging/constants.h" #include "chrome/browser/nearby_sharing/instantmessaging/fake_token_fetcher.h" diff --git a/chrome/browser/nearby_sharing/instantmessaging/send_message_express_unittest.cc b/chrome/browser/nearby_sharing/instantmessaging/send_message_express_unittest.cc index 077425a29c4a0a..11127e341bffa8 100644 --- a/chrome/browser/nearby_sharing/instantmessaging/send_message_express_unittest.cc +++ b/chrome/browser/nearby_sharing/instantmessaging/send_message_express_unittest.cc @@ -5,7 +5,7 @@ #include "chrome/browser/nearby_sharing/instantmessaging/send_message_express.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "chrome/browser/nearby_sharing/instantmessaging/constants.h" #include "chrome/browser/nearby_sharing/instantmessaging/fake_token_fetcher.h" diff --git a/chrome/browser/nearby_sharing/local_device_data/nearby_share_local_device_data_manager_impl_unittest.cc b/chrome/browser/nearby_sharing/local_device_data/nearby_share_local_device_data_manager_impl_unittest.cc index fd56dba54086ef..845399df5656a5 100644 --- a/chrome/browser/nearby_sharing/local_device_data/nearby_share_local_device_data_manager_impl_unittest.cc +++ b/chrome/browser/nearby_sharing/local_device_data/nearby_share_local_device_data_manager_impl_unittest.cc @@ -7,7 +7,7 @@ #include #include "base/optional.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/nearby_sharing/client/fake_nearby_share_client.h" #include "chrome/browser/nearby_sharing/common/nearby_share_prefs.h" #include "chrome/browser/nearby_sharing/local_device_data/fake_nearby_share_device_data_updater.h" diff --git a/chrome/browser/nearby_sharing/nearby_connections_manager_impl_unittest.cc b/chrome/browser/nearby_sharing/nearby_connections_manager_impl_unittest.cc index e58a783454f01d..0424fa6580db94 100644 --- a/chrome/browser/nearby_sharing/nearby_connections_manager_impl_unittest.cc +++ b/chrome/browser/nearby_sharing/nearby_connections_manager_impl_unittest.cc @@ -9,7 +9,7 @@ #include "base/files/file_util.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/mock_callback.h" #include "base/test/scoped_feature_list.h" #include "chrome/browser/nearby_sharing/common/nearby_share_features.h" diff --git a/chrome/browser/nearby_sharing/nearby_notification_manager_unittest.cc b/chrome/browser/nearby_sharing/nearby_notification_manager_unittest.cc index fa9ab1f96a2cf7..469fbcd5f3f140 100644 --- a/chrome/browser/nearby_sharing/nearby_notification_manager_unittest.cc +++ b/chrome/browser/nearby_sharing/nearby_notification_manager_unittest.cc @@ -17,7 +17,7 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h" #include "base/threading/thread_restrictions.h" diff --git a/chrome/browser/nearby_sharing/nearby_process_manager_unittest.cc b/chrome/browser/nearby_sharing/nearby_process_manager_unittest.cc index 14fa8cbfc57a8d..0ed1c14ca0a4b9 100644 --- a/chrome/browser/nearby_sharing/nearby_process_manager_unittest.cc +++ b/chrome/browser/nearby_sharing/nearby_process_manager_unittest.cc @@ -13,7 +13,7 @@ #include "base/files/file_path.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/nearby/nearby_process_manager_factory.h" #include "chrome/browser/chromeos/nearby/nearby_process_manager_impl.h" diff --git a/chrome/browser/nearby_sharing/nearby_receive_manager_unittest.cc b/chrome/browser/nearby_sharing/nearby_receive_manager_unittest.cc index e973611fac1c66..2d49e869fbccf8 100644 --- a/chrome/browser/nearby_sharing/nearby_receive_manager_unittest.cc +++ b/chrome/browser/nearby_sharing/nearby_receive_manager_unittest.cc @@ -5,7 +5,7 @@ #include "chrome/browser/nearby_sharing/nearby_receive_manager.h" #include "base/optional.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/mock_callback.h" #include "chrome/browser/nearby_sharing/mock_nearby_sharing_service.h" #include "chrome/browser/nearby_sharing/share_target.h" diff --git a/chrome/browser/nearby_sharing/nearby_share_settings_unittest.cc b/chrome/browser/nearby_sharing/nearby_share_settings_unittest.cc index 9d11f928094379..8e1867d5d3de9f 100644 --- a/chrome/browser/nearby_sharing/nearby_share_settings_unittest.cc +++ b/chrome/browser/nearby_sharing/nearby_share_settings_unittest.cc @@ -6,7 +6,7 @@ #include "base/feature_list.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "chrome/browser/nearby_sharing/common/nearby_share_enums.h" #include "chrome/browser/nearby_sharing/common/nearby_share_features.h" diff --git a/chrome/browser/nearby_sharing/nearby_sharing_service_impl_unittest.cc b/chrome/browser/nearby_sharing/nearby_sharing_service_impl_unittest.cc index 05f95af9e237d5..ac0f2ddf9d48d6 100644 --- a/chrome/browser/nearby_sharing/nearby_sharing_service_impl_unittest.cc +++ b/chrome/browser/nearby_sharing/nearby_sharing_service_impl_unittest.cc @@ -16,7 +16,7 @@ #include "base/memory/ptr_util.h" #include "base/strings/string_number_conversions.h" #include "base/system/sys_info.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/threading/thread_restrictions.h" #include "chrome/browser/download/chrome_download_manager_delegate.h" diff --git a/chrome/browser/nearby_sharing/paired_key_verification_runner_unittest.cc b/chrome/browser/nearby_sharing/paired_key_verification_runner_unittest.cc index aaed1b5c640269..7e5e421568b92e 100644 --- a/chrome/browser/nearby_sharing/paired_key_verification_runner_unittest.cc +++ b/chrome/browser/nearby_sharing/paired_key_verification_runner_unittest.cc @@ -11,7 +11,7 @@ #include "base/callback.h" #include "base/optional.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/time/time.h" #include "chrome/browser/nearby_sharing/certificates/fake_nearby_share_certificate_manager.h" #include "chrome/browser/nearby_sharing/certificates/nearby_share_decrypted_public_certificate.h" diff --git a/chrome/browser/nearby_sharing/webrtc_signaling_messenger_unittest.cc b/chrome/browser/nearby_sharing/webrtc_signaling_messenger_unittest.cc index 1bdb0527f6d8d0..c8c82caa847b89 100644 --- a/chrome/browser/nearby_sharing/webrtc_signaling_messenger_unittest.cc +++ b/chrome/browser/nearby_sharing/webrtc_signaling_messenger_unittest.cc @@ -7,7 +7,7 @@ #include #include -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/time/time.h" #include "chrome/browser/nearby_sharing/instantmessaging/constants.h" diff --git a/chrome/browser/net/chrome_accept_header_browsertest.cc b/chrome/browser/net/chrome_accept_header_browsertest.cc index 5323b6b7e575eb..a0c60c4e33e281 100644 --- a/chrome/browser/net/chrome_accept_header_browsertest.cc +++ b/chrome/browser/net/chrome_accept_header_browsertest.cc @@ -4,7 +4,7 @@ #include "base/macros.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/test/browser_test.h" diff --git a/chrome/browser/net/chrome_mojo_proxy_resolver_factory_browsertest.cc b/chrome/browser/net/chrome_mojo_proxy_resolver_factory_browsertest.cc index 7c38448c9712d9..2e6c2378b389a4 100644 --- a/chrome/browser/net/chrome_mojo_proxy_resolver_factory_browsertest.cc +++ b/chrome/browser/net/chrome_mojo_proxy_resolver_factory_browsertest.cc @@ -13,7 +13,7 @@ #include "base/process/process.h" #include "base/run_loop.h" #include "base/synchronization/waitable_event.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/time/time.h" #include "chrome/test/base/in_process_browser_test.h" #include "content/public/browser/browser_task_traits.h" diff --git a/chrome/browser/net/chrome_network_service_browsertest.cc b/chrome/browser/net/chrome_network_service_browsertest.cc index 6ddae87d928c44..f0f84d44490fd1 100644 --- a/chrome/browser/net/chrome_network_service_browsertest.cc +++ b/chrome/browser/net/chrome_network_service_browsertest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "build/build_config.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/net/network_connection_tracker_browsertest.cc b/chrome/browser/net/network_connection_tracker_browsertest.cc index 4572bc46d3c12a..00bc916ee7547c 100644 --- a/chrome/browser/net/network_connection_tracker_browsertest.cc +++ b/chrome/browser/net/network_connection_tracker_browsertest.cc @@ -9,7 +9,7 @@ #include "base/macros.h" #include "base/run_loop.h" #include "base/sequence_checker.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "build/build_config.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/net/network_context_configuration_browsertest.cc b/chrome/browser/net/network_context_configuration_browsertest.cc index 6a658248c6ed53..accbdb27e0e273 100644 --- a/chrome/browser/net/network_context_configuration_browsertest.cc +++ b/chrome/browser/net/network_context_configuration_browsertest.cc @@ -19,7 +19,7 @@ #include "base/strings/strcat.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/threading/thread_restrictions.h" #include "base/threading/thread_task_runner_handle.h" diff --git a/chrome/browser/net/proxy_browsertest.cc b/chrome/browser/net/proxy_browsertest.cc index 7f29ba9a19da4f..07be15145f0a54 100644 --- a/chrome/browser/net/proxy_browsertest.cc +++ b/chrome/browser/net/proxy_browsertest.cc @@ -10,7 +10,7 @@ #include "base/run_loop.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "build/build_config.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/net/proxy_test_utils.h" diff --git a/chrome/browser/net/proxy_test_utils.cc b/chrome/browser/net/proxy_test_utils.cc index e26cec4d40f128..10546ff79d8ab4 100644 --- a/chrome/browser/net/proxy_test_utils.cc +++ b/chrome/browser/net/proxy_test_utils.cc @@ -4,7 +4,7 @@ #include "chrome/browser/net/proxy_test_utils.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/common/chrome_switches.h" #include "content/public/common/content_switches.h" #include "content/public/test/url_loader_interceptor.h" diff --git a/chrome/browser/net/websocket_browsertest.cc b/chrome/browser/net/websocket_browsertest.cc index ee648c1c45e3bb..38f17e346a7050 100644 --- a/chrome/browser/net/websocket_browsertest.cc +++ b/chrome/browser/net/websocket_browsertest.cc @@ -17,7 +17,7 @@ #include "base/run_loop.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/login/login_handler.h" diff --git a/chrome/browser/no_best_effort_tasks_during_startup_browsertest.cc b/chrome/browser/no_best_effort_tasks_during_startup_browsertest.cc index 89ac6d06bf97c9..ddb9d71f1a1e26 100644 --- a/chrome/browser/no_best_effort_tasks_during_startup_browsertest.cc +++ b/chrome/browser/no_best_effort_tasks_during_startup_browsertest.cc @@ -5,7 +5,7 @@ #include "base/barrier_closure.h" #include "base/run_loop.h" #include "base/task/thread_pool.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/after_startup_task_utils.h" #include "chrome/test/base/in_process_browser_test.h" #include "content/public/browser/browser_task_traits.h" diff --git a/chrome/browser/notifications/notification_display_queue_unittest.cc b/chrome/browser/notifications/notification_display_queue_unittest.cc index 9091ec785ba258..83e483128236cd 100644 --- a/chrome/browser/notifications/notification_display_queue_unittest.cc +++ b/chrome/browser/notifications/notification_display_queue_unittest.cc @@ -10,7 +10,7 @@ #include "base/memory/scoped_refptr.h" #include "base/run_loop.h" #include "base/strings/string16.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/notifications/notification_blocker.h" #include "chrome/browser/notifications/notification_display_queue.h" #include "chrome/browser/notifications/notification_display_service.h" diff --git a/chrome/browser/notifications/notification_display_service_impl_unittest.cc b/chrome/browser/notifications/notification_display_service_impl_unittest.cc index 8608b682c97bc0..db6b715f2ab01d 100644 --- a/chrome/browser/notifications/notification_display_service_impl_unittest.cc +++ b/chrome/browser/notifications/notification_display_service_impl_unittest.cc @@ -11,7 +11,7 @@ #include "base/memory/scoped_refptr.h" #include "base/run_loop.h" #include "base/strings/string16.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/notifications/notification_blocker.h" #include "chrome/browser/notifications/notification_display_queue.h" diff --git a/chrome/browser/notifications/notification_platform_bridge_win_interactive_uitest.cc b/chrome/browser/notifications/notification_platform_bridge_win_interactive_uitest.cc index a460db3217e3ea..5d7a23540ddc94 100644 --- a/chrome/browser/notifications/notification_platform_bridge_win_interactive_uitest.cc +++ b/chrome/browser/notifications/notification_platform_bridge_win_interactive_uitest.cc @@ -20,7 +20,7 @@ #include "base/strings/string16.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/threading/thread_restrictions.h" #include "base/win/scoped_hstring.h" #include "base/win/windows_version.h" diff --git a/chrome/browser/offline_pages/android/offline_page_auto_fetcher_service_unittest.cc b/chrome/browser/offline_pages/android/offline_page_auto_fetcher_service_unittest.cc index ae15464542245e..cdde11ed488d45 100644 --- a/chrome/browser/offline_pages/android/offline_page_auto_fetcher_service_unittest.cc +++ b/chrome/browser/offline_pages/android/offline_page_auto_fetcher_service_unittest.cc @@ -9,7 +9,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/mock_callback.h" #include "chrome/browser/offline_pages/offline_page_model_factory.h" #include "chrome/browser/offline_pages/request_coordinator_factory.h" diff --git a/chrome/browser/offline_pages/offline_page_utils_unittest.cc b/chrome/browser/offline_pages/offline_page_utils_unittest.cc index 564372d6618224..902abe16c48726 100644 --- a/chrome/browser/offline_pages/offline_page_utils_unittest.cc +++ b/chrome/browser/offline_pages/offline_page_utils_unittest.cc @@ -17,7 +17,7 @@ #include "base/optional.h" #include "base/run_loop.h" #include "base/strings/string16.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/test/simple_test_clock.h" #include "base/threading/thread_task_runner_handle.h" diff --git a/chrome/browser/offline_pages/visuals_decoder_impl_unittest.cc b/chrome/browser/offline_pages/visuals_decoder_impl_unittest.cc index 5d4da6bce008db..62ac88110835e1 100644 --- a/chrome/browser/offline_pages/visuals_decoder_impl_unittest.cc +++ b/chrome/browser/offline_pages/visuals_decoder_impl_unittest.cc @@ -5,7 +5,7 @@ #include "chrome/browser/offline_pages/visuals_decoder_impl.h" #include "base/base64.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/mock_callback.h" #include "chrome/browser/image_fetcher/image_decoder_impl.h" #include "components/image_fetcher/core/mock_image_decoder.h" diff --git a/chrome/browser/password_check/android/password_check_manager_unittest.cc b/chrome/browser/password_check/android/password_check_manager_unittest.cc index cbc28e2b4c83ce..2ddec135ac4537 100644 --- a/chrome/browser/password_check/android/password_check_manager_unittest.cc +++ b/chrome/browser/password_check/android/password_check_manager_unittest.cc @@ -11,7 +11,7 @@ #include "base/optional.h" #include "base/strings/strcat.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/time/time.h" #include "base/version.h" diff --git a/chrome/browser/pdf/pdf_extension_test.cc b/chrome/browser/pdf/pdf_extension_test.cc index 59e51f26319ce5..7acda1d6702686 100644 --- a/chrome/browser/pdf/pdf_extension_test.cc +++ b/chrome/browser/pdf/pdf_extension_test.cc @@ -22,7 +22,7 @@ #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/synchronization/lock.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/metrics/user_action_tester.h" #include "base/test/test_timeouts.h" diff --git a/chrome/browser/performance_manager/background_tab_loading_policy_browsertest.cc b/chrome/browser/performance_manager/background_tab_loading_policy_browsertest.cc index def6f37eeb424f..35295cad7e498c 100644 --- a/chrome/browser/performance_manager/background_tab_loading_policy_browsertest.cc +++ b/chrome/browser/performance_manager/background_tab_loading_policy_browsertest.cc @@ -4,7 +4,7 @@ #include "chrome/browser/performance_manager/policies/background_tab_loading_policy.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "chrome/browser/performance_manager/policies/policy_features.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/performance_manager/frame_node_impl_browsertest.cc b/chrome/browser/performance_manager/frame_node_impl_browsertest.cc index ad48a94b43af4e..afe57d1e73a7ad 100644 --- a/chrome/browser/performance_manager/frame_node_impl_browsertest.cc +++ b/chrome/browser/performance_manager/frame_node_impl_browsertest.cc @@ -7,7 +7,7 @@ #include "base/callback.h" #include "base/memory/ptr_util.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/ui/browser.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" diff --git a/chrome/browser/performance_manager/graph/page_node_impl_browsertest.cc b/chrome/browser/performance_manager/graph/page_node_impl_browsertest.cc index 00e4555be41184..8f51adf87aa0f7 100644 --- a/chrome/browser/performance_manager/graph/page_node_impl_browsertest.cc +++ b/chrome/browser/performance_manager/graph/page_node_impl_browsertest.cc @@ -8,7 +8,7 @@ #include "base/strings/strcat.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/threading/thread_restrictions.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" diff --git a/chrome/browser/performance_manager/page_load_tracker_decorator_browsertest.cc b/chrome/browser/performance_manager/page_load_tracker_decorator_browsertest.cc index 9cade27d4cb1f8..b4a9e70b7bf622 100644 --- a/chrome/browser/performance_manager/page_load_tracker_decorator_browsertest.cc +++ b/chrome/browser/performance_manager/page_load_tracker_decorator_browsertest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/ui/browser.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" diff --git a/chrome/browser/performance_manager/persistence/site_data/site_data_cache_facade_unittest.cc b/chrome/browser/performance_manager/persistence/site_data/site_data_cache_facade_unittest.cc index 90d5ab3abdee8e..45045e67473083 100644 --- a/chrome/browser/performance_manager/persistence/site_data/site_data_cache_facade_unittest.cc +++ b/chrome/browser/performance_manager/persistence/site_data/site_data_cache_facade_unittest.cc @@ -16,7 +16,7 @@ #include "base/memory/weak_ptr.h" #include "base/run_loop.h" #include "base/task/post_task.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/performance_manager/persistence/site_data/site_data_cache_facade_factory.h" #include "chrome/browser/performance_manager/persistence/site_data/unittest_utils.h" #include "chrome/test/base/testing_profile.h" diff --git a/chrome/browser/performance_manager/tab_properties_decorator_browsertest.cc b/chrome/browser/performance_manager/tab_properties_decorator_browsertest.cc index 01ccae7704488f..cb4a4c5abb988b 100644 --- a/chrome/browser/performance_manager/tab_properties_decorator_browsertest.cc +++ b/chrome/browser/performance_manager/tab_properties_decorator_browsertest.cc @@ -4,7 +4,7 @@ #include "components/performance_manager/public/decorators/tab_properties_decorator.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/test/base/in_process_browser_test.h" diff --git a/chrome/browser/performance_manager/test_support/page_aggregator.cc b/chrome/browser/performance_manager/test_support/page_aggregator.cc index ea75f8938106d2..3063288d919ca7 100644 --- a/chrome/browser/performance_manager/test_support/page_aggregator.cc +++ b/chrome/browser/performance_manager/test_support/page_aggregator.cc @@ -5,7 +5,7 @@ #include "chrome/browser/performance_manager/test_support/page_aggregator.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/performance_manager/decorators/page_aggregator.h" #include "components/performance_manager/public/graph/graph.h" #include "components/performance_manager/public/performance_manager.h" diff --git a/chrome/browser/performance_manager/test_support/site_data_utils.cc b/chrome/browser/performance_manager/test_support/site_data_utils.cc index 24a58eef8e9c02..0028ad66364ed2 100644 --- a/chrome/browser/performance_manager/test_support/site_data_utils.cc +++ b/chrome/browser/performance_manager/test_support/site_data_utils.cc @@ -8,7 +8,7 @@ #include "base/callback_forward.h" #include "base/memory/weak_ptr.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/performance_manager/persistence/site_data/site_data_cache_facade_factory.h" #include "components/performance_manager/persistence/site_data/leveldb_site_data_store.h" #include "components/performance_manager/persistence/site_data/site_data_impl.h" diff --git a/chrome/browser/performance_monitor/metric_evaluator_helper_win_unittest.cc b/chrome/browser/performance_monitor/metric_evaluator_helper_win_unittest.cc index ad3b9b6f08cff8..712fb9f70f2ddd 100644 --- a/chrome/browser/performance_monitor/metric_evaluator_helper_win_unittest.cc +++ b/chrome/browser/performance_monitor/metric_evaluator_helper_win_unittest.cc @@ -5,7 +5,7 @@ #include "chrome/browser/performance_monitor/metric_evaluator_helper_win.h" #include "base/task/thread_pool.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/win/scoped_com_initializer.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/policy/cloud/cloud_policy_manager_browsertest.cc b/chrome/browser/policy/cloud/cloud_policy_manager_browsertest.cc index b08f6e34ffb730..f71b9a60540a6f 100644 --- a/chrome/browser/policy/cloud/cloud_policy_manager_browsertest.cc +++ b/chrome/browser/policy/cloud/cloud_policy_manager_browsertest.cc @@ -6,7 +6,7 @@ #include "base/command_line.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/policy/chrome_browser_policy_connector.h" diff --git a/chrome/browser/policy/cloud/user_policy_signin_service_unittest.cc b/chrome/browser/policy/cloud/user_policy_signin_service_unittest.cc index 62090ead8eebbd..280c63c8be0f8d 100644 --- a/chrome/browser/policy/cloud/user_policy_signin_service_unittest.cc +++ b/chrome/browser/policy/cloud/user_policy_signin_service_unittest.cc @@ -8,7 +8,7 @@ #include "base/bind.h" #include "base/files/file_path.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/threading/thread_task_runner_handle.h" #include "base/time/time.h" #include "build/build_config.h" diff --git a/chrome/browser/policy/extension_policy_browsertest.cc b/chrome/browser/policy/extension_policy_browsertest.cc index 13a7ddb539946f..fbf47bd6a4c309 100644 --- a/chrome/browser/policy/extension_policy_browsertest.cc +++ b/chrome/browser/policy/extension_policy_browsertest.cc @@ -7,7 +7,7 @@ #include "base/files/file_util.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "build/build_config.h" #include "chrome/browser/background/background_contents_service.h" diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc index 84facfc9bf6ff2..37703bd5efb882 100644 --- a/chrome/browser/policy/policy_browsertest.cc +++ b/chrome/browser/policy/policy_browsertest.cc @@ -50,7 +50,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/task/current_thread.h" #include "base/task/post_task.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/test/test_file_util.h" #include "base/threading/thread_restrictions.h" diff --git a/chrome/browser/policy/policy_test_google_browsertest.cc b/chrome/browser/policy/policy_test_google_browsertest.cc index e1a5a7a75cc53b..7a8c200c04b6bc 100644 --- a/chrome/browser/policy/policy_test_google_browsertest.cc +++ b/chrome/browser/policy/policy_test_google_browsertest.cc @@ -8,7 +8,7 @@ #include "base/command_line.h" #include "base/optional.h" #include "base/synchronization/lock.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/values.h" #include "chrome/browser/policy/policy_test_utils.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" diff --git a/chrome/browser/predictors/prefetch_manager_unittest.cc b/chrome/browser/predictors/prefetch_manager_unittest.cc index 27ed80d459ba38..4e47416ff01ccd 100644 --- a/chrome/browser/predictors/prefetch_manager_unittest.cc +++ b/chrome/browser/predictors/prefetch_manager_unittest.cc @@ -13,7 +13,7 @@ #include "base/memory/weak_ptr.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "chrome/browser/predictors/loading_test_util.h" #include "chrome/browser/predictors/predictors_features.h" diff --git a/chrome/browser/prefetch/no_state_prefetch/prerender_nostate_prefetch_browsertest.cc b/chrome/browser/prefetch/no_state_prefetch/prerender_nostate_prefetch_browsertest.cc index c7df3a9e8cfa11..edb4efd7847af4 100644 --- a/chrome/browser/prefetch/no_state_prefetch/prerender_nostate_prefetch_browsertest.cc +++ b/chrome/browser/prefetch/no_state_prefetch/prerender_nostate_prefetch_browsertest.cc @@ -14,7 +14,7 @@ #include "base/strings/string_split.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/simple_test_tick_clock.h" #include "base/threading/platform_thread.h" #include "base/values.h" diff --git a/chrome/browser/prefetch/prefetch_browsertest.cc b/chrome/browser/prefetch/prefetch_browsertest.cc index cb34265faf6d77..17c3e0510bc844 100644 --- a/chrome/browser/prefetch/prefetch_browsertest.cc +++ b/chrome/browser/prefetch/prefetch_browsertest.cc @@ -5,7 +5,7 @@ #include "base/base_switches.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/net/prediction_options.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_test_utils.cc b/chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_test_utils.cc index dc0e8ce0ce038a..8cec84bdcc7d36 100644 --- a/chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_test_utils.cc +++ b/chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_test_utils.cc @@ -7,7 +7,7 @@ #include "base/run_loop.h" #include "base/task/single_thread_task_executor.h" #include "base/task_runner_util.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/threading/thread_task_runner_handle.h" #include "net/base/io_buffer.h" #include "net/base/ip_endpoint.h" diff --git a/chrome/browser/printing/cloud_print/gcd_api_flow_unittest.cc b/chrome/browser/printing/cloud_print/gcd_api_flow_unittest.cc index b6e7f2ea9633e5..1288723d022023 100644 --- a/chrome/browser/printing/cloud_print/gcd_api_flow_unittest.cc +++ b/chrome/browser/printing/cloud_print/gcd_api_flow_unittest.cc @@ -11,7 +11,7 @@ #include "base/bind.h" #include "base/run_loop.h" #include "base/stl_util.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/threading/thread_task_runner_handle.h" #include "base/values.h" #include "chrome/browser/printing/cloud_print/gcd_api_flow_impl.h" diff --git a/chrome/browser/printing/cloud_print/privet_http_unittest.cc b/chrome/browser/printing/cloud_print/privet_http_unittest.cc index c56d0a23625243..4ffe2004a6b38c 100644 --- a/chrome/browser/printing/cloud_print/privet_http_unittest.cc +++ b/chrome/browser/printing/cloud_print/privet_http_unittest.cc @@ -16,7 +16,7 @@ #include "base/path_service.h" #include "base/run_loop.h" #include "base/single_thread_task_runner.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/threading/thread_task_runner_handle.h" #include "chrome/browser/printing/cloud_print/privet_http_impl.h" diff --git a/chrome/browser/printing/cloud_print/privet_url_loader_unittest.cc b/chrome/browser/printing/cloud_print/privet_url_loader_unittest.cc index 32eac3b5d7c824..fb1088df1de262 100644 --- a/chrome/browser/printing/cloud_print/privet_url_loader_unittest.cc +++ b/chrome/browser/printing/cloud_print/privet_url_loader_unittest.cc @@ -10,7 +10,7 @@ #include "base/bind_helpers.h" #include "base/files/file_util.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "net/traffic_annotation/network_traffic_annotation_test_helper.h" #include "services/network/public/cpp/weak_wrapper_shared_url_loader_factory.h" diff --git a/chrome/browser/profile_resetter/profile_resetter_unittest.cc b/chrome/browser/profile_resetter/profile_resetter_unittest.cc index 0d423018cca540..ce3e4af69d1f13 100644 --- a/chrome/browser/profile_resetter/profile_resetter_unittest.cc +++ b/chrome/browser/profile_resetter/profile_resetter_unittest.cc @@ -17,7 +17,7 @@ #include "base/run_loop.h" #include "base/stl_util.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_path_override.h" #include "build/build_config.h" #include "chrome/browser/chrome_notification_types.h" diff --git a/chrome/browser/profiles/profile_browsertest.cc b/chrome/browser/profiles/profile_browsertest.cc index 27b5b04925eb4a..f090296afb2380 100644 --- a/chrome/browser/profiles/profile_browsertest.cc +++ b/chrome/browser/profiles/profile_browsertest.cc @@ -25,7 +25,7 @@ #include "base/synchronization/waitable_event.h" #include "base/task/post_task.h" #include "base/task/thread_pool/thread_pool_instance.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/threading/thread_restrictions.h" #include "base/values.h" diff --git a/chrome/browser/profiles/profile_manager_browsertest.cc b/chrome/browser/profiles/profile_manager_browsertest.cc index fc49d6c0e7af6e..536c74da253a28 100644 --- a/chrome/browser/profiles/profile_manager_browsertest.cc +++ b/chrome/browser/profiles/profile_manager_browsertest.cc @@ -12,7 +12,7 @@ #include "base/run_loop.h" #include "base/stl_util.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "build/build_config.h" #include "chrome/browser/apps/platform_apps/shortcut_manager.h" #include "chrome/browser/password_manager/password_store_factory.h" diff --git a/chrome/browser/push_messaging/push_messaging_browsertest.cc b/chrome/browser/push_messaging/push_messaging_browsertest.cc index 26f36208f6ed48..8356fb54f47e7c 100644 --- a/chrome/browser/push_messaging/push_messaging_browsertest.cc +++ b/chrome/browser/push_messaging/push_messaging_browsertest.cc @@ -15,7 +15,7 @@ #include "base/command_line.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h" #include "build/build_config.h" diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu_browsertest.cc b/chrome/browser/renderer_context_menu/render_view_context_menu_browsertest.cc index 99606c0f96e346..4985ee8b87ac94 100644 --- a/chrome/browser/renderer_context_menu/render_view_context_menu_browsertest.cc +++ b/chrome/browser/renderer_context_menu/render_view_context_menu_browsertest.cc @@ -18,7 +18,7 @@ #include "base/strings/string16.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/threading/thread_restrictions.h" #include "base/values.h" #include "build/build_config.h" diff --git a/chrome/browser/resource_coordinator/discard_before_unload_helper_browsertest.cc b/chrome/browser/resource_coordinator/discard_before_unload_helper_browsertest.cc index 742e466b737312..b022a260b0e42d 100644 --- a/chrome/browser/resource_coordinator/discard_before_unload_helper_browsertest.cc +++ b/chrome/browser/resource_coordinator/discard_before_unload_helper_browsertest.cc @@ -6,7 +6,7 @@ #include "base/bind.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/ui/browser.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" diff --git a/chrome/browser/resource_coordinator/session_restore_policy_unittest.cc b/chrome/browser/resource_coordinator/session_restore_policy_unittest.cc index 6db96e39d15e0c..addcf2cc81762a 100644 --- a/chrome/browser/resource_coordinator/session_restore_policy_unittest.cc +++ b/chrome/browser/resource_coordinator/session_restore_policy_unittest.cc @@ -11,7 +11,7 @@ #include "base/memory/weak_ptr.h" #include "base/rand_util.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/simple_test_tick_clock.h" #include "build/build_config.h" #include "chrome/browser/notifications/notification_permission_context.h" diff --git a/chrome/browser/resource_coordinator/tab_lifecycle_unit_source_unittest.cc b/chrome/browser/resource_coordinator/tab_lifecycle_unit_source_unittest.cc index 628a7643831220..1107eed35e7725 100644 --- a/chrome/browser/resource_coordinator/tab_lifecycle_unit_source_unittest.cc +++ b/chrome/browser/resource_coordinator/tab_lifecycle_unit_source_unittest.cc @@ -10,7 +10,7 @@ #include "base/bind.h" #include "base/macros.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "build/build_config.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/safe_browsing/chrome_password_protection_service_unittest.cc b/chrome/browser/safe_browsing/chrome_password_protection_service_unittest.cc index d01b6d288c6242..c3daf7a8b35434 100644 --- a/chrome/browser/safe_browsing/chrome_password_protection_service_unittest.cc +++ b/chrome/browser/safe_browsing/chrome_password_protection_service_unittest.cc @@ -10,7 +10,7 @@ #include "base/memory/weak_ptr.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "build/build_config.h" #include "chrome/browser/password_manager/account_password_store_factory.h" diff --git a/chrome/browser/safe_browsing/client_side_detection_service_browsertest.cc b/chrome/browser/safe_browsing/client_side_detection_service_browsertest.cc index d5f9c0293b84f5..fb68b3fa44bc30 100644 --- a/chrome/browser/safe_browsing/client_side_detection_service_browsertest.cc +++ b/chrome/browser/safe_browsing/client_side_detection_service_browsertest.cc @@ -4,7 +4,7 @@ #include "chrome/browser/safe_browsing/client_side_detection_service.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/safe_browsing/client_side_detection_service_factory.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/safe_browsing/client_side_detection_service_unittest.cc b/chrome/browser/safe_browsing/client_side_detection_service_unittest.cc index 66a573b4936a4f..ce1713f7b98504 100644 --- a/chrome/browser/safe_browsing/client_side_detection_service_unittest.cc +++ b/chrome/browser/safe_browsing/client_side_detection_service_unittest.cc @@ -17,7 +17,7 @@ #include "base/metrics/field_trial.h" #include "base/run_loop.h" #include "base/strings/string_number_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/time/time.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile.h" diff --git a/chrome/browser/safe_browsing/cloud_content_scanning/binary_fcm_service_unittest.cc b/chrome/browser/safe_browsing/cloud_content_scanning/binary_fcm_service_unittest.cc index 6b1a0d595eb7b3..65799e8ff32976 100644 --- a/chrome/browser/safe_browsing/cloud_content_scanning/binary_fcm_service_unittest.cc +++ b/chrome/browser/safe_browsing/cloud_content_scanning/binary_fcm_service_unittest.cc @@ -8,7 +8,7 @@ #include "base/bind_helpers.h" #include "base/notreached.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/time/time.h" #include "chrome/browser/gcm/gcm_profile_service_factory.h" diff --git a/chrome/browser/safe_browsing/cloud_content_scanning/file_analysis_request_unittest.cc b/chrome/browser/safe_browsing/cloud_content_scanning/file_analysis_request_unittest.cc index 6889810e4eef99..8ce9e51df89e95 100644 --- a/chrome/browser/safe_browsing/cloud_content_scanning/file_analysis_request_unittest.cc +++ b/chrome/browser/safe_browsing/cloud_content_scanning/file_analysis_request_unittest.cc @@ -9,7 +9,7 @@ #include "base/files/scoped_temp_dir.h" #include "base/path_service.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "chrome/browser/enterprise/connectors/common.h" #include "chrome/browser/enterprise/connectors/content_analysis_delegate.h" diff --git a/chrome/browser/safe_browsing/download_protection/download_protection_service_unittest.cc b/chrome/browser/safe_browsing/download_protection/download_protection_service_unittest.cc index 0df0e78071568d..19d3c3f5a6692e 100644 --- a/chrome/browser/safe_browsing/download_protection/download_protection_service_unittest.cc +++ b/chrome/browser/safe_browsing/download_protection/download_protection_service_unittest.cc @@ -32,7 +32,7 @@ #include "base/strings/string_number_conversions.h" #include "base/task/post_task.h" #include "base/task/thread_pool/thread_pool_instance.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/threading/thread_task_runner_handle.h" #include "build/build_config.h" diff --git a/chrome/browser/search/background/ntp_background_service_unittest.cc b/chrome/browser/search/background/ntp_background_service_unittest.cc index e50d49b87519ae..a5b819048a5ae7 100644 --- a/chrome/browser/search/background/ntp_background_service_unittest.cc +++ b/chrome/browser/search/background/ntp_background_service_unittest.cc @@ -8,7 +8,7 @@ #include #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "chrome/browser/search/background/ntp_background_data.h" #include "content/public/test/browser_task_environment.h" diff --git a/chrome/browser/search/one_google_bar/one_google_bar_loader_impl_unittest.cc b/chrome/browser/search/one_google_bar/one_google_bar_loader_impl_unittest.cc index 27e17125e02c35..d58cdda936a848 100644 --- a/chrome/browser/search/one_google_bar/one_google_bar_loader_impl_unittest.cc +++ b/chrome/browser/search/one_google_bar/one_google_bar_loader_impl_unittest.cc @@ -9,7 +9,7 @@ #include "base/optional.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/mock_callback.h" #include "base/test/test_simple_task_runner.h" #include "base/time/time.h" diff --git a/chrome/browser/search/promos/promo_service_unittest.cc b/chrome/browser/search/promos/promo_service_unittest.cc index 3d6e9f36f43f1c..68b0addcc08324 100644 --- a/chrome/browser/search/promos/promo_service_unittest.cc +++ b/chrome/browser/search/promos/promo_service_unittest.cc @@ -8,7 +8,7 @@ #include #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h" #include "chrome/browser/extensions/extension_service.h" diff --git a/chrome/browser/search/search_suggest/search_suggest_loader_impl_unittest.cc b/chrome/browser/search/search_suggest/search_suggest_loader_impl_unittest.cc index 7dcbf07a22c938..0e55f2658e317a 100644 --- a/chrome/browser/search/search_suggest/search_suggest_loader_impl_unittest.cc +++ b/chrome/browser/search/search_suggest/search_suggest_loader_impl_unittest.cc @@ -9,7 +9,7 @@ #include "base/optional.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/mock_callback.h" #include "base/test/test_simple_task_runner.h" #include "base/time/time.h" diff --git a/chrome/browser/search/task_module/task_module_service_unittest.cc b/chrome/browser/search/task_module/task_module_service_unittest.cc index 40e7399eb14f37..4ec7805f8ac7ec 100644 --- a/chrome/browser/search/task_module/task_module_service_unittest.cc +++ b/chrome/browser/search/task_module/task_module_service_unittest.cc @@ -5,7 +5,7 @@ #include #include "base/memory/scoped_refptr.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/mock_callback.h" #include "chrome/browser/search/task_module/task_module_service.h" #include "chrome/test/base/testing_profile.h" diff --git a/chrome/browser/search_engines/template_url_scraper_browsertest.cc b/chrome/browser/search_engines/template_url_scraper_browsertest.cc index 2d9d500353df74..1bfc2fb42c4095 100644 --- a/chrome/browser/search_engines/template_url_scraper_browsertest.cc +++ b/chrome/browser/search_engines/template_url_scraper_browsertest.cc @@ -11,7 +11,7 @@ #include "base/path_service.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/search_engines/template_url_service_test_util.cc b/chrome/browser/search_engines/template_url_service_test_util.cc index cc7580e8c003c3..ce2d543d71f0d5 100644 --- a/chrome/browser/search_engines/template_url_service_test_util.cc +++ b/chrome/browser/search_engines/template_url_service_test_util.cc @@ -8,7 +8,7 @@ #include "base/macros.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/threading/thread_task_runner_handle.h" #include "chrome/browser/history/history_service_factory.h" #include "chrome/browser/search_engines/chrome_template_url_service_client.h" diff --git a/chrome/browser/search_engines/template_url_service_unittest.cc b/chrome/browser/search_engines/template_url_service_unittest.cc index e06ee49121a004..926cf85d0a54f6 100644 --- a/chrome/browser/search_engines/template_url_service_unittest.cc +++ b/chrome/browser/search_engines/template_url_service_unittest.cc @@ -19,7 +19,7 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/task/cancelable_task_tracker.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/simple_test_clock.h" #include "base/threading/thread.h" diff --git a/chrome/browser/services_unittest.cc b/chrome/browser/services_unittest.cc index db7724ec673c85..3f29c665da5bb6 100644 --- a/chrome/browser/services_unittest.cc +++ b/chrome/browser/services_unittest.cc @@ -6,7 +6,7 @@ #include "base/bind.h" #include "base/macros.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "components/services/patch/content/patch_service.h" #include "components/services/patch/public/mojom/file_patcher.mojom.h" #include "components/services/unzip/content/unzip_service.h" diff --git a/chrome/browser/sessions/better_session_restore_browsertest.cc b/chrome/browser/sessions/better_session_restore_browsertest.cc index 2ee4767c406c20..2c72e86350c41a 100644 --- a/chrome/browser/sessions/better_session_restore_browsertest.cc +++ b/chrome/browser/sessions/better_session_restore_browsertest.cc @@ -13,7 +13,7 @@ #include "base/macros.h" #include "base/path_service.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/threading/thread_restrictions.h" #include "build/build_config.h" #include "chrome/browser/background/background_mode_manager.h" diff --git a/chrome/browser/sessions/session_restore_browsertest.cc b/chrome/browser/sessions/session_restore_browsertest.cc index 6880af4c1b919d..d5f24baa755db1 100644 --- a/chrome/browser/sessions/session_restore_browsertest.cc +++ b/chrome/browser/sessions/session_restore_browsertest.cc @@ -15,7 +15,7 @@ #include "base/macros.h" #include "base/process/launch.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/threading/thread_restrictions.h" #include "base/time/time.h" diff --git a/chrome/browser/sessions/tab_loader_tester.cc b/chrome/browser/sessions/tab_loader_tester.cc index c1d1a644e0ee07..c4c3dfd9dc1b11 100644 --- a/chrome/browser/sessions/tab_loader_tester.cc +++ b/chrome/browser/sessions/tab_loader_tester.cc @@ -5,7 +5,7 @@ #include "chrome/browser/sessions/tab_loader_tester.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" TabLoaderTester::TabLoaderTester() = default; diff --git a/chrome/browser/sessions/tab_restore_service_unittest.cc b/chrome/browser/sessions/tab_restore_service_unittest.cc index f3f91722947262..ee5955988f166f 100644 --- a/chrome/browser/sessions/tab_restore_service_unittest.cc +++ b/chrome/browser/sessions/tab_restore_service_unittest.cc @@ -16,7 +16,7 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/sessions/chrome_tab_restore_service_client.h" #include "chrome/browser/sessions/session_service.h" diff --git a/chrome/browser/sharing/sharing_device_registration_unittest.cc b/chrome/browser/sharing/sharing_device_registration_unittest.cc index 1ff0e57cf75c9f..6161e12104eb3d 100644 --- a/chrome/browser/sharing/sharing_device_registration_unittest.cc +++ b/chrome/browser/sharing/sharing_device_registration_unittest.cc @@ -11,7 +11,7 @@ #include #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h" #include "build/build_config.h" diff --git a/chrome/browser/sharing/sharing_device_source_sync_unittest.cc b/chrome/browser/sharing/sharing_device_source_sync_unittest.cc index 2c751fc6d42a27..22d98837f30cd2 100644 --- a/chrome/browser/sharing/sharing_device_source_sync_unittest.cc +++ b/chrome/browser/sharing/sharing_device_source_sync_unittest.cc @@ -9,7 +9,7 @@ #include "base/callback.h" #include "base/guid.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/time/time.h" #include "chrome/browser/sharing/fake_device_info.h" diff --git a/chrome/browser/sharing/sharing_device_source_unittest.cc b/chrome/browser/sharing/sharing_device_source_unittest.cc index 7ef2e7ab004973..11f59d2aa48d05 100644 --- a/chrome/browser/sharing/sharing_device_source_unittest.cc +++ b/chrome/browser/sharing/sharing_device_source_unittest.cc @@ -5,7 +5,7 @@ #include "chrome/browser/sharing/sharing_device_source.h" #include "base/callback.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/sharing/mock_sharing_device_source.h" #include "components/sync_device_info/device_info.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/chrome/browser/sharing/sms/sms_fetch_request_handler_unittest.cc b/chrome/browser/sharing/sms/sms_fetch_request_handler_unittest.cc index 1439aa81771a80..7342ad2d47d2c3 100644 --- a/chrome/browser/sharing/sms/sms_fetch_request_handler_unittest.cc +++ b/chrome/browser/sharing/sms/sms_fetch_request_handler_unittest.cc @@ -5,7 +5,7 @@ #include "chrome/browser/sharing/sms/sms_fetch_request_handler.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/sharing/proto/sharing_message.pb.h" #include "chrome/browser/sharing/sharing_message_handler.h" #include "content/public/browser/sms_fetcher.h" diff --git a/chrome/browser/sharing/sms/sms_remote_fetcher_unittest.cc b/chrome/browser/sharing/sms/sms_remote_fetcher_unittest.cc index bcc46f2522c040..37345226581b82 100644 --- a/chrome/browser/sharing/sms/sms_remote_fetcher_unittest.cc +++ b/chrome/browser/sharing/sms/sms_remote_fetcher_unittest.cc @@ -5,7 +5,7 @@ #include "chrome/browser/sharing/sms/sms_remote_fetcher.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "chrome/browser/sharing/fake_device_info.h" #include "chrome/browser/sharing/mock_sharing_service.h" diff --git a/chrome/browser/sharing/webrtc/ice_config_fetcher_unittest.cc b/chrome/browser/sharing/webrtc/ice_config_fetcher_unittest.cc index 163901a521531e..114a6659583dc9 100644 --- a/chrome/browser/sharing/webrtc/ice_config_fetcher_unittest.cc +++ b/chrome/browser/sharing/webrtc/ice_config_fetcher_unittest.cc @@ -8,7 +8,7 @@ #include "base/path_service.h" #include "base/run_loop.h" #include "base/strings/strcat.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/task_environment.h" #include "chrome/common/chrome_paths.h" diff --git a/chrome/browser/signin/dice_web_signin_interceptor_browsertest.cc b/chrome/browser/signin/dice_web_signin_interceptor_browsertest.cc index 1cca9d182faff8..16e84c302e16e5 100644 --- a/chrome/browser/signin/dice_web_signin_interceptor_browsertest.cc +++ b/chrome/browser/signin/dice_web_signin_interceptor_browsertest.cc @@ -9,7 +9,7 @@ #include "base/run_loop.h" #include "base/scoped_observer.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile_attributes_entry.h" diff --git a/chrome/browser/signin/mirror_browsertest.cc b/chrome/browser/signin/mirror_browsertest.cc index 8c08c1eb9220b6..09817de1724afb 100644 --- a/chrome/browser/signin/mirror_browsertest.cc +++ b/chrome/browser/signin/mirror_browsertest.cc @@ -15,7 +15,7 @@ #include "base/path_service.h" #include "base/run_loop.h" #include "base/task/post_task.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_content_browser_client.h" diff --git a/chrome/browser/signin/signin_util_win_browsertest.cc b/chrome/browser/signin/signin_util_win_browsertest.cc index 7f43576bd24d07..c8b5e3324732c3 100644 --- a/chrome/browser/signin/signin_util_win_browsertest.cc +++ b/chrome/browser/signin/signin_util_win_browsertest.cc @@ -10,7 +10,7 @@ #include "base/macros.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/test_reg_util_win.h" #include "base/win/wincrypt_shim.h" #include "build/build_config.h" diff --git a/chrome/browser/spellchecker/spelling_service_client_unittest.cc b/chrome/browser/spellchecker/spelling_service_client_unittest.cc index 507160cc699990..07402cf5019bb4 100644 --- a/chrome/browser/spellchecker/spelling_service_client_unittest.cc +++ b/chrome/browser/spellchecker/spelling_service_client_unittest.cc @@ -15,7 +15,7 @@ #include "base/stl_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/values.h" #include "chrome/test/base/testing_profile.h" #include "components/prefs/pref_service.h" diff --git a/chrome/browser/ssl/certificate_error_reporter_unittest.cc b/chrome/browser/ssl/certificate_error_reporter_unittest.cc index e7150110e63393..3103d48aab00da 100644 --- a/chrome/browser/ssl/certificate_error_reporter_unittest.cc +++ b/chrome/browser/ssl/certificate_error_reporter_unittest.cc @@ -15,7 +15,7 @@ #include "base/macros.h" #include "base/run_loop.h" #include "base/strings/string_piece.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "components/encrypted_messages/encrypted_message.pb.h" #include "components/encrypted_messages/message_encrypter.h" diff --git a/chrome/browser/ssl/security_state_tab_helper_browsertest.cc b/chrome/browser/ssl/security_state_tab_helper_browsertest.cc index 98833a92895ad5..5fd6ed8b747af4 100644 --- a/chrome/browser/ssl/security_state_tab_helper_browsertest.cc +++ b/chrome/browser/ssl/security_state_tab_helper_browsertest.cc @@ -18,7 +18,7 @@ #include "base/strings/string_split.h" #include "base/strings/utf_string_conversions.h" #include "base/task/post_task.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_command_line.h" #include "base/test/scoped_feature_list.h" diff --git a/chrome/browser/ssl/ssl_browsertest.cc b/chrome/browser/ssl/ssl_browsertest.cc index 8dd8d06b73e00a..a65a40de4a500b 100644 --- a/chrome/browser/ssl/ssl_browsertest.cc +++ b/chrome/browser/ssl/ssl_browsertest.cc @@ -26,7 +26,7 @@ #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/task/current_thread.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_command_line.h" #include "base/test/scoped_feature_list.h" diff --git a/chrome/browser/supervised_user/supervised_user_url_filter_browsertest.cc b/chrome/browser/supervised_user/supervised_user_url_filter_browsertest.cc index 9afef29dc80724..4bdb73d99a21b6 100644 --- a/chrome/browser/supervised_user/supervised_user_url_filter_browsertest.cc +++ b/chrome/browser/supervised_user/supervised_user_url_filter_browsertest.cc @@ -9,7 +9,7 @@ #include "base/command_line.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/values.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/history/history_service_factory.h" diff --git a/chrome/browser/sync/test/integration/cookie_helper.cc b/chrome/browser/sync/test/integration/cookie_helper.cc index 8157d140fde8f4..3567838b132f76 100644 --- a/chrome/browser/sync/test/integration/cookie_helper.cc +++ b/chrome/browser/sync/test/integration/cookie_helper.cc @@ -5,7 +5,7 @@ #include "chrome/browser/sync/test/integration/cookie_helper.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/profiles/profile.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/storage_partition.h" diff --git a/chrome/browser/sync/test/integration/enable_disable_test.cc b/chrome/browser/sync/test/integration/enable_disable_test.cc index 84b48f1aeddd08..6030931d38d941 100644 --- a/chrome/browser/sync/test/integration/enable_disable_test.cc +++ b/chrome/browser/sync/test/integration/enable_disable_test.cc @@ -7,7 +7,7 @@ #include "base/macros.h" #include "base/run_loop.h" #include "base/strings/string_util.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/values.h" #include "build/build_config.h" diff --git a/chrome/browser/sync/test/integration/profile_sync_service_harness.cc b/chrome/browser/sync/test/integration/profile_sync_service_harness.cc index 69378e858c95b1..b290e6fc3b0e45 100644 --- a/chrome/browser/sync/test/integration/profile_sync_service_harness.cc +++ b/chrome/browser/sync/test/integration/profile_sync_service_harness.cc @@ -13,7 +13,7 @@ #include "base/json/json_writer.h" #include "base/logging.h" #include "base/memory/ptr_util.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "build/build_config.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/signin/identity_manager_factory.h" diff --git a/chrome/browser/sync/test/integration/single_client_history_delete_directives_sync_test.cc b/chrome/browser/sync/test/integration/single_client_history_delete_directives_sync_test.cc index bede64c057eec8..be40dfc1f9ec65 100644 --- a/chrome/browser/sync/test/integration/single_client_history_delete_directives_sync_test.cc +++ b/chrome/browser/sync/test/integration/single_client_history_delete_directives_sync_test.cc @@ -7,7 +7,7 @@ #include "base/macros.h" #include "base/run_loop.h" #include "base/task/cancelable_task_tracker.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/history/history_service_factory.h" #include "chrome/browser/history/web_history_service_factory.h" #include "chrome/browser/sync/test/integration/single_client_status_change_checker.h" diff --git a/chrome/browser/sync/test/integration/single_client_user_events_sync_test.cc b/chrome/browser/sync/test/integration/single_client_user_events_sync_test.cc index 918683c3aeb1e1..f033d7060efc3a 100644 --- a/chrome/browser/sync/test/integration/single_client_user_events_sync_test.cc +++ b/chrome/browser/sync/test/integration/single_client_user_events_sync_test.cc @@ -4,7 +4,7 @@ #include "base/bind.h" #include "base/macros.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/time/time.h" #include "build/build_config.h" #include "chrome/browser/sync/test/integration/bookmarks_helper.h" diff --git a/chrome/browser/sync/test/integration/sync_errors_test.cc b/chrome/browser/sync/test/integration/sync_errors_test.cc index 9ac6e6a76dcc52..7bf5276a85cc5b 100644 --- a/chrome/browser/sync/test/integration/sync_errors_test.cc +++ b/chrome/browser/sync/test/integration/sync_errors_test.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/macros.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "build/build_config.h" #include "chrome/browser/sync/test/integration/bookmarks_helper.h" #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" diff --git a/chrome/browser/sync/test/integration/sync_test_utils_android.cc b/chrome/browser/sync/test/integration/sync_test_utils_android.cc index 00b389b5d22cc1..625f8406017b92 100644 --- a/chrome/browser/sync/test/integration/sync_test_utils_android.cc +++ b/chrome/browser/sync/test/integration/sync_test_utils_android.cc @@ -9,7 +9,7 @@ #include "base/run_loop.h" #include "base/task/post_task.h" #include "base/task/thread_pool.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/test/sync_integration_test_support_jni_headers/AndroidSyncSettingsTestUtils_jni.h" #include "chrome/test/sync_integration_test_support_jni_headers/SyncTestSigninUtils_jni.h" diff --git a/chrome/browser/sync/test/integration/two_client_web_apps_bmo_sync_test.cc b/chrome/browser/sync/test/integration/two_client_web_apps_bmo_sync_test.cc index f2ad7181b110ac..4de7e8270e99c6 100644 --- a/chrome/browser/sync/test/integration/two_client_web_apps_bmo_sync_test.cc +++ b/chrome/browser/sync/test/integration/two_client_web_apps_bmo_sync_test.cc @@ -6,7 +6,7 @@ #include "base/bind.h" #include "base/macros.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "build/build_config.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/installable/installable_metrics.h" diff --git a/chrome/browser/sync/test/integration/two_client_web_apps_sync_test.cc b/chrome/browser/sync/test/integration/two_client_web_apps_sync_test.cc index c7fdf87258b5b7..6164a6f2e8aa0c 100644 --- a/chrome/browser/sync/test/integration/two_client_web_apps_sync_test.cc +++ b/chrome/browser/sync/test/integration/two_client_web_apps_sync_test.cc @@ -5,7 +5,7 @@ #include "base/bind.h" #include "base/macros.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/installable/installable_metrics.h" #include "chrome/browser/sync/test/integration/sync_test.h" diff --git a/chrome/browser/tab_contents/form_interaction_tab_helper_unittest.cc b/chrome/browser/tab_contents/form_interaction_tab_helper_unittest.cc index 38c7993d8a35ff..db9102cc504388 100644 --- a/chrome/browser/tab_contents/form_interaction_tab_helper_unittest.cc +++ b/chrome/browser/tab_contents/form_interaction_tab_helper_unittest.cc @@ -11,7 +11,7 @@ #include "base/run_loop.h" #include "base/task/post_task.h" #include "base/task/task_traits.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/performance_manager/test_support/page_aggregator.h" #include "chrome/test/base/chrome_render_view_host_test_harness.h" #include "components/performance_manager/embedder/performance_manager_registry.h" diff --git a/chrome/browser/tab_contents/view_source_browsertest.cc b/chrome/browser/tab_contents/view_source_browsertest.cc index dc01e1f9b4f95b..43e107851f66ff 100644 --- a/chrome/browser/tab_contents/view_source_browsertest.cc +++ b/chrome/browser/tab_contents/view_source_browsertest.cc @@ -6,7 +6,7 @@ #include "base/command_line.h" #include "base/macros.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/translate/language_detection_service_browsertest.cc b/chrome/browser/translate/language_detection_service_browsertest.cc index 6e498cb4c5318e..8c8c6c5d36ae7b 100644 --- a/chrome/browser/translate/language_detection_service_browsertest.cc +++ b/chrome/browser/translate/language_detection_service_browsertest.cc @@ -7,7 +7,7 @@ #include "base/run_loop.h" #include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/test/base/in_process_browser_test.h" #include "components/services/language_detection/public/cpp/language_detection_service.h" #include "content/public/test/browser_test.h" diff --git a/chrome/browser/ui/app_list/app_context_menu_unittest.cc b/chrome/browser/ui/app_list/app_context_menu_unittest.cc index 487a2268f538c3..1d2d2c6ec0c028 100644 --- a/chrome/browser/ui/app_list/app_context_menu_unittest.cc +++ b/chrome/browser/ui/app_list/app_context_menu_unittest.cc @@ -15,7 +15,7 @@ #include "base/run_loop.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "chrome/browser/apps/app_service/app_service_proxy.h" #include "chrome/browser/apps/app_service/app_service_proxy_factory.h" diff --git a/chrome/browser/ui/app_list/app_list_client_impl_browsertest.cc b/chrome/browser/ui/app_list/app_list_client_impl_browsertest.cc index 9b1a995e631a20..a124e73f5144ff 100644 --- a/chrome/browser/ui/app_list/app_list_client_impl_browsertest.cc +++ b/chrome/browser/ui/app_list/app_list_client_impl_browsertest.cc @@ -14,7 +14,7 @@ #include "base/run_loop.h" #include "base/strings/strcat.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "build/branding_buildflags.h" #include "build/build_config.h" diff --git a/chrome/browser/ui/app_list/arc/arc_app_unittest.cc b/chrome/browser/ui/app_list/arc/arc_app_unittest.cc index bf008f7dce6372..267cc422f13692 100644 --- a/chrome/browser/ui/app_list/arc/arc_app_unittest.cc +++ b/chrome/browser/ui/app_list/arc/arc_app_unittest.cc @@ -22,7 +22,7 @@ #include "base/run_loop.h" #include "base/stl_util.h" #include "base/task_runner_util.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_command_line.h" #include "base/values.h" diff --git a/chrome/browser/ui/app_list/search/app_list_search_browsertest.cc b/chrome/browser/ui/app_list/search/app_list_search_browsertest.cc index 28309f2d78f425..407fbc5517e382 100644 --- a/chrome/browser/ui/app_list/search/app_list_search_browsertest.cc +++ b/chrome/browser/ui/app_list/search/app_list_search_browsertest.cc @@ -7,7 +7,7 @@ #include "base/path_service.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "chrome/browser/chromeos/web_applications/default_web_app_ids.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/ui/ash/assistant/assistant_browsertest.cc b/chrome/browser/ui/ash/assistant/assistant_browsertest.cc index 4cadba33f4ac32..a2379d08a83706 100644 --- a/chrome/browser/ui/ash/assistant/assistant_browsertest.cc +++ b/chrome/browser/ui/ash/assistant/assistant_browsertest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_run_loop_timeout.h" #include "base/time/time.h" #include "chrome/browser/ui/ash/assistant/assistant_test_mixin.h" diff --git a/chrome/browser/ui/ash/assistant/assistant_timers_browsertest.cc b/chrome/browser/ui/ash/assistant/assistant_timers_browsertest.cc index 4599875311d92b..203067831163db 100644 --- a/chrome/browser/ui/ash/assistant/assistant_timers_browsertest.cc +++ b/chrome/browser/ui/ash/assistant/assistant_timers_browsertest.cc @@ -15,7 +15,7 @@ #include "ash/system/unified/unified_system_tray.h" #include "base/scoped_observer.h" #include "base/strings/string_util.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/icu_test_util.h" #include "chrome/browser/ui/ash/assistant/assistant_test_mixin.h" #include "chrome/browser/ui/ash/assistant/test_support/test_util.h" diff --git a/chrome/browser/ui/ash/clipboard_history_browsertest.cc b/chrome/browser/ui/ash/clipboard_history_browsertest.cc index cb9d571bf00852..77b5df38b40d9f 100644 --- a/chrome/browser/ui/ash/clipboard_history_browsertest.cc +++ b/chrome/browser/ui/ash/clipboard_history_browsertest.cc @@ -11,7 +11,7 @@ #include "ash/clipboard/clipboard_history_menu_model_adapter.h" #include "ash/clipboard/views/clipboard_history_item_view.h" #include "ash/shell.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h" #include "chrome/browser/chromeos/login/login_manager_test.h" diff --git a/chrome/browser/ui/ash/holding_space/holding_space_client_impl_browsertest.cc b/chrome/browser/ui/ash/holding_space/holding_space_client_impl_browsertest.cc index 9419e73413b41a..6431aa237f8199 100644 --- a/chrome/browser/ui/ash/holding_space/holding_space_client_impl_browsertest.cc +++ b/chrome/browser/ui/ash/holding_space/holding_space_client_impl_browsertest.cc @@ -16,7 +16,7 @@ #include "base/files/file_util.h" #include "base/path_service.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/unguessable_token.h" #include "chrome/browser/chromeos/file_manager/path_util.h" #include "chrome/browser/extensions/component_loader.h" diff --git a/chrome/browser/ui/ash/holding_space/holding_space_keyed_service_browsertest.cc b/chrome/browser/ui/ash/holding_space/holding_space_keyed_service_browsertest.cc index 783d780733cd8a..a422fa26694c5e 100644 --- a/chrome/browser/ui/ash/holding_space/holding_space_keyed_service_browsertest.cc +++ b/chrome/browser/ui/ash/holding_space/holding_space_keyed_service_browsertest.cc @@ -14,7 +14,7 @@ #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/unguessable_token.h" #include "chrome/browser/chromeos/file_manager/path_util.h" diff --git a/chrome/browser/ui/ash/holding_space/holding_space_keyed_service_unittest.cc b/chrome/browser/ui/ash/holding_space/holding_space_keyed_service_unittest.cc index 0d327827192c25..b589f561d9c951 100644 --- a/chrome/browser/ui/ash/holding_space/holding_space_keyed_service_unittest.cc +++ b/chrome/browser/ui/ash/holding_space/holding_space_keyed_service_unittest.cc @@ -19,7 +19,7 @@ #include "base/guid.h" #include "base/scoped_observer.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/test/simple_test_clock.h" #include "chrome/browser/chromeos/file_manager/app_id.h" diff --git a/chrome/browser/ui/ash/holding_space/holding_space_thumbnail_loader_browsertest.cc b/chrome/browser/ui/ash/holding_space/holding_space_thumbnail_loader_browsertest.cc index 1d895cefd21d13..a30eff20f1c6e2 100644 --- a/chrome/browser/ui/ash/holding_space/holding_space_thumbnail_loader_browsertest.cc +++ b/chrome/browser/ui/ash/holding_space/holding_space_thumbnail_loader_browsertest.cc @@ -10,7 +10,7 @@ #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/path_service.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/chromeos/file_manager/app_id.h" #include "chrome/browser/chromeos/file_manager/fileapi_util.h" #include "chrome/browser/chromeos/file_manager/open_util.h" diff --git a/chrome/browser/ui/ash/holding_space/holding_space_ui_browsertest.cc b/chrome/browser/ui/ash/holding_space/holding_space_ui_browsertest.cc index 03dff2a7747752..17ea10dd191d58 100644 --- a/chrome/browser/ui/ash/holding_space/holding_space_ui_browsertest.cc +++ b/chrome/browser/ui/ash/holding_space/holding_space_ui_browsertest.cc @@ -10,7 +10,7 @@ #include "ash/public/cpp/holding_space/holding_space_model.h" #include "ash/public/cpp/holding_space/holding_space_model_observer.h" #include "base/scoped_observer.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/ui/browser_window.h" #include "content/public/test/browser_test.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/chrome/browser/ui/ash/ime_controller_client_unittest.cc b/chrome/browser/ui/ash/ime_controller_client_unittest.cc index 0657447a24f441..009d29d5ce0484 100644 --- a/chrome/browser/ui/ash/ime_controller_client_unittest.cc +++ b/chrome/browser/ui/ash/ime_controller_client_unittest.cc @@ -14,7 +14,7 @@ #include "base/macros.h" #include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "chrome/browser/ui/ash/test_ime_controller.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/ui/ash/in_session_auth_dialog_client_unittest.cc b/chrome/browser/ui/ash/in_session_auth_dialog_client_unittest.cc index aaf60b2ad4fd37..00d8ab8454fb16 100644 --- a/chrome/browser/ui/ash/in_session_auth_dialog_client_unittest.cc +++ b/chrome/browser/ui/ash/in_session_auth_dialog_client_unittest.cc @@ -9,7 +9,7 @@ #include "base/callback.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h" #include "chrome/browser/chromeos/profiles/profile_helper.h" #include "chromeos/login/auth/fake_extended_authenticator.h" diff --git a/chrome/browser/ui/ash/launcher/app_service/app_service_shelf_context_menu_browsertest.cc b/chrome/browser/ui/ash/launcher/app_service/app_service_shelf_context_menu_browsertest.cc index 441c70f4ce6948..77130944b8e4f5 100644 --- a/chrome/browser/ui/ash/launcher/app_service/app_service_shelf_context_menu_browsertest.cc +++ b/chrome/browser/ui/ash/launcher/app_service/app_service_shelf_context_menu_browsertest.cc @@ -7,7 +7,7 @@ #include "ash/public/cpp/shelf_model.h" #include "base/bind_helpers.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/user_action_tester.h" #include "base/test/scoped_feature_list.h" #include "chrome/browser/apps/app_service/app_service_proxy.h" diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc index 1345fc8171e242..aba6c71c9c1b9b 100644 --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc @@ -33,7 +33,7 @@ #include "base/run_loop.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h" #include "chrome/app/chrome_command_ids.h" diff --git a/chrome/browser/ui/ash/launcher/shelf_context_menu_unittest.cc b/chrome/browser/ui/ash/launcher/shelf_context_menu_unittest.cc index 0092d5d7ee9b1a..5def6b7ff51ed1 100644 --- a/chrome/browser/ui/ash/launcher/shelf_context_menu_unittest.cc +++ b/chrome/browser/ui/ash/launcher/shelf_context_menu_unittest.cc @@ -15,7 +15,7 @@ #include "base/run_loop.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/apps/app_service/app_service_test.h" #include "chrome/browser/chromeos/arc/icon_decode_request.h" diff --git a/chrome/browser/ui/bookmarks/bookmark_browsertest.cc b/chrome/browser/ui/bookmarks/bookmark_browsertest.cc index 7c51f54f9e48a3..c03e0503728bc6 100644 --- a/chrome/browser/ui/bookmarks/bookmark_browsertest.cc +++ b/chrome/browser/ui/bookmarks/bookmark_browsertest.cc @@ -6,7 +6,7 @@ #include "base/macros.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/timer/timer.h" #include "build/build_config.h" diff --git a/chrome/browser/ui/cocoa/tab_contents/web_contents_view_mac_interactive_uitest.mm b/chrome/browser/ui/cocoa/tab_contents/web_contents_view_mac_interactive_uitest.mm index 053dffac3bfaf1..92dc2be29c4489 100644 --- a/chrome/browser/ui/cocoa/tab_contents/web_contents_view_mac_interactive_uitest.mm +++ b/chrome/browser/ui/cocoa/tab_contents/web_contents_view_mac_interactive_uitest.mm @@ -6,7 +6,7 @@ #import "base/mac/scoped_nsobject.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" diff --git a/chrome/browser/ui/extensions/hosted_app_browsertest.cc b/chrome/browser/ui/extensions/hosted_app_browsertest.cc index 3d9ed78d9ed742..0550087895420f 100644 --- a/chrome/browser/ui/extensions/hosted_app_browsertest.cc +++ b/chrome/browser/ui/extensions/hosted_app_browsertest.cc @@ -17,7 +17,7 @@ #include "base/strings/string_split.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/user_action_tester.h" #include "base/test/scoped_feature_list.h" #include "base/values.h" diff --git a/chrome/browser/ui/hid/hid_chooser_controller_unittest.cc b/chrome/browser/ui/hid/hid_chooser_controller_unittest.cc index 52e0e4845cd165..2e5e830157d85a 100644 --- a/chrome/browser/ui/hid/hid_chooser_controller_unittest.cc +++ b/chrome/browser/ui/hid/hid_chooser_controller_unittest.cc @@ -8,7 +8,7 @@ #include #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/gmock_callback_support.h" #include "base/test/mock_callback.h" #include "base/test/task_environment.h" diff --git a/chrome/browser/ui/passwords/settings/password_manager_presenter_unittest.cc b/chrome/browser/ui/passwords/settings/password_manager_presenter_unittest.cc index d929731c7e1ea6..00af50671e28ba 100644 --- a/chrome/browser/ui/passwords/settings/password_manager_presenter_unittest.cc +++ b/chrome/browser/ui/passwords/settings/password_manager_presenter_unittest.cc @@ -16,7 +16,7 @@ #include "base/run_loop.h" #include "base/strings/string_piece.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h" #include "chrome/browser/sync/profile_sync_service_factory.h" diff --git a/chrome/browser/ui/serial/serial_chooser_controller_unittest.cc b/chrome/browser/ui/serial/serial_chooser_controller_unittest.cc index 290b88de7813fe..065be5a3211fa5 100644 --- a/chrome/browser/ui/serial/serial_chooser_controller_unittest.cc +++ b/chrome/browser/ui/serial/serial_chooser_controller_unittest.cc @@ -8,7 +8,7 @@ #include #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/mock_callback.h" #include "build/build_config.h" diff --git a/chrome/browser/ui/signin_reauth_view_controller_browsertest.cc b/chrome/browser/ui/signin_reauth_view_controller_browsertest.cc index 59a83bafe0725b..4b8a11a9ffe361 100644 --- a/chrome/browser/ui/signin_reauth_view_controller_browsertest.cc +++ b/chrome/browser/ui/signin_reauth_view_controller_browsertest.cc @@ -9,7 +9,7 @@ #include "base/notreached.h" #include "base/optional.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/mock_callback.h" #include "chrome/browser/signin/identity_manager_factory.h" diff --git a/chrome/browser/ui/signin_view_controller_interactive_uitest.cc b/chrome/browser/ui/signin_view_controller_interactive_uitest.cc index b38d0f8d0f2daa..fa39b9cadca0af 100644 --- a/chrome/browser/ui/signin_view_controller_interactive_uitest.cc +++ b/chrome/browser/ui/signin_view_controller_interactive_uitest.cc @@ -7,7 +7,7 @@ #include "base/callback.h" #include "base/optional.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "build/build_config.h" #include "chrome/browser/signin/identity_manager_factory.h" #include "chrome/browser/signin/reauth_result.h" diff --git a/chrome/browser/ui/startup/credential_provider_signin_info_fetcher_win_unittest.cc b/chrome/browser/ui/startup/credential_provider_signin_info_fetcher_win_unittest.cc index a7d0f37a306741..2b3aaf6d3b260d 100644 --- a/chrome/browser/ui/startup/credential_provider_signin_info_fetcher_win_unittest.cc +++ b/chrome/browser/ui/startup/credential_provider_signin_info_fetcher_win_unittest.cc @@ -14,7 +14,7 @@ #include "base/json/json_reader.h" #include "base/run_loop.h" #include "base/strings/string_util.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "google_apis/gaia/gaia_urls.h" #include "google_apis/gaia/oauth2_access_token_fetcher_impl.h" diff --git a/chrome/browser/ui/tab_contents/chrome_web_contents_view_handle_drop_unittest.cc b/chrome/browser/ui/tab_contents/chrome_web_contents_view_handle_drop_unittest.cc index aa41f92117079a..b91d081123a141 100644 --- a/chrome/browser/ui/tab_contents/chrome_web_contents_view_handle_drop_unittest.cc +++ b/chrome/browser/ui/tab_contents/chrome_web_contents_view_handle_drop_unittest.cc @@ -12,7 +12,7 @@ #include "base/optional.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "chrome/browser/enterprise/connectors/connectors_manager.h" #include "chrome/browser/enterprise/connectors/content_analysis_delegate.h" diff --git a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc index 737e6bae0885c3..0e98c8ff15cf6f 100644 --- a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc +++ b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc @@ -16,7 +16,7 @@ #include "base/memory/ptr_util.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "build/build_config.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/sessions/chrome_tab_restore_service_client.h" diff --git a/chrome/browser/ui/user_education/reopen_tab_in_product_help_trigger_unittest.cc b/chrome/browser/ui/user_education/reopen_tab_in_product_help_trigger_unittest.cc index 90c62372d85cd4..87c9090a3d73ac 100644 --- a/chrome/browser/ui/user_education/reopen_tab_in_product_help_trigger_unittest.cc +++ b/chrome/browser/ui/user_education/reopen_tab_in_product_help_trigger_unittest.cc @@ -9,7 +9,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/mock_callback.h" #include "base/test/scoped_feature_list.h" #include "base/test/simple_test_tick_clock.h" diff --git a/chrome/browser/ui/views/crypto_module_password_dialog_view_unittest.cc b/chrome/browser/ui/views/crypto_module_password_dialog_view_unittest.cc index ae3bf984b1095c..82eb37f333e69b 100644 --- a/chrome/browser/ui/views/crypto_module_password_dialog_view_unittest.cc +++ b/chrome/browser/ui/views/crypto_module_password_dialog_view_unittest.cc @@ -7,7 +7,7 @@ #include #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/ui/crypto_module_password_dialog.h" #include "chrome/test/views/chrome_views_test_base.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/ui/views/desktop_capture/desktop_media_picker_views_browsertest.cc b/chrome/browser/ui/views/desktop_capture/desktop_media_picker_views_browsertest.cc index 97d9884fbcb7cb..31c2a3b52288ba 100644 --- a/chrome/browser/ui/views/desktop_capture/desktop_media_picker_views_browsertest.cc +++ b/chrome/browser/ui/views/desktop_capture/desktop_media_picker_views_browsertest.cc @@ -9,7 +9,7 @@ #include "base/callback.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/media/webrtc/desktop_media_list.h" #include "chrome/browser/media/webrtc/fake_desktop_media_list.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/ui/views/download/download_in_progress_dialog_view_unittest.cc b/chrome/browser/ui/views/download/download_in_progress_dialog_view_unittest.cc index 864302b1ec51d8..65d2e920b98ff7 100644 --- a/chrome/browser/ui/views/download/download_in_progress_dialog_view_unittest.cc +++ b/chrome/browser/ui/views/download/download_in_progress_dialog_view_unittest.cc @@ -5,7 +5,7 @@ #include "chrome/browser/ui/views/download/download_in_progress_dialog_view.h" #include "base/optional.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/views/chrome_constrained_window_views_client.h" #include "chrome/test/views/chrome_views_test_base.h" diff --git a/chrome/browser/ui/views/hats/hats_browsertest.cc b/chrome/browser/ui/views/hats/hats_browsertest.cc index e4d7df2688bc7d..9fa25b48653e96 100644 --- a/chrome/browser/ui/views/hats/hats_browsertest.cc +++ b/chrome/browser/ui/views/hats/hats_browsertest.cc @@ -9,7 +9,7 @@ #include "base/files/file_util.h" #include "base/path_service.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h" #include "base/time/time.h" diff --git a/chrome/browser/ui/views/native_file_system/native_file_system_browsertest.cc b/chrome/browser/ui/views/native_file_system/native_file_system_browsertest.cc index fd39d5ecade1ae..fc2e99ad4cb355 100644 --- a/chrome/browser/ui/views/native_file_system/native_file_system_browsertest.cc +++ b/chrome/browser/ui/views/native_file_system/native_file_system_browsertest.cc @@ -6,7 +6,7 @@ #include "base/files/scoped_temp_dir.h" #include "base/path_service.h" #include "base/strings/strcat.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_path_override.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" diff --git a/chrome/browser/ui/views/native_file_system/native_file_system_permission_view_browsertest.cc b/chrome/browser/ui/views/native_file_system/native_file_system_permission_view_browsertest.cc index 1b8983eaa93ddc..040f580cea1c2b 100644 --- a/chrome/browser/ui/views/native_file_system/native_file_system_permission_view_browsertest.cc +++ b/chrome/browser/ui/views/native_file_system/native_file_system_permission_view_browsertest.cc @@ -5,7 +5,7 @@ #include "chrome/browser/ui/views/native_file_system/native_file_system_permission_view.h" #include "base/files/file_path.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/test/test_browser_dialog.h" #include "components/permissions/permission_util.h" diff --git a/chrome/browser/ui/views/native_file_system/native_file_system_restricted_directory_dialog_view_browsertest.cc b/chrome/browser/ui/views/native_file_system/native_file_system_restricted_directory_dialog_view_browsertest.cc index 5fdb2e56642405..a8840e56f5e349 100644 --- a/chrome/browser/ui/views/native_file_system/native_file_system_restricted_directory_dialog_view_browsertest.cc +++ b/chrome/browser/ui/views/native_file_system/native_file_system_restricted_directory_dialog_view_browsertest.cc @@ -5,7 +5,7 @@ #include "chrome/browser/ui/views/native_file_system/native_file_system_restricted_directory_dialog_view.h" #include "base/files/file_path.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/test/test_browser_dialog.h" #include "chrome/grit/generated_resources.h" diff --git a/chrome/browser/ui/views/page_action/pwa_install_view_browsertest.cc b/chrome/browser/ui/views/page_action/pwa_install_view_browsertest.cc index c179d92f65fdc6..2121d6a4bcd975 100644 --- a/chrome/browser/ui/views/page_action/pwa_install_view_browsertest.cc +++ b/chrome/browser/ui/views/page_action/pwa_install_view_browsertest.cc @@ -6,7 +6,7 @@ #include "base/files/file_path.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "chrome/browser/banners/test_app_banner_manager_desktop.h" #include "chrome/browser/extensions/extension_browsertest.h" diff --git a/chrome/browser/ui/views/profiles/profile_picker_view_browsertest.cc b/chrome/browser/ui/views/profiles/profile_picker_view_browsertest.cc index 08d7c078703f10..827da888a71419 100644 --- a/chrome/browser/ui/views/profiles/profile_picker_view_browsertest.cc +++ b/chrome/browser/ui/views/profiles/profile_picker_view_browsertest.cc @@ -6,7 +6,7 @@ #include "base/bind_helpers.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/mock_callback.h" #include "base/time/time.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/ui/views/sharing/click_to_call_browsertest.cc b/chrome/browser/ui/views/sharing/click_to_call_browsertest.cc index 89f897951e9641..0fd2c2291fad4d 100644 --- a/chrome/browser/ui/views/sharing/click_to_call_browsertest.cc +++ b/chrome/browser/ui/views/sharing/click_to_call_browsertest.cc @@ -10,7 +10,7 @@ #include "base/run_loop.h" #include "base/strings/strcat.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h" #include "chrome/app/chrome_command_ids.h" diff --git a/chrome/browser/ui/views/sharing/sharing_browsertest.cc b/chrome/browser/ui/views/sharing/sharing_browsertest.cc index 54fb2e811dac76..c7af15802501f6 100644 --- a/chrome/browser/ui/views/sharing/sharing_browsertest.cc +++ b/chrome/browser/ui/views/sharing/sharing_browsertest.cc @@ -10,7 +10,7 @@ #include "base/strings/strcat.h" #include "base/strings/string_piece.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "build/build_config.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/sharing/features.h" diff --git a/chrome/browser/ui/views/sharing/sharing_dialog_view_unittest.cc b/chrome/browser/ui/views/sharing/sharing_dialog_view_unittest.cc index b1d07ba7be5227..3bffa238dd932a 100644 --- a/chrome/browser/ui/views/sharing/sharing_dialog_view_unittest.cc +++ b/chrome/browser/ui/views/sharing/sharing_dialog_view_unittest.cc @@ -8,7 +8,7 @@ #include #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/sharing/fake_device_info.h" #include "chrome/browser/sharing/sharing_app.h" #include "chrome/browser/sharing/sharing_metrics.h" diff --git a/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc b/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc index afdcf7591b8efd..1d4851803701d6 100644 --- a/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc +++ b/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc @@ -23,7 +23,7 @@ #include "base/single_thread_task_runner.h" #include "base/stl_util.h" #include "base/strings/string_number_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/threading/thread_task_runner_handle.h" #include "build/build_config.h" diff --git a/chrome/browser/ui/views/user_education/feature_promo_controller_views_unittest.cc b/chrome/browser/ui/views/user_education/feature_promo_controller_views_unittest.cc index fe041beab40551..01a01f9f7c7d70 100644 --- a/chrome/browser/ui/views/user_education/feature_promo_controller_views_unittest.cc +++ b/chrome/browser/ui/views/user_education/feature_promo_controller_views_unittest.cc @@ -7,7 +7,7 @@ #include "base/bind.h" #include "base/feature_list.h" #include "base/optional.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/mock_callback.h" #include "base/test/task_environment.h" #include "chrome/browser/feature_engagement/tracker_factory.h" diff --git a/chrome/browser/ui/views/web_apps/pwa_confirmation_bubble_view_browsertest.cc b/chrome/browser/ui/views/web_apps/pwa_confirmation_bubble_view_browsertest.cc index 71302e692d88cd..ddfad97d7b3608 100644 --- a/chrome/browser/ui/views/web_apps/pwa_confirmation_bubble_view_browsertest.cc +++ b/chrome/browser/ui/views/web_apps/pwa_confirmation_bubble_view_browsertest.cc @@ -9,7 +9,7 @@ #include "base/macros.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/ui/views/web_apps/web_app_confirmation_view_browsertest.cc b/chrome/browser/ui/views/web_apps/web_app_confirmation_view_browsertest.cc index 1465e9bbb3e6bb..c31543ed407085 100644 --- a/chrome/browser/ui/views/web_apps/web_app_confirmation_view_browsertest.cc +++ b/chrome/browser/ui/views/web_apps/web_app_confirmation_view_browsertest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_dialogs.h" #include "chrome/common/web_application_info.h" diff --git a/chrome/browser/ui/views/web_apps/web_app_uninstall_dialog_browsertest.cc b/chrome/browser/ui/views/web_apps/web_app_uninstall_dialog_browsertest.cc index 7c3bdeb44accf9..73e736121eb2a2 100644 --- a/chrome/browser/ui/views/web_apps/web_app_uninstall_dialog_browsertest.cc +++ b/chrome/browser/ui/views/web_apps/web_app_uninstall_dialog_browsertest.cc @@ -9,7 +9,7 @@ #include "base/macros.h" #include "base/optional.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" diff --git a/chrome/browser/ui/web_applications/app_browser_controller_browsertest.cc b/chrome/browser/ui/web_applications/app_browser_controller_browsertest.cc index 260300be65c721..dcdd007c6e258a 100644 --- a/chrome/browser/ui/web_applications/app_browser_controller_browsertest.cc +++ b/chrome/browser/ui/web_applications/app_browser_controller_browsertest.cc @@ -7,7 +7,7 @@ #include #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/installable/installable_metrics.h" #include "chrome/browser/themes/custom_theme_supplier.h" diff --git a/chrome/browser/ui/web_applications/test/web_app_browsertest_util.cc b/chrome/browser/ui/web_applications/test/web_app_browsertest_util.cc index 51b04e4ed0c65d..cab704e5dcf1ce 100644 --- a/chrome/browser/ui/web_applications/test/web_app_browsertest_util.cc +++ b/chrome/browser/ui/web_applications/test/web_app_browsertest_util.cc @@ -7,7 +7,7 @@ #include "base/one_shot_event.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/apps/app_service/app_launch_params.h" #include "chrome/browser/apps/app_service/app_service_proxy.h" #include "chrome/browser/apps/app_service/app_service_proxy_factory.h" diff --git a/chrome/browser/ui/web_applications/web_app_engagement_browsertest.cc b/chrome/browser/ui/web_applications/web_app_engagement_browsertest.cc index f26a75b8a876c5..7a4db1baf207a9 100644 --- a/chrome/browser/ui/web_applications/web_app_engagement_browsertest.cc +++ b/chrome/browser/ui/web_applications/web_app_engagement_browsertest.cc @@ -10,7 +10,7 @@ #include "base/command_line.h" #include "base/files/file_path.h" #include "base/metrics/statistics_recorder.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "chrome/browser/engagement/site_engagement_service.h" #include "chrome/browser/first_run/first_run.h" diff --git a/chrome/browser/ui/web_applications/web_app_file_handling_browsertest.cc b/chrome/browser/ui/web_applications/web_app_file_handling_browsertest.cc index 365adab7e132df..2192b2ef6f4d2b 100644 --- a/chrome/browser/ui/web_applications/web_app_file_handling_browsertest.cc +++ b/chrome/browser/ui/web_applications/web_app_file_handling_browsertest.cc @@ -8,7 +8,7 @@ #include "base/files/file_util.h" #include "base/strings/strcat.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/threading/thread_restrictions.h" #include "chrome/browser/apps/app_service/app_launch_params.h" diff --git a/chrome/browser/ui/web_applications/web_app_profile_deletion_browsertest.cc b/chrome/browser/ui/web_applications/web_app_profile_deletion_browsertest.cc index 85cf94eb9c2bbd..4515078e56196f 100644 --- a/chrome/browser/ui/web_applications/web_app_profile_deletion_browsertest.cc +++ b/chrome/browser/ui/web_applications/web_app_profile_deletion_browsertest.cc @@ -5,7 +5,7 @@ #include "base/bind_helpers.h" #include "base/run_loop.h" #include "base/scoped_observer.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/web_applications/web_app_controller_browsertest.h" diff --git a/chrome/browser/ui/web_applications/web_app_ui_manager_impl_browsertest.cc b/chrome/browser/ui/web_applications/web_app_ui_manager_impl_browsertest.cc index dc12a5faede25e..d4b4b44f361a81 100644 --- a/chrome/browser/ui/web_applications/web_app_ui_manager_impl_browsertest.cc +++ b/chrome/browser/ui/web_applications/web_app_ui_manager_impl_browsertest.cc @@ -5,7 +5,7 @@ #include "chrome/browser/ui/web_applications/web_app_ui_manager_impl.h" #include "base/barrier_closure.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/threading/thread_task_runner_handle.h" #include "chrome/browser/apps/app_service/app_service_proxy.h" #include "chrome/browser/apps/app_service/app_service_proxy_factory.h" diff --git a/chrome/browser/ui/web_applications/web_app_uninstall_browsertest.cc b/chrome/browser/ui/web_applications/web_app_uninstall_browsertest.cc index 69a97703c4dfe1..e39860ab9cf1de 100644 --- a/chrome/browser/ui/web_applications/web_app_uninstall_browsertest.cc +++ b/chrome/browser/ui/web_applications/web_app_uninstall_browsertest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/sessions/tab_restore_service_factory.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" diff --git a/chrome/browser/ui/webauthn/authenticator_dialog_browsertest.cc b/chrome/browser/ui/webauthn/authenticator_dialog_browsertest.cc index 8cd40039a1b48b..c42281a5861682 100644 --- a/chrome/browser/ui/webauthn/authenticator_dialog_browsertest.cc +++ b/chrome/browser/ui/webauthn/authenticator_dialog_browsertest.cc @@ -6,7 +6,7 @@ #include #include "base/bind_helpers.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "build/build_config.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" diff --git a/chrome/browser/ui/webui/chromeos/edu_account_login_handler_unittest.cc b/chrome/browser/ui/webui/chromeos/edu_account_login_handler_unittest.cc index a9a93ac7d2b5a2..f18a9c1bcec8de 100644 --- a/chrome/browser/ui/webui/chromeos/edu_account_login_handler_unittest.cc +++ b/chrome/browser/ui/webui/chromeos/edu_account_login_handler_unittest.cc @@ -8,7 +8,7 @@ #include "base/bind_helpers.h" #include "base/json/json_writer.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/values.h" #include "chrome/browser/chromeos/net/network_portal_detector_test_impl.h" diff --git a/chrome/browser/ui/webui/chromeos/smb_shares/smb_credentials_dialog_browsertest.cc b/chrome/browser/ui/webui/chromeos/smb_shares/smb_credentials_dialog_browsertest.cc index 91b25ad18f1256..0bbea127fb4371 100644 --- a/chrome/browser/ui/webui/chromeos/smb_shares/smb_credentials_dialog_browsertest.cc +++ b/chrome/browser/ui/webui/chromeos/smb_shares/smb_credentials_dialog_browsertest.cc @@ -5,7 +5,7 @@ #include "chrome/browser/ui/webui/chromeos/smb_shares/smb_credentials_dialog.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/common/webui_url_constants.h" #include "chrome/test/base/in_process_browser_test.h" #include "content/public/test/browser_test.h" diff --git a/chrome/browser/ui/webui/customize_themes/chrome_customize_themes_handler_unittest.cc b/chrome/browser/ui/webui/customize_themes/chrome_customize_themes_handler_unittest.cc index 8d79d566233cf8..200d800e7f0a84 100644 --- a/chrome/browser/ui/webui/customize_themes/chrome_customize_themes_handler_unittest.cc +++ b/chrome/browser/ui/webui/customize_themes/chrome_customize_themes_handler_unittest.cc @@ -12,7 +12,7 @@ #include "base/optional.h" #include "base/path_service.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/values.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/test_extension_environment.h" diff --git a/chrome/browser/ui/webui/discards/graph_dump_impl_unittest.cc b/chrome/browser/ui/webui/discards/graph_dump_impl_unittest.cc index 0e44e58ba51e51..96fed66c98409f 100644 --- a/chrome/browser/ui/webui/discards/graph_dump_impl_unittest.cc +++ b/chrome/browser/ui/webui/discards/graph_dump_impl_unittest.cc @@ -11,7 +11,7 @@ #include "base/json/json_reader.h" #include "base/run_loop.h" #include "base/stl_util.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/time/time.h" #include "chrome/browser/ui/webui/discards/discards.mojom.h" #include "components/performance_manager/public/graph/node_data_describer.h" diff --git a/chrome/browser/ui/webui/favicon_source_unittest.cc b/chrome/browser/ui/webui/favicon_source_unittest.cc index fa12bd94c3f033..f45cb5206d3290 100644 --- a/chrome/browser/ui/webui/favicon_source_unittest.cc +++ b/chrome/browser/ui/webui/favicon_source_unittest.cc @@ -10,7 +10,7 @@ #include "base/bind_helpers.h" #include "base/memory/ptr_util.h" #include "base/strings/strcat.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "chrome/browser/favicon/favicon_service_factory.h" #include "chrome/browser/favicon/history_ui_favicon_request_handler_factory.h" diff --git a/chrome/browser/ui/webui/local_discovery/local_discovery_ui_browsertest.cc b/chrome/browser/ui/webui/local_discovery/local_discovery_ui_browsertest.cc index 82fbc1dd375cbc..cb0fe1447e4026 100644 --- a/chrome/browser/ui/webui/local_discovery/local_discovery_ui_browsertest.cc +++ b/chrome/browser/ui/webui/local_discovery/local_discovery_ui_browsertest.cc @@ -16,7 +16,7 @@ #include "base/memory/ref_counted.h" #include "base/run_loop.h" #include "base/single_thread_task_runner.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/threading/thread_task_runner_handle.h" #include "build/build_config.h" diff --git a/chrome/browser/ui/webui/read_later/read_later_page_handler_unittest.cc b/chrome/browser/ui/webui/read_later/read_later_page_handler_unittest.cc index c7a180b0b1961c..1f95047edd0507 100644 --- a/chrome/browser/ui/webui/read_later/read_later_page_handler_unittest.cc +++ b/chrome/browser/ui/webui/read_later/read_later_page_handler_unittest.cc @@ -8,7 +8,7 @@ #include #include -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/read_later/read_later_test_utils.h" diff --git a/chrome/browser/ui/webui/settings/chromeos/account_manager_handler_browsertest.cc b/chrome/browser/ui/webui/settings/chromeos/account_manager_handler_browsertest.cc index 82e8b1ff1de617..1f3416417479d0 100644 --- a/chrome/browser/ui/webui/settings/chromeos/account_manager_handler_browsertest.cc +++ b/chrome/browser/ui/webui/settings/chromeos/account_manager_handler_browsertest.cc @@ -7,7 +7,7 @@ #include #include -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/browser_process_platform_part.h" #include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h" diff --git a/chrome/browser/ui/webui/signin/login_ui_test_utils.cc b/chrome/browser/ui/webui/signin/login_ui_test_utils.cc index 66beae09c9a836..4dda183432ca40 100644 --- a/chrome/browser/ui/webui/signin/login_ui_test_utils.cc +++ b/chrome/browser/ui/webui/signin/login_ui_test_utils.cc @@ -9,7 +9,7 @@ #include "base/run_loop.h" #include "base/scoped_observer.h" #include "base/strings/stringprintf.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/threading/thread_task_runner_handle.h" #include "base/time/time.h" #include "base/timer/timer.h" diff --git a/chrome/browser/ui/webui/tab_search/tab_search_page_handler_unittest.cc b/chrome/browser/ui/webui/tab_search/tab_search_page_handler_unittest.cc index 46ea570413eff8..62909cf76baf5a 100644 --- a/chrome/browser/ui/webui/tab_search/tab_search_page_handler_unittest.cc +++ b/chrome/browser/ui/webui/tab_search/tab_search_page_handler_unittest.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/webui/tab_search/tab_search_page_handler.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/timer/mock_timer.h" #include "build/build_config.h" diff --git a/chrome/browser/usb/web_usb_service_impl_unittest.cc b/chrome/browser/usb/web_usb_service_impl_unittest.cc index a502622fd7ca09..a8b6f8031474cd 100644 --- a/chrome/browser/usb/web_usb_service_impl_unittest.cc +++ b/chrome/browser/usb/web_usb_service_impl_unittest.cc @@ -13,7 +13,7 @@ #include "base/barrier_closure.h" #include "base/bind.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/usb/frame_usb_services.h" #include "chrome/browser/usb/usb_chooser_context.h" #include "chrome/browser/usb/usb_chooser_context_factory.h" diff --git a/chrome/browser/video_tutorials/internal/tutorial_fetcher_unittest.cc b/chrome/browser/video_tutorials/internal/tutorial_fetcher_unittest.cc index eefe63989601f9..1900b807012a72 100644 --- a/chrome/browser/video_tutorials/internal/tutorial_fetcher_unittest.cc +++ b/chrome/browser/video_tutorials/internal/tutorial_fetcher_unittest.cc @@ -4,7 +4,7 @@ #include "chrome/browser/video_tutorials/internal/tutorial_fetcher.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "net/http/http_status_code.h" #include "services/network/public/cpp/weak_wrapper_shared_url_loader_factory.h" diff --git a/chrome/browser/visibility_timer_tab_helper_unittest.cc b/chrome/browser/visibility_timer_tab_helper_unittest.cc index ba5aecb8b010d2..79b980025fae1d 100644 --- a/chrome/browser/visibility_timer_tab_helper_unittest.cc +++ b/chrome/browser/visibility_timer_tab_helper_unittest.cc @@ -4,7 +4,7 @@ #include "chrome/browser/visibility_timer_tab_helper.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "chrome/test/base/chrome_render_view_host_test_harness.h" #include "content/public/browser/web_contents.h" diff --git a/chrome/browser/vr/webxr_vr_isolated_device_service_test.cc b/chrome/browser/vr/webxr_vr_isolated_device_service_test.cc index d5aa9c677af46d..4d4bb3b709ce2f 100644 --- a/chrome/browser/vr/webxr_vr_isolated_device_service_test.cc +++ b/chrome/browser/vr/webxr_vr_isolated_device_service_test.cc @@ -4,7 +4,7 @@ #include "base/bind_helpers.h" #include "base/optional.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "build/build_config.h" #include "chrome/browser/vr/test/mock_xr_device_hook_base.h" #include "chrome/browser/vr/test/multi_class_browser_test.h" diff --git a/chrome/browser/web_applications/components/install_finalizer_unittest.cc b/chrome/browser/web_applications/components/install_finalizer_unittest.cc index 002dd21d43cc97..fe07acefd8fff2 100644 --- a/chrome/browser/web_applications/components/install_finalizer_unittest.cc +++ b/chrome/browser/web_applications/components/install_finalizer_unittest.cc @@ -10,7 +10,7 @@ #include "base/optional.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/web_applications/components/web_app_prefs_utils.h" #include "chrome/browser/web_applications/test/test_file_utils.h" #include "chrome/browser/web_applications/test/test_web_app_registry_controller.h" diff --git a/chrome/browser/web_applications/components/pending_app_manager_unittest.cc b/chrome/browser/web_applications/components/pending_app_manager_unittest.cc index 31d7dc0a8b4acd..4cc1888020ca92 100644 --- a/chrome/browser/web_applications/components/pending_app_manager_unittest.cc +++ b/chrome/browser/web_applications/components/pending_app_manager_unittest.cc @@ -10,7 +10,7 @@ #include "base/bind_helpers.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "chrome/browser/web_applications/components/app_registrar.h" #include "chrome/browser/web_applications/components/web_app_constants.h" diff --git a/chrome/browser/web_applications/components/web_app_data_retriever_unittest.cc b/chrome/browser/web_applications/components/web_app_data_retriever_unittest.cc index 48fa5d27e6e861..198ebed96e45a0 100644 --- a/chrome/browser/web_applications/components/web_app_data_retriever_unittest.cc +++ b/chrome/browser/web_applications/components/web_app_data_retriever_unittest.cc @@ -12,7 +12,7 @@ #include "base/optional.h" #include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/installable/fake_installable_manager.h" #include "chrome/browser/installable/installable_data.h" #include "chrome/browser/installable/installable_manager.h" diff --git a/chrome/browser/web_applications/components/web_app_file_handler_registration_linux_browsertest.cc b/chrome/browser/web_applications/components/web_app_file_handler_registration_linux_browsertest.cc index 33b9cc38823f68..f6797f7818cb6c 100644 --- a/chrome/browser/web_applications/components/web_app_file_handler_registration_linux_browsertest.cc +++ b/chrome/browser/web_applications/components/web_app_file_handler_registration_linux_browsertest.cc @@ -11,7 +11,7 @@ #include "base/files/file_path.h" #include "base/optional.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "chrome/browser/shell_integration_linux.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/web_applications/components/web_app_file_handler_registration_linux_unittest.cc b/chrome/browser/web_applications/components/web_app_file_handler_registration_linux_unittest.cc index d70f699cc1e4d1..e5f416482f8bd1 100644 --- a/chrome/browser/web_applications/components/web_app_file_handler_registration_linux_unittest.cc +++ b/chrome/browser/web_applications/components/web_app_file_handler_registration_linux_unittest.cc @@ -9,7 +9,7 @@ #include "base/containers/flat_set.h" #include "base/files/file_path.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/shell_integration_linux.h" #include "chrome/browser/web_applications/components/web_app_id.h" diff --git a/chrome/browser/web_applications/components/web_app_handler_registration_utils_win_unittest.cc b/chrome/browser/web_applications/components/web_app_handler_registration_utils_win_unittest.cc index 7a57a8c304d1ca..5131bb8fa42b69 100644 --- a/chrome/browser/web_applications/components/web_app_handler_registration_utils_win_unittest.cc +++ b/chrome/browser/web_applications/components/web_app_handler_registration_utils_win_unittest.cc @@ -6,7 +6,7 @@ #include "base/files/file_util.h" #include "base/task/thread_pool/thread_pool_instance.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/test_reg_util_win.h" #include "base/win/windows_version.h" #include "chrome/browser/profiles/profile_attributes_entry.h" diff --git a/chrome/browser/web_applications/components/web_app_url_loader_browsertest.cc b/chrome/browser/web_applications/components/web_app_url_loader_browsertest.cc index 92e2a58da80fa7..0d0898611d79e6 100644 --- a/chrome/browser/web_applications/components/web_app_url_loader_browsertest.cc +++ b/chrome/browser/web_applications/components/web_app_url_loader_browsertest.cc @@ -7,7 +7,7 @@ #include "base/barrier_closure.h" #include "base/callback.h" #include "base/optional.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/test_mock_time_task_runner.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/web_applications/components/web_app_url_loader_unittest.cc b/chrome/browser/web_applications/components/web_app_url_loader_unittest.cc index 29580666c48c3c..36a7f70876d8fd 100644 --- a/chrome/browser/web_applications/components/web_app_url_loader_unittest.cc +++ b/chrome/browser/web_applications/components/web_app_url_loader_unittest.cc @@ -7,7 +7,7 @@ #include #include "base/memory/ptr_util.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/web_applications/test/web_app_test.h" #include "content/public/common/url_constants.h" #include "content/public/test/web_contents_tester.h" diff --git a/chrome/browser/web_applications/extensions/bookmark_app_install_finalizer_unittest.cc b/chrome/browser/web_applications/extensions/bookmark_app_install_finalizer_unittest.cc index 15aa26a72c8e56..37a32e21d7483b 100644 --- a/chrome/browser/web_applications/extensions/bookmark_app_install_finalizer_unittest.cc +++ b/chrome/browser/web_applications/extensions/bookmark_app_install_finalizer_unittest.cc @@ -13,7 +13,7 @@ #include "base/files/file_path.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "chrome/browser/extensions/crx_installer.h" #include "chrome/browser/extensions/launch_util.h" diff --git a/chrome/browser/web_applications/extensions/pending_app_install_task_unittest.cc b/chrome/browser/web_applications/extensions/pending_app_install_task_unittest.cc index 3636a07f672c4f..0582ebe91f643e 100644 --- a/chrome/browser/web_applications/extensions/pending_app_install_task_unittest.cc +++ b/chrome/browser/web_applications/extensions/pending_app_install_task_unittest.cc @@ -18,7 +18,7 @@ #include "base/optional.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/threading/thread_task_runner_handle.h" #include "chrome/browser/web_applications/components/app_registrar.h" diff --git a/chrome/browser/web_applications/external_web_app_manager_browsertest.cc b/chrome/browser/web_applications/external_web_app_manager_browsertest.cc index 56991ce05314d2..b4d7ffb06f42bd 100644 --- a/chrome/browser/web_applications/external_web_app_manager_browsertest.cc +++ b/chrome/browser/web_applications/external_web_app_manager_browsertest.cc @@ -8,7 +8,7 @@ #include "base/json/json_reader.h" #include "base/path_service.h" #include "base/strings/string_util.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "build/build_config.h" #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/ui/web_applications/test/web_app_browsertest_util.h" diff --git a/chrome/browser/web_applications/external_web_app_manager_unittest.cc b/chrome/browser/web_applications/external_web_app_manager_unittest.cc index 5df83c9eeb488b..921bd15a6a7668 100644 --- a/chrome/browser/web_applications/external_web_app_manager_unittest.cc +++ b/chrome/browser/web_applications/external_web_app_manager_unittest.cc @@ -14,7 +14,7 @@ #include "base/path_service.h" #include "base/run_loop.h" #include "base/stl_util.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h" #include "base/test/scoped_path_override.h" diff --git a/chrome/browser/web_applications/external_web_app_migration_browsertest.cc b/chrome/browser/web_applications/external_web_app_migration_browsertest.cc index f3f67d96e3dfdc..d58f795f48b8d6 100644 --- a/chrome/browser/web_applications/external_web_app_migration_browsertest.cc +++ b/chrome/browser/web_applications/external_web_app_migration_browsertest.cc @@ -6,7 +6,7 @@ #include "base/json/json_reader.h" #include "base/path_service.h" #include "base/strings/strcat.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/apps/app_service/app_service_proxy.h" #include "chrome/browser/apps/app_service/app_service_proxy_factory.h" #include "chrome/browser/extensions/extension_service.h" diff --git a/chrome/browser/web_applications/manifest_update_manager_browsertest.cc b/chrome/browser/web_applications/manifest_update_manager_browsertest.cc index 7c1a6a83b55f84..5c670f69545976 100644 --- a/chrome/browser/web_applications/manifest_update_manager_browsertest.cc +++ b/chrome/browser/web_applications/manifest_update_manager_browsertest.cc @@ -11,7 +11,7 @@ #include "base/memory/scoped_refptr.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h" #include "base/time/time.h" diff --git a/chrome/browser/web_applications/pending_app_manager_impl_browsertest.cc b/chrome/browser/web_applications/pending_app_manager_impl_browsertest.cc index 9b518cfbbab297..8222864ef6700b 100644 --- a/chrome/browser/web_applications/pending_app_manager_impl_browsertest.cc +++ b/chrome/browser/web_applications/pending_app_manager_impl_browsertest.cc @@ -9,7 +9,7 @@ #include "base/callback.h" #include "base/optional.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/web_applications/test/web_app_browsertest_util.h" diff --git a/chrome/browser/web_applications/pending_app_manager_impl_unittest.cc b/chrome/browser/web_applications/pending_app_manager_impl_unittest.cc index 298c99aa6ba435..56a966a666a051 100644 --- a/chrome/browser/web_applications/pending_app_manager_impl_unittest.cc +++ b/chrome/browser/web_applications/pending_app_manager_impl_unittest.cc @@ -16,7 +16,7 @@ #include "base/optional.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/timer/mock_timer.h" #include "chrome/browser/web_applications/components/app_registrar.h" #include "chrome/browser/web_applications/components/install_finalizer.h" diff --git a/chrome/browser/web_applications/system_web_app_manager_unittest.cc b/chrome/browser/web_applications/system_web_app_manager_unittest.cc index 14c7ad5c4acc19..5acbfcc56df63f 100644 --- a/chrome/browser/web_applications/system_web_app_manager_unittest.cc +++ b/chrome/browser/web_applications/system_web_app_manager_unittest.cc @@ -13,7 +13,7 @@ #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" #include "base/task/task_traits.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h" #include "chrome/browser/web_applications/components/externally_installed_web_app_prefs.h" diff --git a/chrome/browser/web_applications/test/test_install_finalizer.cc b/chrome/browser/web_applications/test/test_install_finalizer.cc index dae9ae40cf187a..1b9ec6bf4036aa 100644 --- a/chrome/browser/web_applications/test/test_install_finalizer.cc +++ b/chrome/browser/web_applications/test/test_install_finalizer.cc @@ -9,7 +9,7 @@ #include "base/callback.h" #include "base/check.h" #include "base/notreached.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/threading/thread_task_runner_handle.h" #include "chrome/browser/web_applications/components/web_app_constants.h" #include "chrome/browser/web_applications/components/web_app_helpers.h" diff --git a/chrome/browser/web_applications/test/test_pending_app_manager.cc b/chrome/browser/web_applications/test/test_pending_app_manager.cc index 8c91ed4f9b1eca..4c5453e3e83f03 100644 --- a/chrome/browser/web_applications/test/test_pending_app_manager.cc +++ b/chrome/browser/web_applications/test/test_pending_app_manager.cc @@ -10,7 +10,7 @@ #include "base/bind.h" #include "base/callback.h" #include "base/sequenced_task_runner.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/threading/sequenced_task_runner_handle.h" #include "chrome/browser/web_applications/components/web_app_constants.h" #include "chrome/browser/web_applications/test/test_app_registrar.h" diff --git a/chrome/browser/web_applications/test/test_system_web_app_installation.cc b/chrome/browser/web_applications/test/test_system_web_app_installation.cc index c81c5019481776..6f256892b78bd6 100644 --- a/chrome/browser/web_applications/test/test_system_web_app_installation.cc +++ b/chrome/browser/web_applications/test/test_system_web_app_installation.cc @@ -9,7 +9,7 @@ #include "base/bind.h" #include "base/memory/ptr_util.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/web_applications/components/app_registrar.h" #include "chrome/browser/web_applications/test/test_system_web_app_installation.h" diff --git a/chrome/browser/web_applications/test/test_system_web_app_url_data_source.cc b/chrome/browser/web_applications/test/test_system_web_app_url_data_source.cc index f781bab89d8380..64d807402e93e6 100644 --- a/chrome/browser/web_applications/test/test_system_web_app_url_data_source.cc +++ b/chrome/browser/web_applications/test/test_system_web_app_url_data_source.cc @@ -7,7 +7,7 @@ #include #include "base/memory/ref_counted_memory.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/grit/browser_resources.h" #include "chrome/grit/chrome_unscaled_resources.h" #include "content/public/browser/web_ui_data_source.h" diff --git a/chrome/browser/web_applications/test/test_web_app_database_factory.cc b/chrome/browser/web_applications/test/test_web_app_database_factory.cc index bbf6f7339d4cda..6e3193cecdbc81 100644 --- a/chrome/browser/web_applications/test/test_web_app_database_factory.cc +++ b/chrome/browser/web_applications/test/test_web_app_database_factory.cc @@ -5,7 +5,7 @@ #include "chrome/browser/web_applications/test/test_web_app_database_factory.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/web_applications/components/web_app_helpers.h" #include "chrome/browser/web_applications/proto/web_app.pb.h" #include "chrome/browser/web_applications/web_app.h" diff --git a/chrome/browser/web_applications/test/test_web_app_registry_controller.cc b/chrome/browser/web_applications/test/test_web_app_registry_controller.cc index 33f08adfa133ec..c42f97a77a7f8b 100644 --- a/chrome/browser/web_applications/test/test_web_app_registry_controller.cc +++ b/chrome/browser/web_applications/test/test_web_app_registry_controller.cc @@ -5,7 +5,7 @@ #include "chrome/browser/web_applications/test/test_web_app_registry_controller.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/web_applications/components/os_integration_manager.h" #include "chrome/browser/web_applications/components/web_app_helpers.h" #include "chrome/browser/web_applications/test/test_os_integration_manager.h" diff --git a/chrome/browser/web_applications/test/test_web_app_ui_manager.cc b/chrome/browser/web_applications/test/test_web_app_ui_manager.cc index edc8dbd8c0542d..15372c32eaccf4 100644 --- a/chrome/browser/web_applications/test/test_web_app_ui_manager.cc +++ b/chrome/browser/web_applications/test/test_web_app_ui_manager.cc @@ -8,7 +8,7 @@ #include "base/callback.h" #include "base/stl_util.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/threading/thread_task_runner_handle.h" namespace web_app { diff --git a/chrome/browser/web_applications/test/web_app_install_observer.cc b/chrome/browser/web_applications/test/web_app_install_observer.cc index 41192b4b9c6ca8..ae0e6a9eee72ac 100644 --- a/chrome/browser/web_applications/test/web_app_install_observer.cc +++ b/chrome/browser/web_applications/test/web_app_install_observer.cc @@ -6,7 +6,7 @@ #include #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/web_applications/components/web_app_provider_base.h" namespace web_app { diff --git a/chrome/browser/web_applications/test/web_app_install_test_utils.cc b/chrome/browser/web_applications/test/web_app_install_test_utils.cc index a67d300a3a53d8..f85a21030c89c5 100644 --- a/chrome/browser/web_applications/test/web_app_install_test_utils.cc +++ b/chrome/browser/web_applications/test/web_app_install_test_utils.cc @@ -7,7 +7,7 @@ #include "base/feature_list.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/web_applications/components/install_finalizer.h" #include "chrome/browser/web_applications/components/web_app_constants.h" #include "chrome/browser/web_applications/components/web_app_helpers.h" diff --git a/chrome/browser/web_applications/test/web_app_registration_waiter.cc b/chrome/browser/web_applications/test/web_app_registration_waiter.cc index 84c0c53266b208..8ac8f1f8e225b1 100644 --- a/chrome/browser/web_applications/test/web_app_registration_waiter.cc +++ b/chrome/browser/web_applications/test/web_app_registration_waiter.cc @@ -4,7 +4,7 @@ #include "chrome/browser/web_applications/test/web_app_registration_waiter.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "testing/gtest/include/gtest/gtest.h" namespace web_app { diff --git a/chrome/browser/web_applications/web_app_database_unittest.cc b/chrome/browser/web_applications/web_app_database_unittest.cc index 00d175a4f40ca9..9d983439816895 100644 --- a/chrome/browser/web_applications/web_app_database_unittest.cc +++ b/chrome/browser/web_applications/web_app_database_unittest.cc @@ -13,7 +13,7 @@ #include "base/run_loop.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/time/time.h" #include "chrome/browser/web_applications/components/web_app_constants.h" #include "chrome/browser/web_applications/components/web_app_helpers.h" diff --git a/chrome/browser/web_applications/web_app_icon_manager_browsertest.cc b/chrome/browser/web_applications/web_app_icon_manager_browsertest.cc index efb61b917bdfa3..34948434d62112 100644 --- a/chrome/browser/web_applications/web_app_icon_manager_browsertest.cc +++ b/chrome/browser/web_applications/web_app_icon_manager_browsertest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/apps/app_service/app_launch_params.h" #include "chrome/browser/apps/app_service/app_service_proxy.h" #include "chrome/browser/apps/app_service/app_service_proxy_factory.h" diff --git a/chrome/browser/web_applications/web_app_icon_manager_unittest.cc b/chrome/browser/web_applications/web_app_icon_manager_unittest.cc index da61da0168e301..fdbd71ff95edaf 100644 --- a/chrome/browser/web_applications/web_app_icon_manager_unittest.cc +++ b/chrome/browser/web_applications/web_app_icon_manager_unittest.cc @@ -12,7 +12,7 @@ #include "base/bind_helpers.h" #include "base/files/file_enumerator.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/web_applications/components/web_app_constants.h" #include "chrome/browser/web_applications/components/web_app_helpers.h" #include "chrome/browser/web_applications/components/web_app_icon_generator.h" diff --git a/chrome/browser/web_applications/web_app_install_manager_unittest.cc b/chrome/browser/web_applications/web_app_install_manager_unittest.cc index d869803c5c3889..3551babe4b9b20 100644 --- a/chrome/browser/web_applications/web_app_install_manager_unittest.cc +++ b/chrome/browser/web_applications/web_app_install_manager_unittest.cc @@ -14,7 +14,7 @@ #include "base/run_loop.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/web_applications/components/externally_installed_web_app_prefs.h" #include "chrome/browser/web_applications/components/web_app_constants.h" #include "chrome/browser/web_applications/components/web_app_helpers.h" diff --git a/chrome/browser/web_applications/web_app_install_task_unittest.cc b/chrome/browser/web_applications/web_app_install_task_unittest.cc index 5d0b4b1c1a4f9c..40d91238caf41a 100644 --- a/chrome/browser/web_applications/web_app_install_task_unittest.cc +++ b/chrome/browser/web_applications/web_app_install_task_unittest.cc @@ -17,7 +17,7 @@ #include "base/stl_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/threading/thread_task_runner_handle.h" #include "chrome/browser/installable/installable_data.h" diff --git a/chrome/browser/web_applications/web_app_migration_manager_browsertest.cc b/chrome/browser/web_applications/web_app_migration_manager_browsertest.cc index 004646fa1ad50d..2c334676842c7c 100644 --- a/chrome/browser/web_applications/web_app_migration_manager_browsertest.cc +++ b/chrome/browser/web_applications/web_app_migration_manager_browsertest.cc @@ -11,7 +11,7 @@ #include "base/stl_util.h" #include "base/strings/strcat.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/threading/thread_restrictions.h" #include "chrome/browser/installable/installable_metrics.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/web_applications/web_app_migration_user_display_mode_clean_up_browsertest.cc b/chrome/browser/web_applications/web_app_migration_user_display_mode_clean_up_browsertest.cc index 799a2e9b26df5f..7e4f86b1b06656 100644 --- a/chrome/browser/web_applications/web_app_migration_user_display_mode_clean_up_browsertest.cc +++ b/chrome/browser/web_applications/web_app_migration_user_display_mode_clean_up_browsertest.cc @@ -7,7 +7,7 @@ #include "base/run_loop.h" #include "base/strings/string_piece.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "chrome/browser/extensions/launch_util.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/web_applications/web_app_registrar_unittest.cc b/chrome/browser/web_applications/web_app_registrar_unittest.cc index 0c8f4fecc712a2..caafc8b8d649b7 100644 --- a/chrome/browser/web_applications/web_app_registrar_unittest.cc +++ b/chrome/browser/web_applications/web_app_registrar_unittest.cc @@ -16,7 +16,7 @@ #include "base/run_loop.h" #include "base/stl_util.h" #include "base/strings/string_number_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "chrome/browser/web_applications/components/web_app_constants.h" #include "chrome/browser/web_applications/components/web_app_helpers.h" diff --git a/chrome/browser/web_applications/web_app_sync_bridge_unittest.cc b/chrome/browser/web_applications/web_app_sync_bridge_unittest.cc index 77001df3bfd85d..1cb16e259c1d7f 100644 --- a/chrome/browser/web_applications/web_app_sync_bridge_unittest.cc +++ b/chrome/browser/web_applications/web_app_sync_bridge_unittest.cc @@ -11,7 +11,7 @@ #include "base/run_loop.h" #include "base/stl_util.h" #include "base/strings/string_number_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chrome/browser/web_applications/components/os_integration_manager.h" #include "chrome/browser/web_applications/components/web_app_constants.h" #include "chrome/browser/web_applications/components/web_app_helpers.h" diff --git a/chrome/browser/webauth_interactive_uitest.cc b/chrome/browser/webauth_interactive_uitest.cc index 318bf5c044ed30..7f8a2111d1e1f8 100644 --- a/chrome/browser/webauth_interactive_uitest.cc +++ b/chrome/browser/webauth_interactive_uitest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/bind.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "build/build_config.h" #include "chrome/browser/devtools/devtools_window_testing.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/webshare/chromeos/sharesheet_client_browsertest.cc b/chrome/browser/webshare/chromeos/sharesheet_client_browsertest.cc index bb0fcb12bc2143..75417235d7aaec 100644 --- a/chrome/browser/webshare/chromeos/sharesheet_client_browsertest.cc +++ b/chrome/browser/webshare/chromeos/sharesheet_client_browsertest.cc @@ -11,7 +11,7 @@ #include "base/run_loop.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/threading/scoped_blocking_call.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/webshare/share_service_unittest.cc b/chrome/browser/webshare/share_service_unittest.cc index 0345f907abb2c1..d52ae315f1d71b 100644 --- a/chrome/browser/webshare/share_service_unittest.cc +++ b/chrome/browser/webshare/share_service_unittest.cc @@ -8,7 +8,7 @@ #include "base/guid.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "build/build_config.h" #include "chrome/browser/webshare/share_service_impl.h" diff --git a/chrome/browser/webshare/win/fake_data_transfer_manager_unittest.cc b/chrome/browser/webshare/win/fake_data_transfer_manager_unittest.cc index 83ffe2b2c97cf1..3af309a9cefb85 100644 --- a/chrome/browser/webshare/win/fake_data_transfer_manager_unittest.cc +++ b/chrome/browser/webshare/win/fake_data_transfer_manager_unittest.cc @@ -11,7 +11,7 @@ #include "base/callback.h" #include "base/memory/weak_ptr.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/win/core_winrt_util.h" #include "base/win/vector.h" diff --git a/chrome/browser/webshare/win/fake_random_access_stream.cc b/chrome/browser/webshare/win/fake_random_access_stream.cc index 3cdfbab8e77526..d1e990814599dd 100644 --- a/chrome/browser/webshare/win/fake_random_access_stream.cc +++ b/chrome/browser/webshare/win/fake_random_access_stream.cc @@ -10,7 +10,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/memory/weak_ptr.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/fake_iasync_operation_win.h" #include "base/threading/thread_task_runner_handle.h" #include "chrome/browser/webshare/win/fake_iasync_operation_with_progress.h" diff --git a/chrome/browser/webshare/win/fake_storage_file_statics.cc b/chrome/browser/webshare/win/fake_storage_file_statics.cc index f188bc9e768ab1..c0bef31c0093ca 100644 --- a/chrome/browser/webshare/win/fake_storage_file_statics.cc +++ b/chrome/browser/webshare/win/fake_storage_file_statics.cc @@ -13,7 +13,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/macros.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/fake_iasync_operation_win.h" #include "base/threading/thread_task_runner_handle.h" #include "base/win/scoped_hstring.h" diff --git a/chrome/browser/webshare/win/share_operation_unittest.cc b/chrome/browser/webshare/win/share_operation_unittest.cc index 3387e7b8a46d7c..7b59ea38f3bb46 100644 --- a/chrome/browser/webshare/win/share_operation_unittest.cc +++ b/chrome/browser/webshare/win/share_operation_unittest.cc @@ -7,7 +7,7 @@ #include "base/guid.h" #include "base/run_loop.h" #include "base/synchronization/waitable_event.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/win/core_winrt_util.h" #include "base/win/post_async_results.h" diff --git a/chrome/browser/win/conflicts/incompatible_applications_browsertest.cc b/chrome/browser/win/conflicts/incompatible_applications_browsertest.cc index f04bd10279d027..a331ef2344e2f9 100644 --- a/chrome/browser/win/conflicts/incompatible_applications_browsertest.cc +++ b/chrome/browser/win/conflicts/incompatible_applications_browsertest.cc @@ -12,7 +12,7 @@ #include "base/scoped_native_library.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/test/test_reg_util_win.h" #include "base/threading/thread_restrictions.h" diff --git a/chrome/browser/win/conflicts/third_party_blocking_browsertest.cc b/chrome/browser/win/conflicts/third_party_blocking_browsertest.cc index 46a8227461d446..9bdb72484f5d7c 100644 --- a/chrome/browser/win/conflicts/third_party_blocking_browsertest.cc +++ b/chrome/browser/win/conflicts/third_party_blocking_browsertest.cc @@ -10,7 +10,7 @@ #include "base/path_service.h" #include "base/run_loop.h" #include "base/scoped_native_library.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/test/test_reg_util_win.h" #include "base/win/registry.h" diff --git a/chrome/common/profiler/thread_profiler_unittest.cc b/chrome/common/profiler/thread_profiler_unittest.cc index df95b04a128007..8b8acbc5e081bf 100644 --- a/chrome/common/profiler/thread_profiler_unittest.cc +++ b/chrome/common/profiler/thread_profiler_unittest.cc @@ -5,7 +5,7 @@ #include "chrome/common/profiler/thread_profiler.h" #include "base/macros.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/simple_test_tick_clock.h" #include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/installer/util/callback_work_item_unittest.cc b/chrome/installer/util/callback_work_item_unittest.cc index 49a6563af529b6..1ac9067e92a93a 100644 --- a/chrome/installer/util/callback_work_item_unittest.cc +++ b/chrome/installer/util/callback_work_item_unittest.cc @@ -6,7 +6,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "testing/gtest/include/gtest/gtest.h" namespace { diff --git a/chrome/renderer/chromeos_delayed_callback_group_unittest.cc b/chrome/renderer/chromeos_delayed_callback_group_unittest.cc index c21ff35bcb6c9c..a8d43d0bbb55f2 100644 --- a/chrome/renderer/chromeos_delayed_callback_group_unittest.cc +++ b/chrome/renderer/chromeos_delayed_callback_group_unittest.cc @@ -7,7 +7,7 @@ #include "base/run_loop.h" #include "base/task/post_task.h" #include "base/task/task_traits.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/threading/platform_thread.h" #include "base/threading/sequenced_task_runner_handle.h" diff --git a/chrome/renderer/net/net_error_helper_core_unittest.cc b/chrome/renderer/net/net_error_helper_core_unittest.cc index 91243bab3fe336..59c5055cde57c1 100644 --- a/chrome/renderer/net/net_error_helper_core_unittest.cc +++ b/chrome/renderer/net/net_error_helper_core_unittest.cc @@ -18,7 +18,7 @@ #include "base/memory/ptr_util.h" #include "base/stl_util.h" #include "base/strings/string_util.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/task_environment.h" #include "build/build_config.h" diff --git a/chrome/renderer/v8_unwinder_unittest.cc b/chrome/renderer/v8_unwinder_unittest.cc index d7fa34382d46c7..add0565b98eab5 100644 --- a/chrome/renderer/v8_unwinder_unittest.cc +++ b/chrome/renderer/v8_unwinder_unittest.cc @@ -16,7 +16,7 @@ #include "base/profiler/stack_sampling_profiler_test_util.h" #include "base/stl_util.h" #include "base/synchronization/waitable_event.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "build/build_config.h" #include "gin/public/isolate_holder.h" diff --git a/chrome/service/cloud_print/printer_job_handler_unittest.cc b/chrome/service/cloud_print/printer_job_handler_unittest.cc index 884650f235cbf7..d53a45fd8a658f 100644 --- a/chrome/service/cloud_print/printer_job_handler_unittest.cc +++ b/chrome/service/cloud_print/printer_job_handler_unittest.cc @@ -14,7 +14,7 @@ #include "base/run_loop.h" #include "base/single_thread_task_runner.h" #include "base/strings/stringprintf.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_run_loop_timeout.h" #include "base/test/task_environment.h" #include "base/threading/thread_task_runner_handle.h" diff --git a/chrome/services/machine_learning/decision_tree_predictor_unittest.cc b/chrome/services/machine_learning/decision_tree_predictor_unittest.cc index efbd1b115a74cb..90107984c8ddea 100644 --- a/chrome/services/machine_learning/decision_tree_predictor_unittest.cc +++ b/chrome/services/machine_learning/decision_tree_predictor_unittest.cc @@ -9,7 +9,7 @@ #include "base/macros.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/task_environment.h" #include "chrome/services/machine_learning/metrics.h" diff --git a/chrome/services/machine_learning/machine_learning_service_unittest.cc b/chrome/services/machine_learning/machine_learning_service_unittest.cc index 428198ee4d0dc8..91290692cae871 100644 --- a/chrome/services/machine_learning/machine_learning_service_unittest.cc +++ b/chrome/services/machine_learning/machine_learning_service_unittest.cc @@ -7,7 +7,7 @@ #include #include "base/macros.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "chrome/services/machine_learning/public/cpp/test_support/machine_learning_test_utils.h" #include "chrome/services/machine_learning/public/mojom/decision_tree.mojom.h" diff --git a/chrome/services/media_gallery_util/media_parser_android_unittest.cc b/chrome/services/media_gallery_util/media_parser_android_unittest.cc index f05d1e5357f820..c39244357f46b2 100644 --- a/chrome/services/media_gallery_util/media_parser_android_unittest.cc +++ b/chrome/services/media_gallery_util/media_parser_android_unittest.cc @@ -12,7 +12,7 @@ #include "base/files/scoped_temp_dir.h" #include "base/macros.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "chrome/services/media_gallery_util/public/mojom/media_parser.mojom.h" #include "media/base/test_data_util.h" diff --git a/chrome/services/sharing/nearby/decoder/nearby_decoder_unittest.cc b/chrome/services/sharing/nearby/decoder/nearby_decoder_unittest.cc index 03187d058288af..2f2a08b7d48a41 100644 --- a/chrome/services/sharing/nearby/decoder/nearby_decoder_unittest.cc +++ b/chrome/services/sharing/nearby/decoder/nearby_decoder_unittest.cc @@ -11,7 +11,7 @@ #include "base/numerics/safe_conversions.h" #include "base/strings/string_number_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "chrome/services/sharing/public/cpp/advertisement.h" #include "chrome/services/sharing/public/cpp/conversions.h" diff --git a/chrome/services/sharing/nearby/nearby_connections_unittest.cc b/chrome/services/sharing/nearby/nearby_connections_unittest.cc index 76f2e892c54677..9b06bdcb02025b 100644 --- a/chrome/services/sharing/nearby/nearby_connections_unittest.cc +++ b/chrome/services/sharing/nearby/nearby_connections_unittest.cc @@ -15,7 +15,7 @@ #include "base/memory/ptr_util.h" #include "base/run_loop.h" #include "base/strings/string_number_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "chrome/services/sharing/nearby/nearby_connections_conversions.h" #include "chrome/services/sharing/nearby/test_support/fake_adapter.h" diff --git a/chrome/services/sharing/nearby/platform/atomic_boolean_unittest.cc b/chrome/services/sharing/nearby/platform/atomic_boolean_unittest.cc index 9b69511f879b30..ac8b8e9d6db049 100644 --- a/chrome/services/sharing/nearby/platform/atomic_boolean_unittest.cc +++ b/chrome/services/sharing/nearby/platform/atomic_boolean_unittest.cc @@ -8,7 +8,7 @@ #include "base/run_loop.h" #include "base/task/post_task.h" #include "base/task_runner.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/services/sharing/nearby/platform/atomic_uint32_unittest.cc b/chrome/services/sharing/nearby/platform/atomic_uint32_unittest.cc index 8634d8e2c0b7c0..ac0be95acc115c 100644 --- a/chrome/services/sharing/nearby/platform/atomic_uint32_unittest.cc +++ b/chrome/services/sharing/nearby/platform/atomic_uint32_unittest.cc @@ -9,7 +9,7 @@ #include "base/bind.h" #include "base/run_loop.h" #include "base/task/post_task.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/services/sharing/nearby/platform/ble_medium_unittest.cc b/chrome/services/sharing/nearby/platform/ble_medium_unittest.cc index d29f84f9f9e235..213d0700fa756f 100644 --- a/chrome/services/sharing/nearby/platform/ble_medium_unittest.cc +++ b/chrome/services/sharing/nearby/platform/ble_medium_unittest.cc @@ -9,7 +9,7 @@ #include "base/bind.h" #include "base/optional.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "chrome/services/sharing/nearby/platform/ble_peripheral.h" #include "chrome/services/sharing/nearby/test_support/fake_adapter.h" diff --git a/chrome/services/sharing/nearby/platform/bluetooth_adapter_unittest.cc b/chrome/services/sharing/nearby/platform/bluetooth_adapter_unittest.cc index ec43316c90372b..c7ec5f49c48b6e 100644 --- a/chrome/services/sharing/nearby/platform/bluetooth_adapter_unittest.cc +++ b/chrome/services/sharing/nearby/platform/bluetooth_adapter_unittest.cc @@ -7,7 +7,7 @@ #include #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "chrome/services/sharing/nearby/test_support/fake_adapter.h" #include "mojo/public/cpp/bindings/pending_remote.h" diff --git a/chrome/services/sharing/nearby/platform/bluetooth_classic_medium_unittest.cc b/chrome/services/sharing/nearby/platform/bluetooth_classic_medium_unittest.cc index 4e158550dc3d9e..375130ee165138 100644 --- a/chrome/services/sharing/nearby/platform/bluetooth_classic_medium_unittest.cc +++ b/chrome/services/sharing/nearby/platform/bluetooth_classic_medium_unittest.cc @@ -8,7 +8,7 @@ #include "base/bind.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "chrome/services/sharing/nearby/test_support/fake_adapter.h" #include "mojo/public/cpp/bindings/pending_remote.h" diff --git a/chrome/services/sharing/nearby/platform/bluetooth_server_socket_unittest.cc b/chrome/services/sharing/nearby/platform/bluetooth_server_socket_unittest.cc index bdc255ecb5ca71..be332f8ebef4ef 100644 --- a/chrome/services/sharing/nearby/platform/bluetooth_server_socket_unittest.cc +++ b/chrome/services/sharing/nearby/platform/bluetooth_server_socket_unittest.cc @@ -8,7 +8,7 @@ #include "base/bind.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "chrome/services/sharing/nearby/platform/bluetooth_device.h" #include "chrome/services/sharing/nearby/platform/bluetooth_socket.h" diff --git a/chrome/services/sharing/nearby/platform/bluetooth_socket_unittest.cc b/chrome/services/sharing/nearby/platform/bluetooth_socket_unittest.cc index f25fbbca520c62..5f65b551d674ee 100644 --- a/chrome/services/sharing/nearby/platform/bluetooth_socket_unittest.cc +++ b/chrome/services/sharing/nearby/platform/bluetooth_socket_unittest.cc @@ -11,7 +11,7 @@ #include "base/bind.h" #include "base/run_loop.h" #include "base/task/thread_pool.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "chrome/services/sharing/nearby/platform/bluetooth_device.h" #include "mojo/public/cpp/bindings/pending_remote.h" diff --git a/chrome/services/sharing/nearby/platform/condition_variable_unittest.cc b/chrome/services/sharing/nearby/platform/condition_variable_unittest.cc index 0c7f3f9d83b03d..f9baee715a4e08 100644 --- a/chrome/services/sharing/nearby/platform/condition_variable_unittest.cc +++ b/chrome/services/sharing/nearby/platform/condition_variable_unittest.cc @@ -10,7 +10,7 @@ #include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/task_runner.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/gtest_util.h" #include "base/test/task_environment.h" #include "base/threading/thread_restrictions.h" diff --git a/chrome/services/sharing/nearby/platform/count_down_latch_unittest.cc b/chrome/services/sharing/nearby/platform/count_down_latch_unittest.cc index f472760be25102..b037ed4eed7e72 100644 --- a/chrome/services/sharing/nearby/platform/count_down_latch_unittest.cc +++ b/chrome/services/sharing/nearby/platform/count_down_latch_unittest.cc @@ -15,7 +15,7 @@ #include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/task_runner.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/threading/platform_thread.h" #include "base/threading/thread_restrictions.h" diff --git a/chrome/services/sharing/nearby/platform/mutex_unittest.cc b/chrome/services/sharing/nearby/platform/mutex_unittest.cc index 3e88f1aed20ae5..80502402b79253 100644 --- a/chrome/services/sharing/nearby/platform/mutex_unittest.cc +++ b/chrome/services/sharing/nearby/platform/mutex_unittest.cc @@ -11,7 +11,7 @@ #include "base/stl_util.h" #include "base/task/post_task.h" #include "base/task/thread_pool.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/gtest_util.h" #include "base/test/task_environment.h" #include "base/unguessable_token.h" diff --git a/chrome/services/sharing/nearby/platform/recursive_mutex_unittest.cc b/chrome/services/sharing/nearby/platform/recursive_mutex_unittest.cc index 5c4148e510e10b..545550ddb76a62 100644 --- a/chrome/services/sharing/nearby/platform/recursive_mutex_unittest.cc +++ b/chrome/services/sharing/nearby/platform/recursive_mutex_unittest.cc @@ -11,7 +11,7 @@ #include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/task_runner.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/gtest_util.h" #include "base/test/task_environment.h" #include "base/unguessable_token.h" diff --git a/chrome/services/sharing/sharing_impl_unittest.cc b/chrome/services/sharing/sharing_impl_unittest.cc index b82fd1e540eba9..cca85c1b21e471 100644 --- a/chrome/services/sharing/sharing_impl_unittest.cc +++ b/chrome/services/sharing/sharing_impl_unittest.cc @@ -7,7 +7,7 @@ #include #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "chrome/services/sharing/nearby/nearby_connections.h" #include "chrome/services/sharing/nearby/test_support/fake_adapter.h" diff --git a/chrome/test/base/search_test_utils.cc b/chrome/test/base/search_test_utils.cc index 45e3fc82a1a179..dc72a2c84b1838 100644 --- a/chrome/test/base/search_test_utils.cc +++ b/chrome/test/base/search_test_utils.cc @@ -5,7 +5,7 @@ #include "chrome/test/base/search_test_utils.h" #include "base/memory/ref_counted.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "components/search_engines/template_url_service.h" #include "content/public/test/test_utils.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/test/base/ui_test_utils.cc b/chrome/test/base/ui_test_utils.cc index 403d24f1178bab..d0e0c8c5b19caa 100644 --- a/chrome/test/base/ui_test_utils.cc +++ b/chrome/test/base/ui_test_utils.cc @@ -18,7 +18,7 @@ #include "base/path_service.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/test_timeouts.h" #include "base/threading/thread_restrictions.h" #include "base/time/time.h" diff --git a/chrome/updater/mac/update_service_proxy_test.mm b/chrome/updater/mac/update_service_proxy_test.mm index 27754c808642cf..49307d105688d4 100644 --- a/chrome/updater/mac/update_service_proxy_test.mm +++ b/chrome/updater/mac/update_service_proxy_test.mm @@ -20,7 +20,7 @@ #include "base/memory/scoped_refptr.h" #include "base/optional.h" #include "base/strings/sys_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/test/test_timeouts.h" #include "base/threading/sequenced_task_runner_handle.h" diff --git a/chrome/updater/prefs_unittest.cc b/chrome/updater/prefs_unittest.cc index d1ec170771f415..480e766f697836 100644 --- a/chrome/updater/prefs_unittest.cc +++ b/chrome/updater/prefs_unittest.cc @@ -5,7 +5,7 @@ #include #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "build/build_config.h" #include "chrome/updater/persisted_data.h" diff --git a/chromecast/browser/cast_web_contents_browsertest.cc b/chromecast/browser/cast_web_contents_browsertest.cc index 1f7e932a6ce52b..454478a10b5813 100644 --- a/chromecast/browser/cast_web_contents_browsertest.cc +++ b/chromecast/browser/cast_web_contents_browsertest.cc @@ -18,7 +18,7 @@ #include "base/strings/string16.h" #include "base/strings/string_piece.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chromecast/base/chromecast_switches.h" #include "chromecast/base/metrics/cast_metrics_helper.h" #include "chromecast/browser/cast_browser_context.h" diff --git a/chromeos/components/account_manager/account_manager_unittest.cc b/chromeos/components/account_manager/account_manager_unittest.cc index 814337d0c3e948..eedbe65bd287c7 100644 --- a/chromeos/components/account_manager/account_manager_unittest.cc +++ b/chromeos/components/account_manager/account_manager_unittest.cc @@ -16,7 +16,7 @@ #include "base/memory/scoped_refptr.h" #include "base/run_loop.h" #include "base/stl_util.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/threading/sequenced_task_runner_handle.h" #include "components/prefs/testing_pref_service.h" diff --git a/chromeos/components/diagnostics_ui/backend/system_data_provider_unittest.cc b/chromeos/components/diagnostics_ui/backend/system_data_provider_unittest.cc index 096b38505eca78..ff23b2a0a9044f 100644 --- a/chromeos/components/diagnostics_ui/backend/system_data_provider_unittest.cc +++ b/chromeos/components/diagnostics_ui/backend/system_data_provider_unittest.cc @@ -11,7 +11,7 @@ #include "base/run_loop.h" #include "base/strings/string16.h" #include "base/system/sys_info.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/time/time.h" #include "base/timer/mock_timer.h" diff --git a/chromeos/components/diagnostics_ui/backend/system_routine_controller_unittest.cc b/chromeos/components/diagnostics_ui/backend/system_routine_controller_unittest.cc index a970616a66ab8a..e02ebc84dfbb46 100644 --- a/chromeos/components/diagnostics_ui/backend/system_routine_controller_unittest.cc +++ b/chromeos/components/diagnostics_ui/backend/system_routine_controller_unittest.cc @@ -5,7 +5,7 @@ #include "chromeos/components/diagnostics_ui/backend/system_routine_controller.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "chromeos/dbus/cros_healthd/fake_cros_healthd_client.h" #include "chromeos/services/cros_healthd/public/mojom/cros_healthd.mojom.h" diff --git a/chromeos/components/drivefs/drivefs_auth_unittest.cc b/chromeos/components/drivefs/drivefs_auth_unittest.cc index 83b5440da6f388..ca1025a080f57d 100644 --- a/chromeos/components/drivefs/drivefs_auth_unittest.cc +++ b/chromeos/components/drivefs/drivefs_auth_unittest.cc @@ -9,7 +9,7 @@ #include "base/run_loop.h" #include "base/strings/strcat.h" #include "base/strings/string_split.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/simple_test_clock.h" #include "base/test/task_environment.h" #include "base/timer/mock_timer.h" diff --git a/chromeos/components/drivefs/drivefs_host_unittest.cc b/chromeos/components/drivefs/drivefs_host_unittest.cc index 0322e6c1a8a3fb..a9351f35c77ca0 100644 --- a/chromeos/components/drivefs/drivefs_host_unittest.cc +++ b/chromeos/components/drivefs/drivefs_host_unittest.cc @@ -15,7 +15,7 @@ #include "base/scoped_observer.h" #include "base/strings/strcat.h" #include "base/strings/string_split.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/gmock_callback_support.h" #include "base/test/simple_test_clock.h" #include "base/test/task_environment.h" diff --git a/chromeos/components/drivefs/drivefs_search_unittest.cc b/chromeos/components/drivefs/drivefs_search_unittest.cc index d4b1cf0035c30a..80bb6316500c07 100644 --- a/chromeos/components/drivefs/drivefs_search_unittest.cc +++ b/chromeos/components/drivefs/drivefs_search_unittest.cc @@ -7,7 +7,7 @@ #include #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/simple_test_clock.h" #include "base/test/task_environment.h" #include "chromeos/components/drivefs/mojom/drivefs.mojom-test-utils.h" diff --git a/chromeos/components/drivefs/drivefs_session_unittest.cc b/chromeos/components/drivefs/drivefs_session_unittest.cc index 815ecb38b3a406..1e157520ca805d 100644 --- a/chromeos/components/drivefs/drivefs_session_unittest.cc +++ b/chromeos/components/drivefs/drivefs_session_unittest.cc @@ -8,7 +8,7 @@ #include "base/run_loop.h" #include "base/strings/strcat.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/gmock_callback_support.h" #include "base/test/simple_test_clock.h" #include "base/test/task_environment.h" diff --git a/chromeos/components/mojo_bootstrap/pending_connection_manager_unittest.cc b/chromeos/components/mojo_bootstrap/pending_connection_manager_unittest.cc index 92ef0da84de707..ed49f85e5fd4f7 100644 --- a/chromeos/components/mojo_bootstrap/pending_connection_manager_unittest.cc +++ b/chromeos/components/mojo_bootstrap/pending_connection_manager_unittest.cc @@ -4,7 +4,7 @@ #include "chromeos/components/mojo_bootstrap/pending_connection_manager.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "testing/gtest/include/gtest/gtest.h" namespace mojo_bootstrap { diff --git a/chromeos/components/smbfs/smbfs_host_unittest.cc b/chromeos/components/smbfs/smbfs_host_unittest.cc index e61ac39dca9edf..58b59f6efff561 100644 --- a/chromeos/components/smbfs/smbfs_host_unittest.cc +++ b/chromeos/components/smbfs/smbfs_host_unittest.cc @@ -6,7 +6,7 @@ #include "base/files/file_util.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/gmock_callback_support.h" #include "base/test/task_environment.h" #include "chromeos/disks/mock_disk_mount_manager.h" diff --git a/chromeos/components/smbfs/smbfs_mounter_unittest.cc b/chromeos/components/smbfs/smbfs_mounter_unittest.cc index 069c5d0d56cd91..58c73594b31325 100644 --- a/chromeos/components/smbfs/smbfs_mounter_unittest.cc +++ b/chromeos/components/smbfs/smbfs_mounter_unittest.cc @@ -12,7 +12,7 @@ #include "base/bind.h" #include "base/files/file_util.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/gmock_callback_support.h" #include "base/test/multiprocess_test.h" #include "base/test/task_environment.h" diff --git a/chromeos/components/sync_wifi/wifi_configuration_bridge_unittest.cc b/chromeos/components/sync_wifi/wifi_configuration_bridge_unittest.cc index 1913bbb81791be..8bb5a21d345cf5 100644 --- a/chromeos/components/sync_wifi/wifi_configuration_bridge_unittest.cc +++ b/chromeos/components/sync_wifi/wifi_configuration_bridge_unittest.cc @@ -12,7 +12,7 @@ #include "base/bind.h" #include "base/containers/flat_map.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/task_environment.h" #include "chromeos/components/sync_wifi/fake_local_network_collector.h" diff --git a/chromeos/components/telemetry_extension_ui/probe_service_unittest.cc b/chromeos/components/telemetry_extension_ui/probe_service_unittest.cc index 08db9cde2c266e..ac7de079d97942 100644 --- a/chromeos/components/telemetry_extension_ui/probe_service_unittest.cc +++ b/chromeos/components/telemetry_extension_ui/probe_service_unittest.cc @@ -12,7 +12,7 @@ #include #include "base/bind.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "chromeos/dbus/cros_healthd/cros_healthd_client.h" #include "chromeos/dbus/cros_healthd/fake_cros_healthd_client.h" diff --git a/chromeos/dbus/chromebox_for_meetings/cfm_hotline_client_unittest.cc b/chromeos/dbus/chromebox_for_meetings/cfm_hotline_client_unittest.cc index 4ee94e5c9d760b..d46eff3ae062b2 100644 --- a/chromeos/dbus/chromebox_for_meetings/cfm_hotline_client_unittest.cc +++ b/chromeos/dbus/chromebox_for_meetings/cfm_hotline_client_unittest.cc @@ -14,7 +14,7 @@ #include "base/bind.h" #include "base/files/file.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/mock_callback.h" #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h" diff --git a/chromeos/dbus/lorgnette_manager/lorgnette_manager_client_unittest.cc b/chromeos/dbus/lorgnette_manager/lorgnette_manager_client_unittest.cc index bbaba5fa96649c..67b284c68d448b 100644 --- a/chromeos/dbus/lorgnette_manager/lorgnette_manager_client_unittest.cc +++ b/chromeos/dbus/lorgnette_manager/lorgnette_manager_client_unittest.cc @@ -12,7 +12,7 @@ #include "base/bind_helpers.h" #include "base/memory/scoped_refptr.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "chromeos/dbus/lorgnette/lorgnette_service.pb.h" #include "dbus/message.h" diff --git a/chromeos/dbus/power/power_manager_client_unittest.cc b/chromeos/dbus/power/power_manager_client_unittest.cc index 041b7a29473f96..a4df1af9b0e8d8 100644 --- a/chromeos/dbus/power/power_manager_client_unittest.cc +++ b/chromeos/dbus/power/power_manager_client_unittest.cc @@ -15,7 +15,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/power_monitor_test_base.h" #include "base/test/task_environment.h" #include "base/unguessable_token.h" diff --git a/chromeos/disks/mount_point_unittest.cc b/chromeos/disks/mount_point_unittest.cc index 6d484b1b01b364..d1981f111ce770 100644 --- a/chromeos/disks/mount_point_unittest.cc +++ b/chromeos/disks/mount_point_unittest.cc @@ -5,7 +5,7 @@ #include "chromeos/disks/mount_point.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/gmock_callback_support.h" #include "base/test/task_environment.h" #include "chromeos/disks/mock_disk_mount_manager.h" diff --git a/chromeos/memory/userspace_swap/userfaultfd_unittest.cc b/chromeos/memory/userspace_swap/userfaultfd_unittest.cc index 0e6b6981b63a3d..aeb0f618d579ec 100644 --- a/chromeos/memory/userspace_swap/userfaultfd_unittest.cc +++ b/chromeos/memory/userspace_swap/userfaultfd_unittest.cc @@ -17,7 +17,7 @@ #include "base/logging.h" #include "base/process/process_metrics.h" #include "base/rand_util.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/test/test_simple_task_runner.h" #include "base/threading/platform_thread.h" diff --git a/chromeos/printing/ppd_provider_unittest.cc b/chromeos/printing/ppd_provider_unittest.cc index 70c95f71250254..42906a9ed221e6 100644 --- a/chromeos/printing/ppd_provider_unittest.cc +++ b/chromeos/printing/ppd_provider_unittest.cc @@ -16,7 +16,7 @@ #include "base/run_loop.h" #include "base/single_thread_task_runner.h" #include "base/strings/stringprintf.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/test/test_message_loop.h" #include "base/threading/sequenced_task_runner_handle.h" diff --git a/chromeos/printing/ppd_provider_v3_unittest.cc b/chromeos/printing/ppd_provider_v3_unittest.cc index 37cb275cd4c08f..28ec95a85e1e43 100644 --- a/chromeos/printing/ppd_provider_v3_unittest.cc +++ b/chromeos/printing/ppd_provider_v3_unittest.cc @@ -19,7 +19,7 @@ #include "base/single_thread_task_runner.h" #include "base/strings/strcat.h" #include "base/strings/stringprintf.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/simple_test_clock.h" #include "base/test/task_environment.h" #include "base/test/test_message_loop.h" diff --git a/chromeos/printing/printer_config_cache_unittest.cc b/chromeos/printing/printer_config_cache_unittest.cc index aad1882e0dba8b..f9ce1cef61d7e4 100644 --- a/chromeos/printing/printer_config_cache_unittest.cc +++ b/chromeos/printing/printer_config_cache_unittest.cc @@ -10,7 +10,7 @@ #include "base/callback_forward.h" #include "base/location.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/simple_test_clock.h" #include "base/test/task_environment.h" #include "base/threading/sequenced_task_runner_handle.h" diff --git a/chromeos/services/assistant/assistant_manager_service_impl_unittest.cc b/chromeos/services/assistant/assistant_manager_service_impl_unittest.cc index 17e5cedf5b81d4..6bbadd1f5c8c0a 100644 --- a/chromeos/services/assistant/assistant_manager_service_impl_unittest.cc +++ b/chromeos/services/assistant/assistant_manager_service_impl_unittest.cc @@ -9,7 +9,7 @@ #include "ash/public/cpp/assistant/controller/assistant_alarm_timer_controller.h" #include "base/json/json_reader.h" #include "base/optional.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h" #include "base/values.h" diff --git a/chromeos/services/chromebox_for_meetings/public/cpp/service_connection_unittest.cc b/chromeos/services/chromebox_for_meetings/public/cpp/service_connection_unittest.cc index 538cc7f98c17bc..8a042d2738fd48 100644 --- a/chromeos/services/chromebox_for_meetings/public/cpp/service_connection_unittest.cc +++ b/chromeos/services/chromebox_for_meetings/public/cpp/service_connection_unittest.cc @@ -11,7 +11,7 @@ #include "base/macros.h" #include "base/optional.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/mock_callback.h" #include "base/test/task_environment.h" #include "chromeos/dbus/chromebox_for_meetings/cfm_hotline_client.h" diff --git a/chromeos/services/cros_healthd/public/cpp/service_connection_unittest.cc b/chromeos/services/cros_healthd/public/cpp/service_connection_unittest.cc index da6dad02c9909d..f64dca7c53546e 100644 --- a/chromeos/services/cros_healthd/public/cpp/service_connection_unittest.cc +++ b/chromeos/services/cros_healthd/public/cpp/service_connection_unittest.cc @@ -13,7 +13,7 @@ #include "base/macros.h" #include "base/optional.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "chromeos/dbus/cros_healthd/cros_healthd_client.h" #include "chromeos/dbus/cros_healthd/fake_cros_healthd_client.h" diff --git a/chromeos/services/device_sync/synced_bluetooth_address_tracker_impl_unittest.cc b/chromeos/services/device_sync/synced_bluetooth_address_tracker_impl_unittest.cc index 628feb3e1d2c23..5a43021cf8fab5 100644 --- a/chromeos/services/device_sync/synced_bluetooth_address_tracker_impl_unittest.cc +++ b/chromeos/services/device_sync/synced_bluetooth_address_tracker_impl_unittest.cc @@ -8,7 +8,7 @@ #include #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h" #include "chromeos/constants/chromeos_features.h" diff --git a/chromeos/services/ime/decoder/system_engine_unittest.cc b/chromeos/services/ime/decoder/system_engine_unittest.cc index 5e54c6c19c2ba9..b75c9219172174 100644 --- a/chromeos/services/ime/decoder/system_engine_unittest.cc +++ b/chromeos/services/ime/decoder/system_engine_unittest.cc @@ -4,7 +4,7 @@ #include "chromeos/services/ime/decoder/system_engine.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h" #include "chromeos/constants/chromeos_features.h" diff --git a/chromeos/services/secure_channel/ble_scanner_impl_unittest.cc b/chromeos/services/secure_channel/ble_scanner_impl_unittest.cc index 40abea976adc7e..cb51e05bc4c8e4 100644 --- a/chromeos/services/secure_channel/ble_scanner_impl_unittest.cc +++ b/chromeos/services/secure_channel/ble_scanner_impl_unittest.cc @@ -12,7 +12,7 @@ #include "base/bind.h" #include "base/callback_forward.h" #include "base/memory/ptr_util.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "chromeos/components/multidevice/remote_device_test_util.h" #include "chromeos/services/secure_channel/ble_constants.h" #include "chromeos/services/secure_channel/connection_role.h" diff --git a/components/arc/enterprise/arc_data_snapshotd_bridge_unittest.cc b/components/arc/enterprise/arc_data_snapshotd_bridge_unittest.cc index 2924aa043df2f7..e3a27f33a15ba8 100644 --- a/components/arc/enterprise/arc_data_snapshotd_bridge_unittest.cc +++ b/components/arc/enterprise/arc_data_snapshotd_bridge_unittest.cc @@ -8,7 +8,7 @@ #include "base/bind_helpers.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "chromeos/dbus/arc/arc_data_snapshotd_client.h" #include "chromeos/dbus/arc/fake_arc_data_snapshotd_client.h" diff --git a/components/arc/enterprise/arc_data_snapshotd_manager_unittest.cc b/components/arc/enterprise/arc_data_snapshotd_manager_unittest.cc index 6e6226d7747c27..8035060a30a9bb 100644 --- a/components/arc/enterprise/arc_data_snapshotd_manager_unittest.cc +++ b/components/arc/enterprise/arc_data_snapshotd_manager_unittest.cc @@ -9,7 +9,7 @@ #include "base/bind_helpers.h" #include "base/command_line.h" #include "base/memory/ptr_util.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "chromeos/constants/chromeos_switches.h" #include "chromeos/dbus/arc/fake_arc_data_snapshotd_client.h" diff --git a/components/arc/ime/key_event_result_receiver_unittest.cc b/components/arc/ime/key_event_result_receiver_unittest.cc index b449fee9a42c09..0329866e697004 100644 --- a/components/arc/ime/key_event_result_receiver_unittest.cc +++ b/components/arc/ime/key_event_result_receiver_unittest.cc @@ -4,7 +4,7 @@ #include "components/arc/ime/key_event_result_receiver.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/events/base_event_utils.h" diff --git a/components/arc/session/arc_vm_client_adapter_unittest.cc b/components/arc/session/arc_vm_client_adapter_unittest.cc index 0f51bbdd9f3e12..40f9855d6b5faa 100644 --- a/components/arc/session/arc_vm_client_adapter_unittest.cc +++ b/components/arc/session/arc_vm_client_adapter_unittest.cc @@ -25,7 +25,7 @@ #include "base/system/sys_info.h" #include "base/task/current_thread.h" #include "base/task/post_task.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_run_loop_timeout.h" #include "base/time/time.h" #include "chromeos/cryptohome/cryptohome_parameters.h" diff --git a/components/autofill/core/browser/payments/payments_client_unittest.cc b/components/autofill/core/browser/payments/payments_client_unittest.cc index 1faf3fad21390c..d96c2f31f4bc61 100644 --- a/components/autofill/core/browser/payments/payments_client_unittest.cc +++ b/components/autofill/core/browser/payments/payments_client_unittest.cc @@ -12,7 +12,7 @@ #include "base/macros.h" #include "base/strings/string_piece.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h" diff --git a/components/autofill/core/browser/webdata/autocomplete_sync_bridge_unittest.cc b/components/autofill/core/browser/webdata/autocomplete_sync_bridge_unittest.cc index 66de8a694e84a9..67ed0b709bd438 100644 --- a/components/autofill/core/browser/webdata/autocomplete_sync_bridge_unittest.cc +++ b/components/autofill/core/browser/webdata/autocomplete_sync_bridge_unittest.cc @@ -16,7 +16,7 @@ #include "base/run_loop.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/threading/thread_task_runner_handle.h" #include "base/time/time.h" diff --git a/components/autofill/core/browser/webdata/autofill_profile_sync_bridge_unittest.cc b/components/autofill/core/browser/webdata/autofill_profile_sync_bridge_unittest.cc index 4478f55e204065..cc54be34493dfd 100644 --- a/components/autofill/core/browser/webdata/autofill_profile_sync_bridge_unittest.cc +++ b/components/autofill/core/browser/webdata/autofill_profile_sync_bridge_unittest.cc @@ -18,7 +18,7 @@ #include "base/memory/ptr_util.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h" #include "base/time/time.h" diff --git a/components/autofill/core/browser/webdata/autofill_wallet_metadata_sync_bridge_unittest.cc b/components/autofill/core/browser/webdata/autofill_wallet_metadata_sync_bridge_unittest.cc index 6622c8f9bb1585..37eef54a9e50a3 100644 --- a/components/autofill/core/browser/webdata/autofill_wallet_metadata_sync_bridge_unittest.cc +++ b/components/autofill/core/browser/webdata/autofill_wallet_metadata_sync_bridge_unittest.cc @@ -16,7 +16,7 @@ #include "base/bind_helpers.h" #include "base/files/scoped_temp_dir.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/time/time.h" #include "components/autofill/core/browser/data_model/autofill_metadata.h" diff --git a/components/autofill/core/browser/webdata/autofill_wallet_offer_sync_bridge_unittest.cc b/components/autofill/core/browser/webdata/autofill_wallet_offer_sync_bridge_unittest.cc index daadb6f67009b3..5658421d159af5 100644 --- a/components/autofill/core/browser/webdata/autofill_wallet_offer_sync_bridge_unittest.cc +++ b/components/autofill/core/browser/webdata/autofill_wallet_offer_sync_bridge_unittest.cc @@ -12,7 +12,7 @@ #include "base/files/scoped_temp_dir.h" #include "base/strings/strcat.h" #include "base/strings/string_number_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/task_environment.h" #include "base/time/time.h" diff --git a/components/autofill/core/browser/webdata/autofill_wallet_sync_bridge_unittest.cc b/components/autofill/core/browser/webdata/autofill_wallet_sync_bridge_unittest.cc index e9df7901eb5f3c..fa92eceaf1cacc 100644 --- a/components/autofill/core/browser/webdata/autofill_wallet_sync_bridge_unittest.cc +++ b/components/autofill/core/browser/webdata/autofill_wallet_sync_bridge_unittest.cc @@ -14,7 +14,7 @@ #include "base/files/scoped_temp_dir.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/mock_callback.h" #include "base/test/task_environment.h" #include "base/time/time.h" diff --git a/components/autofill_assistant/browser/actions/action_delegate_util_unittest.cc b/components/autofill_assistant/browser/actions/action_delegate_util_unittest.cc index a0ecdb59197db3..ac4e59305ab141 100644 --- a/components/autofill_assistant/browser/actions/action_delegate_util_unittest.cc +++ b/components/autofill_assistant/browser/actions/action_delegate_util_unittest.cc @@ -4,7 +4,7 @@ #include "components/autofill_assistant/browser/actions/action_delegate_util.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/gmock_callback_support.h" #include "components/autofill_assistant/browser/actions/action_test_utils.h" #include "components/autofill_assistant/browser/actions/mock_action_delegate.h" diff --git a/components/autofill_assistant/browser/actions/configure_bottom_sheet_action_unittest.cc b/components/autofill_assistant/browser/actions/configure_bottom_sheet_action_unittest.cc index 65fde663519439..c4f0e50cd20f1c 100644 --- a/components/autofill_assistant/browser/actions/configure_bottom_sheet_action_unittest.cc +++ b/components/autofill_assistant/browser/actions/configure_bottom_sheet_action_unittest.cc @@ -8,7 +8,7 @@ #include "base/bind.h" #include "base/callback.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "components/autofill_assistant/browser/actions/mock_action_delegate.h" #include "components/autofill_assistant/browser/web/mock_web_controller.h" diff --git a/components/autofill_assistant/browser/actions/prompt_action_unittest.cc b/components/autofill_assistant/browser/actions/prompt_action_unittest.cc index 59cd19e4b3c0e6..8d8153f0bf1905 100644 --- a/components/autofill_assistant/browser/actions/prompt_action_unittest.cc +++ b/components/autofill_assistant/browser/actions/prompt_action_unittest.cc @@ -8,7 +8,7 @@ #include "base/bind.h" #include "base/callback.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/gmock_callback_support.h" #include "base/test/mock_callback.h" #include "base/test/task_environment.h" diff --git a/components/autofill_assistant/browser/actions/wait_for_document_action_unittest.cc b/components/autofill_assistant/browser/actions/wait_for_document_action_unittest.cc index 666205e1b5b80b..af1e8535d227fb 100644 --- a/components/autofill_assistant/browser/actions/wait_for_document_action_unittest.cc +++ b/components/autofill_assistant/browser/actions/wait_for_document_action_unittest.cc @@ -8,7 +8,7 @@ #include "base/bind.h" #include "base/callback.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/gmock_callback_support.h" #include "base/test/mock_callback.h" #include "base/test/task_environment.h" diff --git a/components/autofill_assistant/browser/controller_unittest.cc b/components/autofill_assistant/browser/controller_unittest.cc index 1cc269b92c5cdf..36a7386362573d 100644 --- a/components/autofill_assistant/browser/controller_unittest.cc +++ b/components/autofill_assistant/browser/controller_unittest.cc @@ -10,7 +10,7 @@ #include "base/bind_helpers.h" #include "base/guid.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/gmock_callback_support.h" #include "base/test/gtest_util.h" #include "base/test/mock_callback.h" diff --git a/components/autofill_assistant/browser/service/lite_service_unittest.cc b/components/autofill_assistant/browser/service/lite_service_unittest.cc index d6e40ec254983c..dfb2517eb589d2 100644 --- a/components/autofill_assistant/browser/service/lite_service_unittest.cc +++ b/components/autofill_assistant/browser/service/lite_service_unittest.cc @@ -17,7 +17,7 @@ #include "base/bind_helpers.h" #include "base/callback.h" #include "base/notreached.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/gmock_callback_support.h" #include "base/test/gtest_util.h" #include "base/test/mock_callback.h" diff --git a/components/autofill_assistant/browser/trigger_scripts/dynamic_trigger_conditions_unittest.cc b/components/autofill_assistant/browser/trigger_scripts/dynamic_trigger_conditions_unittest.cc index cec30b6071e17b..06981f44ba9705 100644 --- a/components/autofill_assistant/browser/trigger_scripts/dynamic_trigger_conditions_unittest.cc +++ b/components/autofill_assistant/browser/trigger_scripts/dynamic_trigger_conditions_unittest.cc @@ -10,7 +10,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/callback.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/gmock_callback_support.h" #include "base/test/gtest_util.h" #include "base/test/mock_callback.h" diff --git a/components/autofill_assistant/browser/web/web_controller_browsertest.cc b/components/autofill_assistant/browser/web/web_controller_browsertest.cc index 249fe16185cae0..b54cd0b66dac3e 100644 --- a/components/autofill_assistant/browser/web/web_controller_browsertest.cc +++ b/components/autofill_assistant/browser/web/web_controller_browsertest.cc @@ -7,7 +7,7 @@ #include "base/bind.h" #include "base/memory/ref_counted.h" #include "base/strings/strcat.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "components/autofill_assistant/browser/client_settings.h" #include "components/autofill_assistant/browser/service.pb.h" #include "components/autofill_assistant/browser/string_conversions_util.h" diff --git a/components/blocked_content/android/popup_blocked_infobar_delegate_unittest.cc b/components/blocked_content/android/popup_blocked_infobar_delegate_unittest.cc index 7c723e7554f0f4..387e6775f52531 100644 --- a/components/blocked_content/android/popup_blocked_infobar_delegate_unittest.cc +++ b/components/blocked_content/android/popup_blocked_infobar_delegate_unittest.cc @@ -5,7 +5,7 @@ #include "components/blocked_content/android/popup_blocked_infobar_delegate.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "components/blocked_content/popup_blocker_tab_helper.h" #include "components/blocked_content/safe_browsing_triggered_popup_blocker.h" diff --git a/components/browsing_data/content/appcache_helper_unittest.cc b/components/browsing_data/content/appcache_helper_unittest.cc index 32e5d6d09fec9d..09d475963b53cf 100644 --- a/components/browsing_data/content/appcache_helper_unittest.cc +++ b/components/browsing_data/content/appcache_helper_unittest.cc @@ -11,7 +11,7 @@ #include "base/macros.h" #include "base/run_loop.h" #include "base/stl_util.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "build/build_config.h" #include "content/public/browser/storage_partition.h" #include "content/public/browser/storage_usage_info.h" diff --git a/components/browsing_data/content/cookie_helper_unittest.cc b/components/browsing_data/content/cookie_helper_unittest.cc index ebd5e6f100e9d3..e88ddba99b197a 100644 --- a/components/browsing_data/content/cookie_helper_unittest.cc +++ b/components/browsing_data/content/cookie_helper_unittest.cc @@ -8,7 +8,7 @@ #include "base/bind_helpers.h" #include "base/optional.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/time/time.h" #include "content/public/browser/cookie_access_details.h" #include "content/public/browser/storage_partition.h" diff --git a/components/browsing_data/content/database_helper_browsertest.cc b/components/browsing_data/content/database_helper_browsertest.cc index bba977e53ecffe..9b371fd8ce5167 100644 --- a/components/browsing_data/content/database_helper_browsertest.cc +++ b/components/browsing_data/content/database_helper_browsertest.cc @@ -9,7 +9,7 @@ #include "base/files/file_util.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "components/browsing_data/content/browsing_data_helper_browsertest.h" #include "components/browsing_data/content/database_helper.h" #include "content/public/browser/browser_context.h" diff --git a/components/browsing_data/content/indexed_db_helper_unittest.cc b/components/browsing_data/content/indexed_db_helper_unittest.cc index af458981884a51..d15f69e93fbf57 100644 --- a/components/browsing_data/content/indexed_db_helper_unittest.cc +++ b/components/browsing_data/content/indexed_db_helper_unittest.cc @@ -6,7 +6,7 @@ #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/threading/thread_task_runner_handle.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/storage_partition.h" diff --git a/components/browsing_data/core/history_notice_utils_unittest.cc b/components/browsing_data/core/history_notice_utils_unittest.cc index 165cf2605e1b41..7d8d1ce83feff4 100644 --- a/components/browsing_data/core/history_notice_utils_unittest.cc +++ b/components/browsing_data/core/history_notice_utils_unittest.cc @@ -8,7 +8,7 @@ #include "base/callback.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "components/history/core/test/fake_web_history_service.h" #include "components/sync/base/model_type.h" diff --git a/components/cast_channel/cast_socket_unittest.cc b/components/cast_channel/cast_socket_unittest.cc index 934039e5ad6acc..0aaea2aa012860 100644 --- a/components/cast_channel/cast_socket_unittest.cc +++ b/components/cast_channel/cast_socket_unittest.cc @@ -21,7 +21,7 @@ #include "base/single_thread_task_runner.h" #include "base/strings/string_number_conversions.h" #include "base/sys_byteorder.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/threading/thread_task_runner_handle.h" #include "base/timer/mock_timer.h" #include "build/build_config.h" diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_service_client_unittest.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_service_client_unittest.cc index cb20b9d6f4ceec..162657f0e0d694 100644 --- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_service_client_unittest.cc +++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_service_client_unittest.cc @@ -15,7 +15,7 @@ #include "base/metrics/field_trial.h" #include "base/run_loop.h" #include "base/stl_util.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/mock_entropy_provider.h" #include "base/test/scoped_feature_list.h" diff --git a/components/download/internal/background_service/in_memory_download_unittest.cc b/components/download/internal/background_service/in_memory_download_unittest.cc index c8d65fcc709489..4064c98307266a 100644 --- a/components/download/internal/background_service/in_memory_download_unittest.cc +++ b/components/download/internal/background_service/in_memory_download_unittest.cc @@ -8,7 +8,7 @@ #include "base/guid.h" #include "base/message_loop/message_pump_type.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/threading/thread.h" #include "net/base/io_buffer.h" diff --git a/components/error_page/content/browser/net_error_auto_reloader_browsertest.cc b/components/error_page/content/browser/net_error_auto_reloader_browsertest.cc index ca3013ad546d73..91d2f26cceb171 100644 --- a/components/error_page/content/browser/net_error_auto_reloader_browsertest.cc +++ b/components/error_page/content/browser/net_error_auto_reloader_browsertest.cc @@ -8,7 +8,7 @@ #include #include "base/optional.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_observer.h" diff --git a/components/favicon/content/content_favicon_driver_unittest.cc b/components/favicon/content/content_favicon_driver_unittest.cc index fd984874830a16..a7ae1b516116f2 100644 --- a/components/favicon/content/content_favicon_driver_unittest.cc +++ b/components/favicon/content/content_favicon_driver_unittest.cc @@ -9,7 +9,7 @@ #include "base/macros.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "components/favicon/core/favicon_client.h" #include "components/favicon/core/favicon_handler.h" diff --git a/components/federated_learning/floc_sorting_lsh_clusters_service_unittest.cc b/components/federated_learning/floc_sorting_lsh_clusters_service_unittest.cc index 456b24891d36b4..20cf503ef31c96 100644 --- a/components/federated_learning/floc_sorting_lsh_clusters_service_unittest.cc +++ b/components/federated_learning/floc_sorting_lsh_clusters_service_unittest.cc @@ -11,7 +11,7 @@ #include "base/files/scoped_temp_dir.h" #include "base/run_loop.h" #include "base/strings/string_number_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/test/test_simple_task_runner.h" #include "components/federated_learning/floc_constants.h" diff --git a/components/feed/core/feed_networking_host_unittest.cc b/components/feed/core/feed_networking_host_unittest.cc index 698713748291fa..da5af8defdc166 100644 --- a/components/feed/core/feed_networking_host_unittest.cc +++ b/components/feed/core/feed_networking_host_unittest.cc @@ -9,7 +9,7 @@ #include "base/bind.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h" #include "base/test/simple_test_tick_clock.h" diff --git a/components/feed/core/v2/feed_network_impl_unittest.cc b/components/feed/core/v2/feed_network_impl_unittest.cc index bddc71c41fd817..c6ad6e97a6ef47 100644 --- a/components/feed/core/v2/feed_network_impl_unittest.cc +++ b/components/feed/core/v2/feed_network_impl_unittest.cc @@ -10,7 +10,7 @@ #include "base/bind.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/simple_test_tick_clock.h" #include "base/test/task_environment.h" diff --git a/components/feed/core/v2/feed_store_unittest.cc b/components/feed/core/v2/feed_store_unittest.cc index db7473c2d585cf..fe2a1ecd19cc58 100644 --- a/components/feed/core/v2/feed_store_unittest.cc +++ b/components/feed/core/v2/feed_store_unittest.cc @@ -11,7 +11,7 @@ #include "base/strings/strcat.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_piece.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "components/feed/core/proto/v2/wire/content_id.pb.h" #include "components/feed/core/v2/protocol_translator.h" diff --git a/components/feed/core/v2/feed_stream_unittest.cc b/components/feed/core/v2/feed_stream_unittest.cc index fd040f123c8eee..746f4794d70946 100644 --- a/components/feed/core/v2/feed_stream_unittest.cc +++ b/components/feed/core/v2/feed_stream_unittest.cc @@ -18,7 +18,7 @@ #include "base/path_service.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h" #include "base/test/scoped_run_loop_timeout.h" diff --git a/components/feed/core/v2/image_fetcher_unittest.cc b/components/feed/core/v2/image_fetcher_unittest.cc index ba2dbe4f548624..185945c7d89d4a 100644 --- a/components/feed/core/v2/image_fetcher_unittest.cc +++ b/components/feed/core/v2/image_fetcher_unittest.cc @@ -10,7 +10,7 @@ #include "base/bind.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/task_environment.h" #include "components/feed/core/v2/public/types.h" diff --git a/components/feedback/feedback_uploader_dispatch_unittest.cc b/components/feedback/feedback_uploader_dispatch_unittest.cc index aa66eef5fe4c83..49b410f38d7dcd 100644 --- a/components/feedback/feedback_uploader_dispatch_unittest.cc +++ b/components/feedback/feedback_uploader_dispatch_unittest.cc @@ -11,7 +11,7 @@ #include "base/run_loop.h" #include "base/task/post_task.h" #include "base/task/task_traits.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "components/feedback/feedback_uploader_factory.h" #include "components/variations/net/variations_http_headers.h" #include "components/variations/variations_associated_data.h" diff --git a/components/games/core/catalog_store_unittest.cc b/components/games/core/catalog_store_unittest.cc index f5ee1213c8fce9..9673bfd04cd2c7 100644 --- a/components/games/core/catalog_store_unittest.cc +++ b/components/games/core/catalog_store_unittest.cc @@ -9,7 +9,7 @@ #include "base/files/file_path.h" #include "base/optional.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "components/games/core/games_types.h" #include "components/games/core/games_utils.h" diff --git a/components/games/core/games_service_impl_unittest.cc b/components/games/core/games_service_impl_unittest.cc index 8bc9958798ceb3..1953e5b25ae492 100644 --- a/components/games/core/games_service_impl_unittest.cc +++ b/components/games/core/games_service_impl_unittest.cc @@ -11,7 +11,7 @@ #include "base/files/file_path.h" #include "base/optional.h" #include "base/strings/string_piece.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "components/games/core/data_files_parser.h" #include "components/games/core/games_prefs.h" diff --git a/components/games/core/highlighted_games_store_unittest.cc b/components/games/core/highlighted_games_store_unittest.cc index b9d81646633c2a..17a778931fe2c5 100644 --- a/components/games/core/highlighted_games_store_unittest.cc +++ b/components/games/core/highlighted_games_store_unittest.cc @@ -9,7 +9,7 @@ #include "base/barrier_closure.h" #include "base/files/file_path.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "components/games/core/games_types.h" #include "components/games/core/games_utils.h" diff --git a/components/gwp_asan/client/guarded_page_allocator_unittest.cc b/components/gwp_asan/client/guarded_page_allocator_unittest.cc index 2161f7ed022e6a..870eacf46bd2bd 100644 --- a/components/gwp_asan/client/guarded_page_allocator_unittest.cc +++ b/components/gwp_asan/client/guarded_page_allocator_unittest.cc @@ -12,7 +12,7 @@ #include "base/bits.h" #include "base/process/process_metrics.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/gtest_util.h" #include "base/threading/simple_thread.h" #include "build/build_config.h" diff --git a/components/heap_profiling/in_process/heap_profiler_controller_unittest.cc b/components/heap_profiling/in_process/heap_profiler_controller_unittest.cc index a3c6c2a44d0a90..eb4c10d2bbcfee 100644 --- a/components/heap_profiling/in_process/heap_profiler_controller_unittest.cc +++ b/components/heap_profiling/in_process/heap_profiler_controller_unittest.cc @@ -5,7 +5,7 @@ #include "components/heap_profiling/in_process/heap_profiler_controller.h" #include "base/sampling_heap_profiler/sampling_heap_profiler.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h" #include "build/build_config.h" diff --git a/components/heap_profiling/multi_process/test_driver.cc b/components/heap_profiling/multi_process/test_driver.cc index 6eaf09d3f4e929..05039765fa0f01 100644 --- a/components/heap_profiling/multi_process/test_driver.cc +++ b/components/heap_profiling/multi_process/test_driver.cc @@ -16,7 +16,7 @@ #include "base/run_loop.h" #include "base/sampling_heap_profiler/poisson_allocation_sampler.h" #include "base/stl_util.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/threading/platform_thread.h" #include "base/trace_event/heap_profiler.h" #include "base/trace_event/heap_profiler_event_filter.h" diff --git a/components/history/core/browser/history_querying_unittest.cc b/components/history/core/browser/history_querying_unittest.cc index e301dd2f498f62..07bb1d4466aa14 100644 --- a/components/history/core/browser/history_querying_unittest.cc +++ b/components/history/core/browser/history_querying_unittest.cc @@ -13,7 +13,7 @@ #include "base/stl_util.h" #include "base/strings/utf_string_conversions.h" #include "base/task/cancelable_task_tracker.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "components/history/core/browser/history_database_params.h" #include "components/history/core/browser/history_service.h" diff --git a/components/history/core/browser/history_service_unittest.cc b/components/history/core/browser/history_service_unittest.cc index 1e8dd39e4a5831..ecf94f6db011c2 100644 --- a/components/history/core/browser/history_service_unittest.cc +++ b/components/history/core/browser/history_service_unittest.cc @@ -34,7 +34,7 @@ #include "base/run_loop.h" #include "base/single_thread_task_runner.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/task_environment.h" #include "base/threading/thread_task_runner_handle.h" diff --git a/components/image_fetcher/core/image_data_fetcher_unittest.cc b/components/image_fetcher/core/image_data_fetcher_unittest.cc index db17f2d2635e5a..e072adb29cadc2 100644 --- a/components/image_fetcher/core/image_data_fetcher_unittest.cc +++ b/components/image_fetcher/core/image_data_fetcher_unittest.cc @@ -12,7 +12,7 @@ #include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/task_environment.h" #include "components/image_fetcher/core/request_metadata.h" diff --git a/components/image_fetcher/core/image_fetcher_impl_unittest.cc b/components/image_fetcher/core/image_fetcher_impl_unittest.cc index 6ddd9b77c6c38c..99c23258cfdef6 100644 --- a/components/image_fetcher/core/image_fetcher_impl_unittest.cc +++ b/components/image_fetcher/core/image_fetcher_impl_unittest.cc @@ -9,7 +9,7 @@ #include "base/bind.h" #include "base/callback.h" #include "base/files/file_path.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/mock_callback.h" #include "base/test/task_environment.h" #include "components/image_fetcher/core/fake_image_decoder.h" diff --git a/components/invalidation/impl/per_user_topic_subscription_request_unittest.cc b/components/invalidation/impl/per_user_topic_subscription_request_unittest.cc index f5860eaf3bb070..65fede7a6d5dba 100644 --- a/components/invalidation/impl/per_user_topic_subscription_request_unittest.cc +++ b/components/invalidation/impl/per_user_topic_subscription_request_unittest.cc @@ -8,7 +8,7 @@ #include "base/memory/ptr_util.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/gtest_util.h" #include "base/test/mock_callback.h" #include "base/test/scoped_feature_list.h" diff --git a/components/metrics/call_stack_profile_builder_unittest.cc b/components/metrics/call_stack_profile_builder_unittest.cc index 752fc567c38570..f3b5578c93a2ad 100644 --- a/components/metrics/call_stack_profile_builder_unittest.cc +++ b/components/metrics/call_stack_profile_builder_unittest.cc @@ -8,7 +8,7 @@ #include "base/files/file_path.h" #include "base/profiler/module_cache.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/mock_callback.h" #include "base/time/time.h" #include "build/build_config.h" diff --git a/components/metrics/net/net_metrics_log_uploader_unittest.cc b/components/metrics/net/net_metrics_log_uploader_unittest.cc index 542f4a2dc492ad..e12be7f7e4fd57 100644 --- a/components/metrics/net/net_metrics_log_uploader_unittest.cc +++ b/components/metrics/net/net_metrics_log_uploader_unittest.cc @@ -8,7 +8,7 @@ #include "base/bind.h" #include "base/macros.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "components/encrypted_messages/encrypted_message.pb.h" #include "services/network/public/cpp/weak_wrapper_shared_url_loader_factory.h" diff --git a/components/net_log/net_log_proxy_source_unittest.cc b/components/net_log/net_log_proxy_source_unittest.cc index 9e51088b74e31a..9ce7a1a8d2465a 100644 --- a/components/net_log/net_log_proxy_source_unittest.cc +++ b/components/net_log/net_log_proxy_source_unittest.cc @@ -6,7 +6,7 @@ #include "base/run_loop.h" #include "base/synchronization/lock.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "net/log/net_log.h" #include "net/log/net_log_with_source.h" diff --git a/components/offline_items_collection/core/offline_content_aggregator_unittest.cc b/components/offline_items_collection/core/offline_content_aggregator_unittest.cc index 60a970e3fedb41..964a4fd3e442ac 100644 --- a/components/offline_items_collection/core/offline_content_aggregator_unittest.cc +++ b/components/offline_items_collection/core/offline_content_aggregator_unittest.cc @@ -7,7 +7,7 @@ #include #include "base/bind.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/test_mock_time_task_runner.h" #include "base/threading/thread_task_runner_handle.h" #include "components/offline_items_collection/core/offline_item.h" diff --git a/components/offline_pages/core/background/request_coordinator_unittest.cc b/components/offline_pages/core/background/request_coordinator_unittest.cc index eb387b6d8bb9d9..a8807b051eb0e0 100644 --- a/components/offline_pages/core/background/request_coordinator_unittest.cc +++ b/components/offline_pages/core/background/request_coordinator_unittest.cc @@ -15,7 +15,7 @@ #include "base/location.h" #include "base/synchronization/waitable_event.h" #include "base/system/sys_info.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/test_mock_time_task_runner.h" #include "base/threading/thread_task_runner_handle.h" diff --git a/components/offline_pages/core/downloads/download_ui_adapter_unittest.cc b/components/offline_pages/core/downloads/download_ui_adapter_unittest.cc index 4cef6a87c561d4..b79ec655370e36 100644 --- a/components/offline_pages/core/downloads/download_ui_adapter_unittest.cc +++ b/components/offline_pages/core/downloads/download_ui_adapter_unittest.cc @@ -20,7 +20,7 @@ #include "base/single_thread_task_runner.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/mock_callback.h" #include "base/test/test_mock_time_task_runner.h" diff --git a/components/offline_pages/core/model/cleanup_visuals_task_unittest.cc b/components/offline_pages/core/model/cleanup_visuals_task_unittest.cc index a84197ad3a413d..743f9529e9dcc9 100644 --- a/components/offline_pages/core/model/cleanup_visuals_task_unittest.cc +++ b/components/offline_pages/core/model/cleanup_visuals_task_unittest.cc @@ -7,7 +7,7 @@ #include #include "base/bind_helpers.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/mock_callback.h" #include "components/offline_pages/core/model/get_visuals_task.h" diff --git a/components/offline_pages/core/model/get_visuals_task_unittest.cc b/components/offline_pages/core/model/get_visuals_task_unittest.cc index c39494130d5138..d73672771ee920 100644 --- a/components/offline_pages/core/model/get_visuals_task_unittest.cc +++ b/components/offline_pages/core/model/get_visuals_task_unittest.cc @@ -8,7 +8,7 @@ #include "base/bind_helpers.h" #include "base/files/scoped_temp_dir.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/mock_callback.h" #include "components/offline_pages/core/model/model_task_test_base.h" #include "components/offline_pages/core/model/offline_page_item_generator.h" diff --git a/components/offline_pages/core/model/offline_page_model_taskified_unittest.cc b/components/offline_pages/core/model/offline_page_model_taskified_unittest.cc index 8d412abb135a2c..f040194618506a 100644 --- a/components/offline_pages/core/model/offline_page_model_taskified_unittest.cc +++ b/components/offline_pages/core/model/offline_page_model_taskified_unittest.cc @@ -12,7 +12,7 @@ #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/mock_callback.h" #include "base/test/task_environment.h" diff --git a/components/offline_pages/core/model/store_visuals_task_unittest.cc b/components/offline_pages/core/model/store_visuals_task_unittest.cc index bc1a6454979ece..1c683e1381bd43 100644 --- a/components/offline_pages/core/model/store_visuals_task_unittest.cc +++ b/components/offline_pages/core/model/store_visuals_task_unittest.cc @@ -6,7 +6,7 @@ #include -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/mock_callback.h" #include "components/offline_pages/core/model/get_visuals_task.h" #include "components/offline_pages/core/model/model_task_test_base.h" diff --git a/components/offline_pages/core/model/visuals_availability_task_unittest.cc b/components/offline_pages/core/model/visuals_availability_task_unittest.cc index c3a3604d9238d7..378ea313dabd02 100644 --- a/components/offline_pages/core/model/visuals_availability_task_unittest.cc +++ b/components/offline_pages/core/model/visuals_availability_task_unittest.cc @@ -7,7 +7,7 @@ #include #include "base/bind_helpers.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/mock_callback.h" #include "components/offline_pages/core/model/model_task_test_base.h" #include "components/offline_pages/core/model/store_visuals_task.h" diff --git a/components/offline_pages/core/offline_page_metadata_store_test_util.cc b/components/offline_pages/core/offline_page_metadata_store_test_util.cc index 59c2502d32b7ea..fcb7ab151f3286 100644 --- a/components/offline_pages/core/offline_page_metadata_store_test_util.cc +++ b/components/offline_pages/core/offline_page_metadata_store_test_util.cc @@ -12,7 +12,7 @@ #include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/threading/thread_task_runner_handle.h" #include "components/offline_pages/core/model/add_page_task.h" #include "components/offline_pages/core/model/get_pages_task.h" diff --git a/components/offline_pages/core/offline_page_metadata_store_unittest.cc b/components/offline_pages/core/offline_page_metadata_store_unittest.cc index af2a877b8fda9d..43d34eb24136fc 100644 --- a/components/offline_pages/core/offline_page_metadata_store_unittest.cc +++ b/components/offline_pages/core/offline_page_metadata_store_unittest.cc @@ -16,7 +16,7 @@ #include "base/memory/ref_counted.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/test_mock_time_task_runner.h" #include "base/threading/thread_task_runner_handle.h" #include "components/offline_pages/core/client_namespace_constants.h" diff --git a/components/offline_pages/core/prefetch/prefetch_dispatcher_impl_unittest.cc b/components/offline_pages/core/prefetch/prefetch_dispatcher_impl_unittest.cc index 5dc8dfa207fef0..7849c6c29f1139 100644 --- a/components/offline_pages/core/prefetch/prefetch_dispatcher_impl_unittest.cc +++ b/components/offline_pages/core/prefetch/prefetch_dispatcher_impl_unittest.cc @@ -15,7 +15,7 @@ #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" #include "base/task/current_thread.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/threading/thread_task_runner_handle.h" #include "base/time/time.h" diff --git a/components/offline_pages/core/prefetch/prefetch_request_test_base.cc b/components/offline_pages/core/prefetch/prefetch_request_test_base.cc index 90648315c2ec7a..66c2aeb1fcf986 100644 --- a/components/offline_pages/core/prefetch/prefetch_request_test_base.cc +++ b/components/offline_pages/core/prefetch/prefetch_request_test_base.cc @@ -8,7 +8,7 @@ #include "base/feature_list.h" #include "base/metrics/field_trial_params.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/mock_entropy_provider.h" #include "base/test/task_environment.h" #include "components/offline_pages/core/offline_page_feature.h" diff --git a/components/offline_pages/core/prefetch/store/prefetch_store_test_util.cc b/components/offline_pages/core/prefetch/store/prefetch_store_test_util.cc index 22e4f3fbf2ee17..76a46f04900dbb 100644 --- a/components/offline_pages/core/prefetch/store/prefetch_store_test_util.cc +++ b/components/offline_pages/core/prefetch/store/prefetch_store_test_util.cc @@ -9,7 +9,7 @@ #include "base/memory/scoped_refptr.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/simple_test_clock.h" #include "base/threading/thread_task_runner_handle.h" #include "base/time/clock.h" diff --git a/components/offline_pages/core/prefetch/test_download_service.cc b/components/offline_pages/core/prefetch/test_download_service.cc index d468d146051097..5ae7f988191d31 100644 --- a/components/offline_pages/core/prefetch/test_download_service.cc +++ b/components/offline_pages/core/prefetch/test_download_service.cc @@ -9,7 +9,7 @@ #include "base/files/file_util.h" #include "base/strings/strcat.h" #include "base/strings/string_number_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/threading/thread_task_runner_handle.h" #include "components/download/public/background_service/download_metadata.h" #include "components/download/public/background_service/service_config.h" diff --git a/components/omnibox/browser/document_suggestions_service_unittest.cc b/components/omnibox/browser/document_suggestions_service_unittest.cc index a0a570d9dcb27e..84db799577d5a8 100644 --- a/components/omnibox/browser/document_suggestions_service_unittest.cc +++ b/components/omnibox/browser/document_suggestions_service_unittest.cc @@ -10,7 +10,7 @@ #include "base/run_loop.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "components/signin/public/identity_manager/identity_test_environment.h" #include "components/sync_preferences/testing_pref_service_syncable.h" diff --git a/components/omnibox/browser/history_url_provider_unittest.cc b/components/omnibox/browser/history_url_provider_unittest.cc index 72b34b531cf85a..b7bb1c6bb793e8 100644 --- a/components/omnibox/browser/history_url_provider_unittest.cc +++ b/components/omnibox/browser/history_url_provider_unittest.cc @@ -16,7 +16,7 @@ #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h" #include "base/time/time.h" diff --git a/components/omnibox/browser/remote_suggestions_service_unittest.cc b/components/omnibox/browser/remote_suggestions_service_unittest.cc index 69882c9613d8dc..56f474782c5c19 100644 --- a/components/omnibox/browser/remote_suggestions_service_unittest.cc +++ b/components/omnibox/browser/remote_suggestions_service_unittest.cc @@ -9,7 +9,7 @@ #include "base/bind.h" #include "base/memory/scoped_refptr.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/test_mock_time_task_runner.h" #include "components/omnibox/common/omnibox_features.h" #include "components/search_engines/template_url_service.h" diff --git a/components/password_manager/core/browser/android_affiliation/affiliation_fetcher_unittest.cc b/components/password_manager/core/browser/android_affiliation/affiliation_fetcher_unittest.cc index a82165f1df52cb..3ea45ef34ef2ec 100644 --- a/components/password_manager/core/browser/android_affiliation/affiliation_fetcher_unittest.cc +++ b/components/password_manager/core/browser/android_affiliation/affiliation_fetcher_unittest.cc @@ -9,7 +9,7 @@ #include #include "base/macros.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/gmock_move_support.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/null_task_runner.h" diff --git a/components/password_manager/core/browser/generation/password_requirements_spec_fetcher_unittest.cc b/components/password_manager/core/browser/generation/password_requirements_spec_fetcher_unittest.cc index c28087279dc397..d12247f9da2718 100644 --- a/components/password_manager/core/browser/generation/password_requirements_spec_fetcher_unittest.cc +++ b/components/password_manager/core/browser/generation/password_requirements_spec_fetcher_unittest.cc @@ -4,7 +4,7 @@ #include "components/password_manager/core/browser/generation/password_requirements_spec_fetcher_impl.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/task_environment.h" #include "components/autofill/core/browser/proto/password_requirements.pb.h" diff --git a/components/password_manager/core/browser/http_credentials_cleaner_unittest.cc b/components/password_manager/core/browser/http_credentials_cleaner_unittest.cc index 0dd8a3b86bd8b0..1a2944fc446330 100644 --- a/components/password_manager/core/browser/http_credentials_cleaner_unittest.cc +++ b/components/password_manager/core/browser/http_credentials_cleaner_unittest.cc @@ -8,7 +8,7 @@ #include "base/run_loop.h" #include "base/stl_util.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/task_environment.h" #include "base/time/time.h" diff --git a/components/password_manager/core/browser/password_requirements_service_unittest.cc b/components/password_manager/core/browser/password_requirements_service_unittest.cc index ab39092175368d..b51ce0a513373d 100644 --- a/components/password_manager/core/browser/password_requirements_service_unittest.cc +++ b/components/password_manager/core/browser/password_requirements_service_unittest.cc @@ -6,7 +6,7 @@ #include -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "components/autofill/core/browser/proto/password_requirements.pb.h" #include "components/autofill/core/common/signatures.h" #include "components/password_manager/core/browser/generation/password_requirements_spec_fetcher.h" diff --git a/components/password_manager/core/browser/sync/password_sync_bridge_unittest.cc b/components/password_manager/core/browser/sync/password_sync_bridge_unittest.cc index 7a1b94a377d3f9..b6fbbdd9f3d0f1 100644 --- a/components/password_manager/core/browser/sync/password_sync_bridge_unittest.cc +++ b/components/password_manager/core/browser/sync/password_sync_bridge_unittest.cc @@ -11,7 +11,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/mock_callback.h" #include "build/build_config.h" diff --git a/components/performance_manager/decorators/decorators_utils_unittest.cc b/components/performance_manager/decorators/decorators_utils_unittest.cc index c65db07fe2cc6d..f494a86a84db4a 100644 --- a/components/performance_manager/decorators/decorators_utils_unittest.cc +++ b/components/performance_manager/decorators/decorators_utils_unittest.cc @@ -6,7 +6,7 @@ #include -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "components/performance_manager/graph/node_attached_data_impl.h" #include "components/performance_manager/test_support/performance_manager_test_harness.h" #include "content/public/browser/web_contents.h" diff --git a/components/performance_manager/decorators/site_data_recorder_unittest.cc b/components/performance_manager/decorators/site_data_recorder_unittest.cc index 98702e07e4aab2..854d875055b15a 100644 --- a/components/performance_manager/decorators/site_data_recorder_unittest.cc +++ b/components/performance_manager/decorators/site_data_recorder_unittest.cc @@ -10,7 +10,7 @@ #include "base/location.h" #include "base/run_loop.h" #include "base/task/post_task.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/threading/sequence_bound.h" #include "components/performance_manager/graph/page_node_impl.h" #include "components/performance_manager/persistence/site_data/site_data_cache.h" diff --git a/components/performance_manager/graph/policies/process_priority_policy_unittest.cc b/components/performance_manager/graph/policies/process_priority_policy_unittest.cc index aff325ea4f9fb1..444d6df9e19719 100644 --- a/components/performance_manager/graph/policies/process_priority_policy_unittest.cc +++ b/components/performance_manager/graph/policies/process_priority_policy_unittest.cc @@ -7,7 +7,7 @@ #include #include -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/threading/sequenced_task_runner_handle.h" #include "components/performance_manager/graph/process_node_impl.h" #include "components/performance_manager/public/performance_manager.h" diff --git a/components/performance_manager/graph/policies/tab_loading_frame_navigation_policy_unittest.cc b/components/performance_manager/graph/policies/tab_loading_frame_navigation_policy_unittest.cc index 69c5239389b4e9..106027b43fd9be 100644 --- a/components/performance_manager/graph/policies/tab_loading_frame_navigation_policy_unittest.cc +++ b/components/performance_manager/graph/policies/tab_loading_frame_navigation_policy_unittest.cc @@ -6,7 +6,7 @@ #include "base/bind.h" #include "base/task/task_traits.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h" #include "components/performance_manager/performance_manager_tab_helper.h" diff --git a/components/performance_manager/graph/process_node_impl_unittest.cc b/components/performance_manager/graph/process_node_impl_unittest.cc index a83974a200a781..092fbab6a9be2c 100644 --- a/components/performance_manager/graph/process_node_impl_unittest.cc +++ b/components/performance_manager/graph/process_node_impl_unittest.cc @@ -5,7 +5,7 @@ #include "components/performance_manager/graph/process_node_impl.h" #include "base/process/process.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "components/performance_manager/graph/frame_node_impl.h" #include "components/performance_manager/public/render_process_host_id.h" #include "components/performance_manager/public/render_process_host_proxy.h" diff --git a/components/performance_manager/mechanisms/tab_loading_frame_navigation_scheduler_browsertest.cc b/components/performance_manager/mechanisms/tab_loading_frame_navigation_scheduler_browsertest.cc index 1be9f3299074cc..bd25fcb6296fcd 100644 --- a/components/performance_manager/mechanisms/tab_loading_frame_navigation_scheduler_browsertest.cc +++ b/components/performance_manager/mechanisms/tab_loading_frame_navigation_scheduler_browsertest.cc @@ -6,7 +6,7 @@ #include "base/bind.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "components/performance_manager/performance_manager_registry_impl.h" #include "components/performance_manager/test_support/performance_manager_browsertest_harness.h" #include "content/public/browser/browser_thread.h" diff --git a/components/performance_manager/mechanisms/tab_loading_frame_navigation_scheduler_unittest.cc b/components/performance_manager/mechanisms/tab_loading_frame_navigation_scheduler_unittest.cc index 25b8ed80d89995..d76ed071a5ccb9 100644 --- a/components/performance_manager/mechanisms/tab_loading_frame_navigation_scheduler_unittest.cc +++ b/components/performance_manager/mechanisms/tab_loading_frame_navigation_scheduler_unittest.cc @@ -7,7 +7,7 @@ #include #include -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "components/performance_manager/test_support/performance_manager_test_harness.h" #include "content/public/browser/navigation_handle.h" #include "content/public/browser/navigation_throttle.h" diff --git a/components/performance_manager/performance_manager_browsertest.cc b/components/performance_manager/performance_manager_browsertest.cc index 0f4d18895ea5ce..2c8fcc06ea4e1f 100644 --- a/components/performance_manager/performance_manager_browsertest.cc +++ b/components/performance_manager/performance_manager_browsertest.cc @@ -7,7 +7,7 @@ #include #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "components/performance_manager/public/graph/frame_node.h" #include "components/performance_manager/public/graph/page_node.h" #include "components/performance_manager/public/render_frame_host_proxy.h" diff --git a/components/performance_manager/performance_manager_impl_unittest.cc b/components/performance_manager/performance_manager_impl_unittest.cc index 00fba995bd13af..6c4a22979ac22c 100644 --- a/components/performance_manager/performance_manager_impl_unittest.cc +++ b/components/performance_manager/performance_manager_impl_unittest.cc @@ -9,7 +9,7 @@ #include "base/bind_helpers.h" #include "base/callback.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "components/performance_manager/graph/frame_node_impl.h" #include "components/performance_manager/graph/page_node_impl.h" diff --git a/components/performance_manager/performance_manager_tab_helper_unittest.cc b/components/performance_manager/performance_manager_tab_helper_unittest.cc index 1765ae4a38fc6d..d719633dc94b86 100644 --- a/components/performance_manager/performance_manager_tab_helper_unittest.cc +++ b/components/performance_manager/performance_manager_tab_helper_unittest.cc @@ -9,7 +9,7 @@ #include "base/run_loop.h" #include "base/stl_util.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "components/performance_manager/graph/frame_node_impl.h" #include "components/performance_manager/graph/graph_impl_operations.h" #include "components/performance_manager/graph/page_node_impl.h" diff --git a/components/performance_manager/performance_manager_unittest.cc b/components/performance_manager/performance_manager_unittest.cc index 9b7120f7be7f5e..382bd52990816d 100644 --- a/components/performance_manager/performance_manager_unittest.cc +++ b/components/performance_manager/performance_manager_unittest.cc @@ -7,7 +7,7 @@ #include #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "components/performance_manager/public/graph/frame_node.h" #include "components/performance_manager/public/graph/page_node.h" #include "components/performance_manager/public/graph/process_node.h" diff --git a/components/performance_manager/persistence/site_data/leveldb_site_data_store_unittest.cc b/components/performance_manager/persistence/site_data/leveldb_site_data_store_unittest.cc index 081d8a8164142b..1c625d9d1683dd 100644 --- a/components/performance_manager/persistence/site_data/leveldb_site_data_store_unittest.cc +++ b/components/performance_manager/persistence/site_data/leveldb_site_data_store_unittest.cc @@ -11,7 +11,7 @@ #include "base/files/scoped_temp_dir.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/task_environment.h" #include "base/test/test_file_util.h" diff --git a/components/performance_manager/persistence/site_data/site_data_cache_factory_unittest.cc b/components/performance_manager/persistence/site_data/site_data_cache_factory_unittest.cc index 9c66091dd9c6fd..dc98bd15815cb0 100644 --- a/components/performance_manager/persistence/site_data/site_data_cache_factory_unittest.cc +++ b/components/performance_manager/persistence/site_data/site_data_cache_factory_unittest.cc @@ -13,7 +13,7 @@ #include "base/run_loop.h" #include "base/sequenced_task_runner.h" #include "base/task/post_task.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/threading/sequence_bound.h" #include "components/performance_manager/performance_manager_impl.h" #include "content/public/test/browser_task_environment.h" diff --git a/components/performance_manager/persistence/site_data/site_data_impl_unittest.cc b/components/performance_manager/persistence/site_data/site_data_impl_unittest.cc index f762bf27edafa4..90edb917b27b16 100644 --- a/components/performance_manager/persistence/site_data/site_data_impl_unittest.cc +++ b/components/performance_manager/persistence/site_data/site_data_impl_unittest.cc @@ -7,7 +7,7 @@ #include "base/callback.h" #include "base/macros.h" #include "base/memory/ref_counted.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "components/performance_manager/persistence/site_data/unittest_utils.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/components/performance_manager/persistence/site_data/site_data_reader_unittest.cc b/components/performance_manager/persistence/site_data/site_data_reader_unittest.cc index f308f179c2c190..7145a122c999c7 100644 --- a/components/performance_manager/persistence/site_data/site_data_reader_unittest.cc +++ b/components/performance_manager/persistence/site_data/site_data_reader_unittest.cc @@ -11,7 +11,7 @@ #include "base/location.h" #include "base/macros.h" #include "base/memory/ptr_util.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "components/performance_manager/persistence/site_data/site_data_impl.h" #include "components/performance_manager/persistence/site_data/unittest_utils.h" diff --git a/components/performance_manager/render_process_host_proxy_browsertest.cc b/components/performance_manager/render_process_host_proxy_browsertest.cc index 5db44b61eeac52..ede2ea0afa5d7a 100644 --- a/components/performance_manager/render_process_host_proxy_browsertest.cc +++ b/components/performance_manager/render_process_host_proxy_browsertest.cc @@ -9,7 +9,7 @@ #include "base/process/process.h" #include "base/run_loop.h" #include "base/task/task_traits.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "components/performance_manager/graph/process_node_impl.h" #include "components/performance_manager/performance_manager_impl.h" #include "components/performance_manager/render_process_user_data.h" diff --git a/components/performance_manager/test_support/decorators_utils.h b/components/performance_manager/test_support/decorators_utils.h index 9610f1a7d60fdf..2b0a1ecaa0fb01 100644 --- a/components/performance_manager/test_support/decorators_utils.h +++ b/components/performance_manager/test_support/decorators_utils.h @@ -8,7 +8,7 @@ #include #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "components/performance_manager/public/graph/graph.h" #include "components/performance_manager/public/graph/page_node.h" #include "components/performance_manager/public/performance_manager.h" diff --git a/components/performance_manager/test_support/performance_manager_browsertest_harness.h b/components/performance_manager/test_support/performance_manager_browsertest_harness.h index 2ce7df2043110b..8df13455b9430c 100644 --- a/components/performance_manager/test_support/performance_manager_browsertest_harness.h +++ b/components/performance_manager/test_support/performance_manager_browsertest_harness.h @@ -6,7 +6,7 @@ #define COMPONENTS_PERFORMANCE_MANAGER_TEST_SUPPORT_PERFORMANCE_MANAGER_BROWSERTEST_HARNESS_H_ #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "components/performance_manager/public/performance_manager.h" #include "content/public/test/content_browser_test.h" diff --git a/components/performance_manager/v8_memory/v8_detailed_memory_unittest.cc b/components/performance_manager/v8_memory/v8_detailed_memory_unittest.cc index f2a3a5b72f6acb..199e278190f318 100644 --- a/components/performance_manager/v8_memory/v8_detailed_memory_unittest.cc +++ b/components/performance_manager/v8_memory/v8_detailed_memory_unittest.cc @@ -15,7 +15,7 @@ #include "base/memory/weak_ptr.h" #include "base/run_loop.h" #include "base/single_thread_task_runner.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/gtest_util.h" #include "base/time/time.h" #include "components/performance_manager/graph/frame_node_impl.h" diff --git a/components/performance_manager/v8_memory/v8_memory_test_helpers.cc b/components/performance_manager/v8_memory/v8_memory_test_helpers.cc index d6603363dd257a..96759c56bbd11e 100644 --- a/components/performance_manager/v8_memory/v8_memory_test_helpers.cc +++ b/components/performance_manager/v8_memory/v8_memory_test_helpers.cc @@ -10,7 +10,7 @@ #include "base/callback.h" #include "base/command_line.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "components/performance_manager/public/performance_manager.h" #include "content/public/browser/render_process_host.h" diff --git a/components/performance_manager/v8_memory/web_memory_aggregator_unittest.cc b/components/performance_manager/v8_memory/web_memory_aggregator_unittest.cc index 3880a519411386..70530bc798949d 100644 --- a/components/performance_manager/v8_memory/web_memory_aggregator_unittest.cc +++ b/components/performance_manager/v8_memory/web_memory_aggregator_unittest.cc @@ -10,7 +10,7 @@ #include "base/containers/flat_map.h" #include "base/memory/weak_ptr.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "components/performance_manager/graph/frame_node_impl.h" #include "components/performance_manager/graph/page_node_impl.h" diff --git a/components/performance_manager/web_contents_proxy_unittest.cc b/components/performance_manager/web_contents_proxy_unittest.cc index b1ac9dbfb144ea..6e061e4386e52c 100644 --- a/components/performance_manager/web_contents_proxy_unittest.cc +++ b/components/performance_manager/web_contents_proxy_unittest.cc @@ -9,7 +9,7 @@ #include "base/run_loop.h" #include "base/task/task_traits.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "components/performance_manager/graph/page_node_impl.h" #include "components/performance_manager/performance_manager_impl.h" #include "components/performance_manager/performance_manager_tab_helper.h" diff --git a/components/performance_manager/worker_watcher_unittest.cc b/components/performance_manager/worker_watcher_unittest.cc index cd801cc953274e..f4193ce20a1c10 100644 --- a/components/performance_manager/worker_watcher_unittest.cc +++ b/components/performance_manager/worker_watcher_unittest.cc @@ -15,7 +15,7 @@ #include "base/run_loop.h" #include "base/stl_util.h" #include "base/strings/stringprintf.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h" #include "components/performance_manager/frame_node_source.h" diff --git a/components/policy/core/common/cloud/cloud_policy_client_unittest.cc b/components/policy/core/common/cloud/cloud_policy_client_unittest.cc index 9120d80f91ceb7..6c429399243b20 100644 --- a/components/policy/core/common/cloud/cloud_policy_client_unittest.cc +++ b/components/policy/core/common/cloud/cloud_policy_client_unittest.cc @@ -18,7 +18,7 @@ #include "base/memory/ref_counted.h" #include "base/run_loop.h" #include "base/stl_util.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/values.h" #include "build/build_config.h" diff --git a/components/prefs/pref_test_utils.cc b/components/prefs/pref_test_utils.cc index 8c83aaf32af557..8f7bcd8ed5d49d 100644 --- a/components/prefs/pref_test_utils.cc +++ b/components/prefs/pref_test_utils.cc @@ -5,7 +5,7 @@ #include "components/prefs/pref_test_utils.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/values.h" #include "components/prefs/pref_change_registrar.h" #include "components/prefs/pref_service.h" diff --git a/components/query_tiles/internal/tile_fetcher_unittest.cc b/components/query_tiles/internal/tile_fetcher_unittest.cc index 74424b055e4eb1..f662a6fc441a4d 100644 --- a/components/query_tiles/internal/tile_fetcher_unittest.cc +++ b/components/query_tiles/internal/tile_fetcher_unittest.cc @@ -4,7 +4,7 @@ #include "components/query_tiles/internal/tile_fetcher.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "net/http/http_status_code.h" #include "services/network/public/cpp/weak_wrapper_shared_url_loader_factory.h" diff --git a/components/query_tiles/internal/tile_service_impl_unittest.cc b/components/query_tiles/internal/tile_service_impl_unittest.cc index ffbcddbe11ac3b..9870875ac53ac7 100644 --- a/components/query_tiles/internal/tile_service_impl_unittest.cc +++ b/components/query_tiles/internal/tile_service_impl_unittest.cc @@ -11,7 +11,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/simple_test_clock.h" #include "base/test/task_environment.h" #include "base/threading/thread_task_runner_handle.h" diff --git a/components/safe_browsing/content/password_protection/password_protection_navigation_throttle_unittest.cc b/components/safe_browsing/content/password_protection/password_protection_navigation_throttle_unittest.cc index cdf706cabb6374..509dd203788391 100644 --- a/components/safe_browsing/content/password_protection/password_protection_navigation_throttle_unittest.cc +++ b/components/safe_browsing/content/password_protection/password_protection_navigation_throttle_unittest.cc @@ -6,7 +6,7 @@ #include -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "components/safe_browsing/content/password_protection/mock_password_protection_service.h" #include "components/safe_browsing/content/password_protection/password_protection_request.h" #include "content/public/browser/navigation_handle.h" diff --git a/components/safe_browsing/content/renderer/phishing_classifier/scorer_unittest.cc b/components/safe_browsing/content/renderer/phishing_classifier/scorer_unittest.cc index d7d31f19656569..3b9ae0cd3c4706 100644 --- a/components/safe_browsing/content/renderer/phishing_classifier/scorer_unittest.cc +++ b/components/safe_browsing/content/renderer/phishing_classifier/scorer_unittest.cc @@ -13,7 +13,7 @@ #include "base/files/scoped_temp_dir.h" #include "base/format_macros.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/test/test_discardable_memory_allocator.h" #include "base/threading/thread.h" diff --git a/components/safe_browsing/core/db/database_manager_unittest.cc b/components/safe_browsing/core/db/database_manager_unittest.cc index 495ffde43662ae..a10406e3d4608a 100644 --- a/components/safe_browsing/core/db/database_manager_unittest.cc +++ b/components/safe_browsing/core/db/database_manager_unittest.cc @@ -17,7 +17,7 @@ #include "base/run_loop.h" #include "base/single_thread_task_runner.h" #include "base/synchronization/waitable_event.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/threading/thread_task_runner_handle.h" #include "components/safe_browsing/core/common/test_task_environment.h" #include "components/safe_browsing/core/db/test_database_manager.h" diff --git a/components/schema_org/extractor_fuzzer.cc b/components/schema_org/extractor_fuzzer.cc index 239fb0e0a04b29..fe7713b29c7ba9 100644 --- a/components/schema_org/extractor_fuzzer.cc +++ b/components/schema_org/extractor_fuzzer.cc @@ -7,7 +7,7 @@ #include "base/run_loop.h" #include "base/task/single_thread_task_executor.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "components/schema_org/common/improved_metadata.mojom.h" #include "components/schema_org/extractor.h" #include "components/schema_org/schema_org_entity_names.h" diff --git a/components/schema_org/extractor_unittest.cc b/components/schema_org/extractor_unittest.cc index f0f4013757d750..1825c2e75b0c38 100644 --- a/components/schema_org/extractor_unittest.cc +++ b/components/schema_org/extractor_unittest.cc @@ -10,7 +10,7 @@ #include "base/run_loop.h" #include "base/strings/string_number_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "components/schema_org/common/improved_metadata.mojom.h" #include "components/schema_org/schema_org_entity_names.h" diff --git a/components/services/filesystem/directory_test_helper.cc b/components/services/filesystem/directory_test_helper.cc index 4e878532aa39be..967a3752c44f3f 100644 --- a/components/services/filesystem/directory_test_helper.cc +++ b/components/services/filesystem/directory_test_helper.cc @@ -12,7 +12,7 @@ #include "base/macros.h" #include "base/task/post_task.h" #include "base/task/thread_pool.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "components/services/filesystem/directory_impl.h" #include "components/services/filesystem/lock_table.h" #include "components/services/filesystem/public/mojom/directory.mojom.h" diff --git a/components/services/storage/dom_storage/dom_storage_database_unittest.cc b/components/services/storage/dom_storage/dom_storage_database_unittest.cc index 79c88265011c1f..0c4c3bb16e6a3e 100644 --- a/components/services/storage/dom_storage/dom_storage_database_unittest.cc +++ b/components/services/storage/dom_storage/dom_storage_database_unittest.cc @@ -15,7 +15,7 @@ #include "base/strings/string_piece.h" #include "base/task/post_task.h" #include "base/task/thread_pool.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/components/services/storage/dom_storage/local_storage_impl_unittest.cc b/components/services/storage/dom_storage/local_storage_impl_unittest.cc index 928390206a109e..f64ee1bb67b9de 100644 --- a/components/services/storage/dom_storage/local_storage_impl_unittest.cc +++ b/components/services/storage/dom_storage/local_storage_impl_unittest.cc @@ -14,7 +14,7 @@ #include "base/sequenced_task_runner.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "build/build_config.h" #include "components/services/storage/dom_storage/legacy_dom_storage_database.h" diff --git a/components/services/storage/dom_storage/session_storage_area_impl_unittest.cc b/components/services/storage/dom_storage/session_storage_area_impl_unittest.cc index ba3abadf525599..a45626e50f1514 100644 --- a/components/services/storage/dom_storage/session_storage_area_impl_unittest.cc +++ b/components/services/storage/dom_storage/session_storage_area_impl_unittest.cc @@ -14,7 +14,7 @@ #include "base/sequenced_task_runner.h" #include "base/task/post_task.h" #include "base/task/thread_pool.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/gmock_callback_support.h" #include "base/test/task_environment.h" #include "base/threading/thread.h" diff --git a/components/services/storage/dom_storage/session_storage_data_map_unittest.cc b/components/services/storage/dom_storage/session_storage_data_map_unittest.cc index 992ee8ecc1618d..f658e6d1518881 100644 --- a/components/services/storage/dom_storage/session_storage_data_map_unittest.cc +++ b/components/services/storage/dom_storage/session_storage_data_map_unittest.cc @@ -13,7 +13,7 @@ #include "base/run_loop.h" #include "base/task/post_task.h" #include "base/task/thread_pool.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "components/services/storage/dom_storage/async_dom_storage_database.h" #include "components/services/storage/dom_storage/dom_storage_database.h" diff --git a/components/services/storage/dom_storage/session_storage_impl_unittest.cc b/components/services/storage/dom_storage/session_storage_impl_unittest.cc index e8f24b42eadcfb..7430d524a624d2 100644 --- a/components/services/storage/dom_storage/session_storage_impl_unittest.cc +++ b/components/services/storage/dom_storage/session_storage_impl_unittest.cc @@ -21,7 +21,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/task/post_task.h" #include "base/task/thread_pool.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "components/services/storage/dom_storage/legacy_dom_storage_database.h" #include "components/services/storage/dom_storage/storage_area_test_util.h" diff --git a/components/services/storage/dom_storage/session_storage_metadata_unittest.cc b/components/services/storage/dom_storage/session_storage_metadata_unittest.cc index 6e4502c50fab6b..c714338581a2b8 100644 --- a/components/services/storage/dom_storage/session_storage_metadata_unittest.cc +++ b/components/services/storage/dom_storage/session_storage_metadata_unittest.cc @@ -14,7 +14,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/task/post_task.h" #include "base/task/thread_pool.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/threading/thread_task_runner_handle.h" #include "components/services/storage/dom_storage/async_dom_storage_database.h" diff --git a/components/services/storage/dom_storage/session_storage_namespace_impl_unittest.cc b/components/services/storage/dom_storage/session_storage_namespace_impl_unittest.cc index 6fe3343c5c1111..926a6dbdccd2c7 100644 --- a/components/services/storage/dom_storage/session_storage_namespace_impl_unittest.cc +++ b/components/services/storage/dom_storage/session_storage_namespace_impl_unittest.cc @@ -12,7 +12,7 @@ #include "base/run_loop.h" #include "base/task/post_task.h" #include "base/task/thread_pool.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/gmock_callback_support.h" #include "base/test/task_environment.h" #include "components/services/storage/dom_storage/async_dom_storage_database.h" diff --git a/components/services/storage/dom_storage/storage_area_impl_unittest.cc b/components/services/storage/dom_storage/storage_area_impl_unittest.cc index cb2e6997a41bd6..e2f590e0e49a50 100644 --- a/components/services/storage/dom_storage/storage_area_impl_unittest.cc +++ b/components/services/storage/dom_storage/storage_area_impl_unittest.cc @@ -15,7 +15,7 @@ #include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/task_runner_util.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/test/test_simple_task_runner.h" #include "base/threading/thread.h" diff --git a/components/services/storage/dom_storage/storage_area_test_util.cc b/components/services/storage/dom_storage/storage_area_test_util.cc index de01b2cd713846..b426a152240db7 100644 --- a/components/services/storage/dom_storage/storage_area_test_util.cc +++ b/components/services/storage/dom_storage/storage_area_test_util.cc @@ -7,7 +7,7 @@ #include "base/bind.h" #include "base/memory/ptr_util.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" namespace storage { namespace test { diff --git a/components/services/storage/indexed_db/scopes/disjoint_range_lock_manager_unittest.cc b/components/services/storage/indexed_db/scopes/disjoint_range_lock_manager_unittest.cc index cf60a41c4fa549..d358ace3461ae9 100644 --- a/components/services/storage/indexed_db/scopes/disjoint_range_lock_manager_unittest.cc +++ b/components/services/storage/indexed_db/scopes/disjoint_range_lock_manager_unittest.cc @@ -10,7 +10,7 @@ #include "base/callback_helpers.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/threading/sequenced_task_runner_handle.h" #include "components/services/storage/indexed_db/scopes/scope_lock.h" diff --git a/components/services/storage/indexed_db/scopes/leveldb_scope_unittest.cc b/components/services/storage/indexed_db/scopes/leveldb_scope_unittest.cc index 05dde0a27c9bef..8d8b5da7374b52 100644 --- a/components/services/storage/indexed_db/scopes/leveldb_scope_unittest.cc +++ b/components/services/storage/indexed_db/scopes/leveldb_scope_unittest.cc @@ -12,7 +12,7 @@ #include "base/strings/strcat.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/threading/sequenced_task_runner_handle.h" #include "components/services/storage/indexed_db/leveldb/fake_leveldb_factory.h" #include "components/services/storage/indexed_db/scopes/disjoint_range_lock_manager.h" diff --git a/components/services/storage/indexed_db/scopes/leveldb_scopes_test_utils.cc b/components/services/storage/indexed_db/scopes/leveldb_scopes_test_utils.cc index bb1605febfe933..423c877f1588df 100644 --- a/components/services/storage/indexed_db/scopes/leveldb_scopes_test_utils.cc +++ b/components/services/storage/indexed_db/scopes/leveldb_scopes_test_utils.cc @@ -11,7 +11,7 @@ #include "base/strings/stringprintf.h" #include "base/synchronization/waitable_event_watcher.h" #include "base/system/sys_info.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/threading/sequenced_task_runner_handle.h" #include "components/services/storage/indexed_db/leveldb/leveldb_factory.h" #include "third_party/leveldatabase/env_chromium.h" diff --git a/components/services/storage/indexed_db/scopes/leveldb_scopes_unittest.cc b/components/services/storage/indexed_db/scopes/leveldb_scopes_unittest.cc index 0a19fccf7fc3f4..93040fe1d4e0a5 100644 --- a/components/services/storage/indexed_db/scopes/leveldb_scopes_unittest.cc +++ b/components/services/storage/indexed_db/scopes/leveldb_scopes_unittest.cc @@ -8,7 +8,7 @@ #include #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/threading/sequenced_task_runner_handle.h" #include "components/services/storage/indexed_db/scopes/disjoint_range_lock_manager.h" #include "components/services/storage/indexed_db/scopes/leveldb_scopes.h" diff --git a/components/services/storage/indexed_db/scopes/scopes_lock_manager_unittest.cc b/components/services/storage/indexed_db/scopes/scopes_lock_manager_unittest.cc index 293c55e7ede9df..d7c30dfe6fd296 100644 --- a/components/services/storage/indexed_db/scopes/scopes_lock_manager_unittest.cc +++ b/components/services/storage/indexed_db/scopes/scopes_lock_manager_unittest.cc @@ -7,7 +7,7 @@ #include #include "base/bind.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "testing/gtest/include/gtest/gtest.h" namespace content { diff --git a/components/services/storage/indexed_db/transactional_leveldb/transactional_leveldb_transaction_unittest.cc b/components/services/storage/indexed_db/transactional_leveldb/transactional_leveldb_transaction_unittest.cc index 161deaa6fea1db..4042de63d93d8c 100644 --- a/components/services/storage/indexed_db/transactional_leveldb/transactional_leveldb_transaction_unittest.cc +++ b/components/services/storage/indexed_db/transactional_leveldb/transactional_leveldb_transaction_unittest.cc @@ -17,7 +17,7 @@ #include "base/files/file_path.h" #include "base/no_destructor.h" #include "base/strings/string_piece.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/threading/sequenced_task_runner_handle.h" #include "components/services/storage/indexed_db/scopes/disjoint_range_lock_manager.h" #include "components/services/storage/indexed_db/scopes/leveldb_scope.h" diff --git a/components/sessions/core/command_storage_backend_unittest.cc b/components/sessions/core/command_storage_backend_unittest.cc index 10bf2eb5cf6867..aadc28df39e54d 100644 --- a/components/sessions/core/command_storage_backend_unittest.cc +++ b/components/sessions/core/command_storage_backend_unittest.cc @@ -14,7 +14,7 @@ #include "base/memory/scoped_refptr.h" #include "base/stl_util.h" #include "base/strings/string_util.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "components/sessions/core/command_storage_manager.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/components/sessions/core/snapshotting_session_backend_unittest.cc b/components/sessions/core/snapshotting_session_backend_unittest.cc index 87c3226213a9c7..9c500790d664b3 100644 --- a/components/sessions/core/snapshotting_session_backend_unittest.cc +++ b/components/sessions/core/snapshotting_session_backend_unittest.cc @@ -13,7 +13,7 @@ #include "base/memory/scoped_refptr.h" #include "base/stl_util.h" #include "base/strings/string_util.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "components/sessions/core/session_constants.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/components/signin/ios/browser/account_consistency_service_unittest.mm b/components/signin/ios/browser/account_consistency_service_unittest.mm index 12708a84da7bac..1e580936388c15 100644 --- a/components/signin/ios/browser/account_consistency_service_unittest.mm +++ b/components/signin/ios/browser/account_consistency_service_unittest.mm @@ -11,7 +11,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/ios/ios_util.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #import "base/test/ios/wait_util.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h" diff --git a/components/signin/public/identity_manager/accounts_cookie_mutator_unittest.cc b/components/signin/public/identity_manager/accounts_cookie_mutator_unittest.cc index 7dc08ffac85071..216f9e5a4f3216 100644 --- a/components/signin/public/identity_manager/accounts_cookie_mutator_unittest.cc +++ b/components/signin/public/identity_manager/accounts_cookie_mutator_unittest.cc @@ -9,7 +9,7 @@ #include "base/bind.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/gtest_util.h" #include "base/test/task_environment.h" #include "build/build_config.h" diff --git a/components/signin/public/identity_manager/identity_manager_unittest.cc b/components/signin/public/identity_manager/identity_manager_unittest.cc index ae33e04284738a..1aacdad1b66c33 100644 --- a/components/signin/public/identity_manager/identity_manager_unittest.cc +++ b/components/signin/public/identity_manager/identity_manager_unittest.cc @@ -15,7 +15,7 @@ #include "base/run_loop.h" #include "base/scoped_observer.h" #include "base/stl_util.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "build/build_config.h" #include "components/image_fetcher/core/fake_image_decoder.h" diff --git a/components/sync/driver/profile_sync_service_unittest.cc b/components/sync/driver/profile_sync_service_unittest.cc index be09cd9e1b247a..fe6087414dcdce 100644 --- a/components/sync/driver/profile_sync_service_unittest.cc +++ b/components/sync/driver/profile_sync_service_unittest.cc @@ -12,7 +12,7 @@ #include "base/callback.h" #include "base/command_line.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h" #include "base/time/time.h" diff --git a/components/sync/driver/sync_stopped_reporter_unittest.cc b/components/sync/driver/sync_stopped_reporter_unittest.cc index 927a815ccb07ab..ebe26a944bdcc8 100644 --- a/components/sync/driver/sync_stopped_reporter_unittest.cc +++ b/components/sync/driver/sync_stopped_reporter_unittest.cc @@ -6,7 +6,7 @@ #include "base/bind.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_mock_time_message_loop_task_runner.h" #include "base/test/task_environment.h" #include "components/sync/protocol/sync.pb.h" diff --git a/components/sync/engine/net/http_bridge_unittest.cc b/components/sync/engine/net/http_bridge_unittest.cc index 8878ff0ab297f7..219660cd425c9d 100644 --- a/components/sync/engine/net/http_bridge_unittest.cc +++ b/components/sync/engine/net/http_bridge_unittest.cc @@ -14,7 +14,7 @@ #include "base/single_thread_task_runner.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/threading/thread.h" #include "build/build_config.h" diff --git a/components/sync/model_impl/model_type_store_impl_unittest.cc b/components/sync/model_impl/model_type_store_impl_unittest.cc index ad721dbcef9e1c..01e8e9a5a7b9b6 100644 --- a/components/sync/model_impl/model_type_store_impl_unittest.cc +++ b/components/sync/model_impl/model_type_store_impl_unittest.cc @@ -11,7 +11,7 @@ #include "base/bind_helpers.h" #include "base/optional.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/task_environment.h" #include "components/sync/model/model_error.h" diff --git a/components/sync/model_impl/syncable_service_based_bridge_unittest.cc b/components/sync/model_impl/syncable_service_based_bridge_unittest.cc index da21996132ffa2..9ddb45600021c0 100644 --- a/components/sync/model_impl/syncable_service_based_bridge_unittest.cc +++ b/components/sync/model_impl/syncable_service_based_bridge_unittest.cc @@ -9,7 +9,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/mock_callback.h" #include "base/test/task_environment.h" #include "components/sync/base/client_tag_hash.h" diff --git a/components/sync/trusted_vault/standalone_trusted_vault_backend_unittest.cc b/components/sync/trusted_vault/standalone_trusted_vault_backend_unittest.cc index 3a4ac33a790341..66548ad84a0945 100644 --- a/components/sync/trusted_vault/standalone_trusted_vault_backend_unittest.cc +++ b/components/sync/trusted_vault/standalone_trusted_vault_backend_unittest.cc @@ -11,7 +11,7 @@ #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/mock_callback.h" #include "base/test/scoped_feature_list.h" #include "components/os_crypt/os_crypt.h" diff --git a/components/sync/trusted_vault/trusted_vault_access_token_fetcher_frontend_unittest.cc b/components/sync/trusted_vault/trusted_vault_access_token_fetcher_frontend_unittest.cc index a611b8da8c8284..9f408abd692e86 100644 --- a/components/sync/trusted_vault/trusted_vault_access_token_fetcher_frontend_unittest.cc +++ b/components/sync/trusted_vault/trusted_vault_access_token_fetcher_frontend_unittest.cc @@ -7,7 +7,7 @@ #include #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "components/signin/public/identity_manager/access_token_info.h" #include "components/signin/public/identity_manager/identity_test_environment.h" diff --git a/components/sync_bookmarks/bookmark_model_type_processor_unittest.cc b/components/sync_bookmarks/bookmark_model_type_processor_unittest.cc index 38b02791411c0a..187bdc4bdd4ce0 100644 --- a/components/sync_bookmarks/bookmark_model_type_processor_unittest.cc +++ b/components/sync_bookmarks/bookmark_model_type_processor_unittest.cc @@ -11,7 +11,7 @@ #include "base/bind_helpers.h" #include "base/guid.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/mock_callback.h" #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h" diff --git a/components/sync_device_info/device_info_sync_bridge_unittest.cc b/components/sync_device_info/device_info_sync_bridge_unittest.cc index 9274b84a823f93..1aa5996426f898 100644 --- a/components/sync_device_info/device_info_sync_bridge_unittest.cc +++ b/components/sync_device_info/device_info_sync_bridge_unittest.cc @@ -11,7 +11,7 @@ #include "base/bind.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/mock_callback.h" #include "base/test/simple_test_clock.h" #include "base/test/task_environment.h" diff --git a/components/sync_sessions/session_sync_bridge_unittest.cc b/components/sync_sessions/session_sync_bridge_unittest.cc index 90a48446210744..e3624baa2cbcac 100644 --- a/components/sync_sessions/session_sync_bridge_unittest.cc +++ b/components/sync_sessions/session_sync_bridge_unittest.cc @@ -13,7 +13,7 @@ #include "base/memory/weak_ptr.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/mock_callback.h" #include "base/test/task_environment.h" #include "components/prefs/testing_pref_service.h" diff --git a/components/translate/core/browser/translate_language_list_unittest.cc b/components/translate/core/browser/translate_language_list_unittest.cc index 44840870484f94..e8c51b786d13d2 100644 --- a/components/translate/core/browser/translate_language_list_unittest.cc +++ b/components/translate/core/browser/translate_language_list_unittest.cc @@ -9,7 +9,7 @@ #include "base/run_loop.h" #include "base/stl_util.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_command_line.h" #include "base/test/task_environment.h" #include "base/threading/thread_task_runner_handle.h" diff --git a/components/translate/core/browser/translate_script_unittest.cc b/components/translate/core/browser/translate_script_unittest.cc index 341b7ea7d78d0f..5f78b96df81108 100644 --- a/components/translate/core/browser/translate_script_unittest.cc +++ b/components/translate/core/browser/translate_script_unittest.cc @@ -8,7 +8,7 @@ #include "base/command_line.h" #include "base/macros.h" #include "base/strings/stringprintf.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/threading/thread_task_runner_handle.h" #include "build/build_config.h" diff --git a/components/update_client/crx_downloader_unittest.cc b/components/update_client/crx_downloader_unittest.cc index b2a98b78027fe8..5ffb3373b07de3 100644 --- a/components/update_client/crx_downloader_unittest.cc +++ b/components/update_client/crx_downloader_unittest.cc @@ -12,7 +12,7 @@ #include "base/memory/ref_counted.h" #include "base/path_service.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/threading/thread_task_runner_handle.h" #include "build/build_config.h" diff --git a/components/update_client/net/url_loader_post_interceptor.cc b/components/update_client/net/url_loader_post_interceptor.cc index f6a48340963c7f..778307197b4f30 100644 --- a/components/update_client/net/url_loader_post_interceptor.cc +++ b/components/update_client/net/url_loader_post_interceptor.cc @@ -9,7 +9,7 @@ #include "base/macros.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "components/update_client/test_configurator.h" #include "net/test/embedded_test_server/embedded_test_server.h" #include "net/test/embedded_test_server/http_request.h" diff --git a/components/update_client/update_checker_unittest.cc b/components/update_client/update_checker_unittest.cc index b418ccb48d960b..8ed5ffb688fc88 100644 --- a/components/update_client/update_checker_unittest.cc +++ b/components/update_client/update_checker_unittest.cc @@ -21,7 +21,7 @@ #include "base/stl_util.h" #include "base/strings/stringprintf.h" #include "base/task/post_task.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/threading/thread_task_runner_handle.h" #include "base/version.h" diff --git a/components/variations/service/variations_service_unittest.cc b/components/variations/service/variations_service_unittest.cc index 83ff3b54b8d3c2..3e63a3a588cce8 100644 --- a/components/variations/service/variations_service_unittest.cc +++ b/components/variations/service/variations_service_unittest.cc @@ -20,7 +20,7 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/task_environment.h" #include "base/version.h" diff --git a/components/viz/service/display/display_unittest.cc b/components/viz/service/display/display_unittest.cc index 220fde42d880e1..b7b5fe6007836b 100644 --- a/components/viz/service/display/display_unittest.cc +++ b/components/viz/service/display/display_unittest.cc @@ -10,7 +10,7 @@ #include "base/bind.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/null_task_runner.h" #include "cc/base/math_util.h" diff --git a/components/viz/service/display_embedder/skia_output_device_buffer_queue_unittest.cc b/components/viz/service/display_embedder/skia_output_device_buffer_queue_unittest.cc index 2220f339831dcb..5cc5b8f089766b 100644 --- a/components/viz/service/display_embedder/skia_output_device_buffer_queue_unittest.cc +++ b/components/viz/service/display_embedder/skia_output_device_buffer_queue_unittest.cc @@ -12,7 +12,7 @@ #include "base/bind_helpers.h" #include "base/memory/ptr_util.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "build/build_config.h" #include "components/viz/common/resources/resource_sizes.h" #include "components/viz/service/display_embedder/output_presenter_gl.h" diff --git a/components/viz/service/display_embedder/software_output_surface_unittest.cc b/components/viz/service/display_embedder/software_output_surface_unittest.cc index d83f1f327f7226..c6ff42bcc58692 100644 --- a/components/viz/service/display_embedder/software_output_surface_unittest.cc +++ b/components/viz/service/display_embedder/software_output_surface_unittest.cc @@ -8,7 +8,7 @@ #include "base/bind.h" #include "base/macros.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "cc/test/fake_output_surface_client.h" #include "components/viz/service/display/output_surface_frame.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/components/web_package/web_bundle_parser_factory_unittest.cc b/components/web_package/web_bundle_parser_factory_unittest.cc index d16db82ad95de5..9a0d3fd507f348 100644 --- a/components/web_package/web_bundle_parser_factory_unittest.cc +++ b/components/web_package/web_bundle_parser_factory_unittest.cc @@ -9,7 +9,7 @@ #include "base/optional.h" #include "base/path_service.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "mojo/public/cpp/bindings/pending_receiver.h" #include "mojo/public/cpp/bindings/pending_remote.h" diff --git a/components/web_package/web_bundle_parser_unittest.cc b/components/web_package/web_bundle_parser_unittest.cc index 1af812773b1ce3..d73fa03964554d 100644 --- a/components/web_package/web_bundle_parser_unittest.cc +++ b/components/web_package/web_bundle_parser_unittest.cc @@ -8,7 +8,7 @@ #include "base/files/file_util.h" #include "base/optional.h" #include "base/path_service.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "components/cbor/writer.h" #include "components/web_package/test_support/web_bundle_builder.h" diff --git a/content/browser/accessibility/hit_testing_browsertest.cc b/content/browser/accessibility/hit_testing_browsertest.cc index 2f7b6bd4e5e6d1..fd965bc84d654f 100644 --- a/content/browser/accessibility/hit_testing_browsertest.cc +++ b/content/browser/accessibility/hit_testing_browsertest.cc @@ -5,7 +5,7 @@ #include "content/browser/accessibility/hit_testing_browsertest.h" #include "base/check.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "build/build_config.h" #include "build/chromecast_buildflags.h" #include "content/browser/accessibility/accessibility_tree_formatter_blink.h" diff --git a/content/browser/appcache/appcache_browsertest.cc b/content/browser/appcache/appcache_browsertest.cc index 4a7c2a71850d23..c7ca78b1b15a03 100644 --- a/content/browser/appcache/appcache_browsertest.cc +++ b/content/browser/appcache/appcache_browsertest.cc @@ -7,7 +7,7 @@ #include "base/run_loop.h" #include "base/strings/strcat.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "build/build_config.h" #include "content/browser/appcache/appcache_subresource_url_factory.h" #include "content/public/browser/navigation_entry.h" diff --git a/content/browser/appcache/appcache_response_unittest.cc b/content/browser/appcache/appcache_response_unittest.cc index ba25707e5739e9..db576b80f36a16 100644 --- a/content/browser/appcache/appcache_response_unittest.cc +++ b/content/browser/appcache/appcache_response_unittest.cc @@ -21,7 +21,7 @@ #include "base/stl_util.h" #include "base/strings/escape.h" #include "base/synchronization/waitable_event.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/threading/thread.h" #include "base/threading/thread_task_runner_handle.h" diff --git a/content/browser/appcache/appcache_storage_impl_unittest.cc b/content/browser/appcache/appcache_storage_impl_unittest.cc index 6ec92be568a963..441b720fd0c62b 100644 --- a/content/browser/appcache/appcache_storage_impl_unittest.cc +++ b/content/browser/appcache/appcache_storage_impl_unittest.cc @@ -22,7 +22,7 @@ #include "base/single_thread_task_runner.h" #include "base/stl_util.h" #include "base/synchronization/waitable_event.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h" #include "base/threading/sequenced_task_runner_handle.h" diff --git a/content/browser/back_forward_cache_browsertest.cc b/content/browser/back_forward_cache_browsertest.cc index 8abbbbd5f0f551..2c81fb0208b143 100644 --- a/content/browser/back_forward_cache_browsertest.cc +++ b/content/browser/back_forward_cache_browsertest.cc @@ -17,7 +17,7 @@ #include "base/system/sys_info.h" #include "base/task/common/task_annotator.h" #include "base/task/post_task.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/test/test_mock_time_task_runner.h" #include "base/test/test_timeouts.h" diff --git a/content/browser/background_sync/background_sync_launcher_unittest.cc b/content/browser/background_sync/background_sync_launcher_unittest.cc index 0258ca8d5b6c47..cd28e32ac6c270 100644 --- a/content/browser/background_sync/background_sync_launcher_unittest.cc +++ b/content/browser/background_sync/background_sync_launcher_unittest.cc @@ -9,7 +9,7 @@ #include "base/bind.h" #include "base/callback_forward.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/time/time.h" #include "build/build_config.h" diff --git a/content/browser/blob_storage/blob_storage_browsertest.cc b/content/browser/blob_storage/blob_storage_browsertest.cc index 9b60db7a47b766..6617c099972fac 100644 --- a/content/browser/blob_storage/blob_storage_browsertest.cc +++ b/content/browser/blob_storage/blob_storage_browsertest.cc @@ -6,7 +6,7 @@ #include "base/bind.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "content/browser/blob_storage/chrome_blob_storage_context.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_task_traits.h" diff --git a/content/browser/bluetooth/web_bluetooth_service_impl_unittest.cc b/content/browser/bluetooth/web_bluetooth_service_impl_unittest.cc index 1174b1aa07c195..9c63d9c0ff490a 100644 --- a/content/browser/bluetooth/web_bluetooth_service_impl_unittest.cc +++ b/content/browser/bluetooth/web_bluetooth_service_impl_unittest.cc @@ -7,7 +7,7 @@ #include #include "base/macros.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "content/browser/bluetooth/bluetooth_adapter_factory_wrapper.h" #include "content/public/browser/web_contents_delegate.h" #include "content/test/test_render_view_host.h" diff --git a/content/browser/browsing_data/browsing_data_remover_impl_browsertest.cc b/content/browser/browsing_data/browsing_data_remover_impl_browsertest.cc index c91dec64dc16fa..80d3e06440b3d4 100644 --- a/content/browser/browsing_data/browsing_data_remover_impl_browsertest.cc +++ b/content/browser/browsing_data/browsing_data_remover_impl_browsertest.cc @@ -8,7 +8,7 @@ #include "base/bind.h" #include "base/files/file_path.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/browsing_data_filter_builder.h" diff --git a/content/browser/browsing_data/browsing_data_test_utils.cc b/content/browser/browsing_data/browsing_data_test_utils.cc index b7b978f3be2267..2dcbdc4d2c9b8a 100644 --- a/content/browser/browsing_data/browsing_data_test_utils.cc +++ b/content/browser/browsing_data/browsing_data_test_utils.cc @@ -9,7 +9,7 @@ #include "base/bind.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/storage_partition.h" #include "net/cookies/cookie_access_result.h" diff --git a/content/browser/browsing_data/clear_site_data_handler_browsertest.cc b/content/browser/browsing_data/clear_site_data_handler_browsertest.cc index 499c18ba8fa50f..47f968b9d093ed 100644 --- a/content/browser/browsing_data/clear_site_data_handler_browsertest.cc +++ b/content/browser/browsing_data/clear_site_data_handler_browsertest.cc @@ -14,7 +14,7 @@ #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/synchronization/lock.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/thread_annotations.h" #include "build/build_config.h" diff --git a/content/browser/browsing_data/same_site_data_remover_impl_unittest.cc b/content/browser/browsing_data/same_site_data_remover_impl_unittest.cc index c71f51ba8508fb..4cadbeeeacdb81 100644 --- a/content/browser/browsing_data/same_site_data_remover_impl_unittest.cc +++ b/content/browser/browsing_data/same_site_data_remover_impl_unittest.cc @@ -9,7 +9,7 @@ #include "base/bind.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/time/time.h" #include "content/browser/browsing_data/browsing_data_test_utils.h" #include "content/browser/browsing_data/same_site_data_remover_impl.h" diff --git a/content/browser/cache_storage/cache_storage_cache_unittest.cc b/content/browser/cache_storage/cache_storage_cache_unittest.cc index 7b79da4f1a6239..72268658369589 100644 --- a/content/browser/cache_storage/cache_storage_cache_unittest.cc +++ b/content/browser/cache_storage/cache_storage_cache_unittest.cc @@ -23,7 +23,7 @@ #include "base/strings/strcat.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/threading/thread_task_runner_handle.h" #include "build/build_config.h" diff --git a/content/browser/cache_storage/cache_storage_manager_unittest.cc b/content/browser/cache_storage/cache_storage_manager_unittest.cc index 10dc1bf45d6e66..e14a61818b0d95 100644 --- a/content/browser/cache_storage/cache_storage_manager_unittest.cc +++ b/content/browser/cache_storage/cache_storage_manager_unittest.cc @@ -22,7 +22,7 @@ #include "base/run_loop.h" #include "base/stl_util.h" #include "base/strings/string_number_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/threading/thread_task_runner_handle.h" #include "build/build_config.h" diff --git a/content/browser/child_process_security_policy_unittest.cc b/content/browser/child_process_security_policy_unittest.cc index 5e980514d23530..8cbf8115f08fb6 100644 --- a/content/browser/child_process_security_policy_unittest.cc +++ b/content/browser/child_process_security_policy_unittest.cc @@ -11,7 +11,7 @@ #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/synchronization/waitable_event.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/mock_log.h" #include "build/build_config.h" #include "content/browser/child_process_security_policy_impl.h" diff --git a/content/browser/content_index/content_index_browsertest.cc b/content/browser/content_index/content_index_browsertest.cc index b24cf3e500d07b..02fad1f2d288d3 100644 --- a/content/browser/content_index/content_index_browsertest.cc +++ b/content/browser/content_index/content_index_browsertest.cc @@ -6,7 +6,7 @@ #include #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/content_index_context.h" diff --git a/content/browser/content_index/content_index_database_unittest.cc b/content/browser/content_index/content_index_database_unittest.cc index 8739e767925666..3787ffbff59141 100644 --- a/content/browser/content_index/content_index_database_unittest.cc +++ b/content/browser/content_index/content_index_database_unittest.cc @@ -7,7 +7,7 @@ #include #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "content/browser/service_worker/embedded_worker_test_helper.h" #include "content/public/browser/content_index_provider.h" diff --git a/content/browser/content_index/content_index_service_impl_unittest.cc b/content/browser/content_index/content_index_service_impl_unittest.cc index f5c10adaeff461..689e817f2a6d2b 100644 --- a/content/browser/content_index/content_index_service_impl_unittest.cc +++ b/content/browser/content_index/content_index_service_impl_unittest.cc @@ -5,7 +5,7 @@ #include "content/browser/content_index/content_index_service_impl.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "content/public/test/browser_task_environment.h" #include "content/test/fake_mojo_message_dispatch_context.h" #include "mojo/public/cpp/bindings/message.h" diff --git a/content/browser/conversions/conversion_manager_impl_unittest.cc b/content/browser/conversions/conversion_manager_impl_unittest.cc index d2d9543e005605..ac89733338dcdb 100644 --- a/content/browser/conversions/conversion_manager_impl_unittest.cc +++ b/content/browser/conversions/conversion_manager_impl_unittest.cc @@ -15,7 +15,7 @@ #include "base/files/scoped_temp_dir.h" #include "base/run_loop.h" #include "base/sequenced_task_runner.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/time/clock.h" #include "base/time/time.h" #include "build/build_config.h" diff --git a/content/browser/conversions/conversion_reporter_impl_unittest.cc b/content/browser/conversions/conversion_reporter_impl_unittest.cc index d9e40dece4dbfa..74b5f0e1bb5e7f 100644 --- a/content/browser/conversions/conversion_reporter_impl_unittest.cc +++ b/content/browser/conversions/conversion_reporter_impl_unittest.cc @@ -10,7 +10,7 @@ #include "base/sequenced_task_runner.h" #include "base/strings/strcat.h" #include "base/task/post_task.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/simple_test_clock.h" #include "content/browser/conversions/conversion_manager.h" #include "content/browser/conversions/conversion_test_utils.h" diff --git a/content/browser/conversions/conversion_test_utils.cc b/content/browser/conversions/conversion_test_utils.cc index ffbc7aec9b9067..bc7162bb734a78 100644 --- a/content/browser/conversions/conversion_test_utils.cc +++ b/content/browser/conversions/conversion_test_utils.cc @@ -13,7 +13,7 @@ #include "base/callback.h" #include "base/run_loop.h" #include "base/task_runner_util.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "content/browser/conversions/conversion_storage_context.h" #include "url/gurl.h" diff --git a/content/browser/conversions/conversions_origin_trial_browsertest.cc b/content/browser/conversions/conversions_origin_trial_browsertest.cc index e302829718e947..f1cd98a01a9ec7 100644 --- a/content/browser/conversions/conversions_origin_trial_browsertest.cc +++ b/content/browser/conversions/conversions_origin_trial_browsertest.cc @@ -5,7 +5,7 @@ #include #include "base/strings/strcat.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "content/browser/conversions/conversion_manager_impl.h" #include "content/browser/conversions/storable_impression.h" diff --git a/content/browser/cookie_store/cookie_store_manager_unittest.cc b/content/browser/cookie_store/cookie_store_manager_unittest.cc index 0b072f12625107..6e0aea23f323b8 100644 --- a/content/browser/cookie_store/cookie_store_manager_unittest.cc +++ b/content/browser/cookie_store/cookie_store_manager_unittest.cc @@ -8,7 +8,7 @@ #include "base/files/scoped_temp_dir.h" #include "base/macros.h" #include "base/memory/scoped_refptr.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "content/browser/cookie_store/cookie_store_context.h" #include "content/browser/cookie_store/cookie_store_manager.h" diff --git a/content/browser/cross_origin_opener_policy_browsertest.cc b/content/browser/cross_origin_opener_policy_browsertest.cc index d60007a496d7d4..8dd665beed0f23 100644 --- a/content/browser/cross_origin_opener_policy_browsertest.cc +++ b/content/browser/cross_origin_opener_policy_browsertest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "components/network_session_configurator/common/network_switches.h" #include "content/browser/renderer_host/navigation_request.h" diff --git a/content/browser/devtools/protocol/devtools_network_resource_loader_browsertest.cc b/content/browser/devtools/protocol/devtools_network_resource_loader_browsertest.cc index 7600c4a2f8815f..4961dfe7aeda63 100644 --- a/content/browser/devtools/protocol/devtools_network_resource_loader_browsertest.cc +++ b/content/browser/devtools/protocol/devtools_network_resource_loader_browsertest.cc @@ -5,7 +5,7 @@ #include "base/files/file_util.h" #include "base/path_service.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "content/browser/devtools/protocol/devtools_network_resource_loader.h" #include "content/browser/renderer_host/render_frame_host_impl.h" diff --git a/content/browser/direct_sockets/direct_sockets_browsertest.cc b/content/browser/direct_sockets/direct_sockets_browsertest.cc index 76330edb71151d..1e7f3107bf5329 100644 --- a/content/browser/direct_sockets/direct_sockets_browsertest.cc +++ b/content/browser/direct_sockets/direct_sockets_browsertest.cc @@ -7,7 +7,7 @@ #include "base/optional.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "content/browser/direct_sockets/direct_sockets_service_impl.h" #include "content/public/browser/browser_context.h" diff --git a/content/browser/dom_storage/dom_storage_browsertest.cc b/content/browser/dom_storage/dom_storage_browsertest.cc index 1fd5178296e3bf..df21f17f9b379a 100644 --- a/content/browser/dom_storage/dom_storage_browsertest.cc +++ b/content/browser/dom_storage/dom_storage_browsertest.cc @@ -6,7 +6,7 @@ #include "base/command_line.h" #include "base/files/file_util.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/threading/thread_restrictions.h" #include "build/build_config.h" #include "components/services/storage/dom_storage/legacy_dom_storage_database.h" diff --git a/content/browser/download/download_browsertest.cc b/content/browser/download/download_browsertest.cc index bd8868e9e2e8b7..a673d5c2e8d15a 100644 --- a/content/browser/download/download_browsertest.cc +++ b/content/browser/download/download_browsertest.cc @@ -25,7 +25,7 @@ #include "base/run_loop.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/mock_entropy_provider.h" #include "base/test/scoped_feature_list.h" #include "base/threading/platform_thread.h" diff --git a/content/browser/file_system/file_system_url_loader_factory_browsertest.cc b/content/browser/file_system/file_system_url_loader_factory_browsertest.cc index d6718f6cce081c..2bda09c1efaf25 100644 --- a/content/browser/file_system/file_system_url_loader_factory_browsertest.cc +++ b/content/browser/file_system/file_system_url_loader_factory_browsertest.cc @@ -15,7 +15,7 @@ #include "base/i18n/unicodestring.h" #include "base/rand_util.h" #include "base/task/thread_pool.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "build/build_config.h" #include "content/browser/file_system/file_system_url_loader_factory.h" #include "content/browser/web_contents/web_contents_impl.h" diff --git a/content/browser/file_system_access/file_system_chooser_unittest.cc b/content/browser/file_system_access/file_system_chooser_unittest.cc index 1f282f037ddc89..98a96a0afb3c9a 100644 --- a/content/browser/file_system_access/file_system_chooser_unittest.cc +++ b/content/browser/file_system_access/file_system_chooser_unittest.cc @@ -8,7 +8,7 @@ #include "base/run_loop.h" #include "base/stl_util.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/threading/sequenced_task_runner_handle.h" #include "content/browser/file_system_access/file_system_chooser_test_helpers.h" #include "content/public/test/browser_task_environment.h" diff --git a/content/browser/file_system_access/native_file_system_file_handle_impl_unittest.cc b/content/browser/file_system_access/native_file_system_file_handle_impl_unittest.cc index c8f3ec61d9d90a..193e241b0c735e 100644 --- a/content/browser/file_system_access/native_file_system_file_handle_impl_unittest.cc +++ b/content/browser/file_system_access/native_file_system_file_handle_impl_unittest.cc @@ -14,7 +14,7 @@ #include "base/files/scoped_temp_dir.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "content/browser/file_system_access/fixed_native_file_system_permission_grant.h" #include "content/public/test/browser_task_environment.h" diff --git a/content/browser/file_system_access/native_file_system_file_writer_impl_unittest.cc b/content/browser/file_system_access/native_file_system_file_writer_impl_unittest.cc index bd30c17ed3d86c..516f3b745c117d 100644 --- a/content/browser/file_system_access/native_file_system_file_writer_impl_unittest.cc +++ b/content/browser/file_system_access/native_file_system_file_writer_impl_unittest.cc @@ -14,7 +14,7 @@ #include "base/files/scoped_temp_dir.h" #include "base/guid.h" #include "base/strings/string_number_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/gmock_callback_support.h" #include "base/test/task_environment.h" #include "content/browser/file_system_access/fixed_native_file_system_permission_grant.h" diff --git a/content/browser/file_system_access/native_file_system_handle_base_unittest.cc b/content/browser/file_system_access/native_file_system_handle_base_unittest.cc index fab08c955fe764..afdfee3e9a77cd 100644 --- a/content/browser/file_system_access/native_file_system_handle_base_unittest.cc +++ b/content/browser/file_system_access/native_file_system_handle_base_unittest.cc @@ -5,7 +5,7 @@ #include "content/browser/file_system_access/native_file_system_handle_base.h" #include "base/files/scoped_temp_dir.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/gmock_callback_support.h" #include "base/test/task_environment.h" #include "content/browser/file_system_access/mock_native_file_system_permission_grant.h" diff --git a/content/browser/file_system_access/native_file_system_manager_impl_unittest.cc b/content/browser/file_system_access/native_file_system_manager_impl_unittest.cc index 8620a3d1d0beba..850d191505e742 100644 --- a/content/browser/file_system_access/native_file_system_manager_impl_unittest.cc +++ b/content/browser/file_system_access/native_file_system_manager_impl_unittest.cc @@ -12,7 +12,7 @@ #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/gmock_callback_support.h" #include "base/test/task_environment.h" #include "content/browser/file_system_access/fixed_native_file_system_permission_grant.h" diff --git a/content/browser/font_access/font_access_manager_impl_browsertest.cc b/content/browser/font_access/font_access_manager_impl_browsertest.cc index 232483704d866f..cd9f8033ef162c 100644 --- a/content/browser/font_access/font_access_manager_impl_browsertest.cc +++ b/content/browser/font_access/font_access_manager_impl_browsertest.cc @@ -4,7 +4,7 @@ #include "content/browser/font_access/font_access_manager_impl.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "build/build_config.h" #include "content/browser/font_access/font_access_test_utils.h" diff --git a/content/browser/font_access/font_access_manager_impl_unittest.cc b/content/browser/font_access/font_access_manager_impl_unittest.cc index bdcc175927fd78..ba465cfea7e9b9 100644 --- a/content/browser/font_access/font_access_manager_impl_unittest.cc +++ b/content/browser/font_access/font_access_manager_impl_unittest.cc @@ -5,7 +5,7 @@ #include "content/browser/font_access/font_access_manager_impl.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "content/browser/font_access/font_access_test_utils.h" #include "content/browser/font_access/font_enumeration_cache.h" diff --git a/content/browser/hid/hid_service_unittest.cc b/content/browser/hid/hid_service_unittest.cc index 22d3277f1debf9..7c4b9c9c59360b 100644 --- a/content/browser/hid/hid_service_unittest.cc +++ b/content/browser/hid/hid_service_unittest.cc @@ -6,7 +6,7 @@ #include #include "base/command_line.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/gmock_callback_support.h" #include "content/browser/hid/hid_test_utils.h" #include "content/public/browser/content_browser_client.h" diff --git a/content/browser/idle/idle_manager_unittest.cc b/content/browser/idle/idle_manager_unittest.cc index 912db8ef217cfb..58ca314e98da67 100644 --- a/content/browser/idle/idle_manager_unittest.cc +++ b/content/browser/idle/idle_manager_unittest.cc @@ -11,7 +11,7 @@ #include "base/bind_helpers.h" #include "base/memory/ptr_util.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/test/test_mock_time_task_runner.h" #include "base/time/time.h" diff --git a/content/browser/indexed_db/indexed_db_backing_store_unittest.cc b/content/browser/indexed_db/indexed_db_backing_store_unittest.cc index badb1c48cf1f33..56d09772d0a86f 100644 --- a/content/browser/indexed_db/indexed_db_backing_store_unittest.cc +++ b/content/browser/indexed_db/indexed_db_backing_store_unittest.cc @@ -28,7 +28,7 @@ #include "base/synchronization/waitable_event_watcher.h" #include "base/task/post_task.h" #include "base/task/thread_pool.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/time/default_clock.h" #include "components/services/storage/indexed_db/scopes/disjoint_range_lock_manager.h" diff --git a/content/browser/indexed_db/indexed_db_browsertest.cc b/content/browser/indexed_db/indexed_db_browsertest.cc index 432af44a5f4073..8abde77c3dc36d 100644 --- a/content/browser/indexed_db/indexed_db_browsertest.cc +++ b/content/browser/indexed_db/indexed_db_browsertest.cc @@ -21,7 +21,7 @@ #include "base/run_loop.h" #include "base/single_thread_task_runner.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/thread_test_helper.h" #include "base/threading/thread_restrictions.h" #include "build/build_config.h" diff --git a/content/browser/indexed_db/indexed_db_database_unittest.cc b/content/browser/indexed_db/indexed_db_database_unittest.cc index 1542d080ae55ee..3ac1cc629f7167 100644 --- a/content/browser/indexed_db/indexed_db_database_unittest.cc +++ b/content/browser/indexed_db/indexed_db_database_unittest.cc @@ -14,7 +14,7 @@ #include "base/run_loop.h" #include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/mock_callback.h" #include "base/test/task_environment.h" #include "base/threading/thread_task_runner_handle.h" diff --git a/content/browser/indexed_db/indexed_db_dispatcher_host_unittest.cc b/content/browser/indexed_db/indexed_db_dispatcher_host_unittest.cc index a546cfe216486c..079dda8e9a83ed 100644 --- a/content/browser/indexed_db/indexed_db_dispatcher_host_unittest.cc +++ b/content/browser/indexed_db/indexed_db_dispatcher_host_unittest.cc @@ -13,7 +13,7 @@ #include "base/single_thread_task_runner.h" #include "base/strings/utf_string_conversions.h" #include "base/task/post_task.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/gmock_callback_support.h" #include "base/test/mock_callback.h" #include "base/test/task_environment.h" diff --git a/content/browser/indexed_db/indexed_db_factory_unittest.cc b/content/browser/indexed_db/indexed_db_factory_unittest.cc index 10168ae9fb4c5a..3e354bba37a568 100644 --- a/content/browser/indexed_db/indexed_db_factory_unittest.cc +++ b/content/browser/indexed_db/indexed_db_factory_unittest.cc @@ -15,7 +15,7 @@ #include "base/run_loop.h" #include "base/stl_util.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/test/simple_test_clock.h" #include "base/test/task_environment.h" diff --git a/content/browser/indexed_db/indexed_db_quota_client_unittest.cc b/content/browser/indexed_db/indexed_db_quota_client_unittest.cc index 9260fd97bfadbd..8bc64a89c0c7c6 100644 --- a/content/browser/indexed_db/indexed_db_quota_client_unittest.cc +++ b/content/browser/indexed_db/indexed_db_quota_client_unittest.cc @@ -15,7 +15,7 @@ #include "base/macros.h" #include "base/memory/scoped_refptr.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/threading/sequenced_task_runner_handle.h" #include "base/threading/thread.h" diff --git a/content/browser/indexed_db/indexed_db_transaction_unittest.cc b/content/browser/indexed_db/indexed_db_transaction_unittest.cc index 11eccda767be73..325dcaa6d170fe 100644 --- a/content/browser/indexed_db/indexed_db_transaction_unittest.cc +++ b/content/browser/indexed_db/indexed_db_transaction_unittest.cc @@ -14,7 +14,7 @@ #include "base/macros.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "components/services/storage/indexed_db/scopes/disjoint_range_lock_manager.h" #include "content/browser/indexed_db/fake_indexed_db_metadata_coding.h" diff --git a/content/browser/indexed_db/indexed_db_unittest.cc b/content/browser/indexed_db/indexed_db_unittest.cc index 41186415d45c2c..28de8d9385b8bc 100644 --- a/content/browser/indexed_db/indexed_db_unittest.cc +++ b/content/browser/indexed_db/indexed_db_unittest.cc @@ -11,7 +11,7 @@ #include "base/macros.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/threading/sequenced_task_runner_handle.h" #include "base/time/default_clock.h" diff --git a/content/browser/isolated_origin_browsertest.cc b/content/browser/isolated_origin_browsertest.cc index 5fa9d0bb755c09..142b21ed516505 100644 --- a/content/browser/isolated_origin_browsertest.cc +++ b/content/browser/isolated_origin_browsertest.cc @@ -9,7 +9,7 @@ #include "base/command_line.h" #include "base/macros.h" #include "base/strings/string_util.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "build/build_config.h" #include "components/network_session_configurator/common/network_switches.h" diff --git a/content/browser/launch_as_mojo_client_browsertest.cc b/content/browser/launch_as_mojo_client_browsertest.cc index 94b17db5b5ffc5..f143ae59bd2bf5 100644 --- a/content/browser/launch_as_mojo_client_browsertest.cc +++ b/content/browser/launch_as_mojo_client_browsertest.cc @@ -10,7 +10,7 @@ #include "base/process/launch.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "build/build_config.h" #include "content/public/common/content_switches.h" #include "content/public/test/browser_test.h" diff --git a/content/browser/loader/loader_browsertest.cc b/content/browser/loader/loader_browsertest.cc index a3f7d53794cd69..78858de5fb071f 100644 --- a/content/browser/loader/loader_browsertest.cc +++ b/content/browser/loader/loader_browsertest.cc @@ -15,7 +15,7 @@ #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "build/build_config.h" #include "content/browser/download/download_manager_impl.h" #include "content/browser/web_contents/web_contents_impl.h" diff --git a/content/browser/loader/quic_transport_browsertest.cc b/content/browser/loader/quic_transport_browsertest.cc index 27aa21c282cd82..fc210c8485f565 100644 --- a/content/browser/loader/quic_transport_browsertest.cc +++ b/content/browser/loader/quic_transport_browsertest.cc @@ -14,7 +14,7 @@ #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/synchronization/waitable_event.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/threading/thread.h" #include "base/threading/thread_restrictions.h" #include "build/build_config.h" diff --git a/content/browser/mojo_sandbox_browsertest.cc b/content/browser/mojo_sandbox_browsertest.cc index 2a9f1a32366ce3..b27ab95e44d791 100644 --- a/content/browser/mojo_sandbox_browsertest.cc +++ b/content/browser/mojo_sandbox_browsertest.cc @@ -16,7 +16,7 @@ #include "base/memory/writable_shared_memory_region.h" #include "base/run_loop.h" #include "base/strings/string_piece.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "build/build_config.h" #include "content/browser/utility_process_host.h" #include "content/public/browser/browser_task_traits.h" diff --git a/content/browser/native_io/native_io_context_unittest.cc b/content/browser/native_io/native_io_context_unittest.cc index beb3c2009b45fd..1aeaae5e3d8e53 100644 --- a/content/browser/native_io/native_io_context_unittest.cc +++ b/content/browser/native_io/native_io_context_unittest.cc @@ -8,7 +8,7 @@ #include "base/files/file.h" #include "base/files/scoped_temp_dir.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/threading/thread.h" #include "content/browser/native_io/native_io_context.h" diff --git a/content/browser/navigation_browsertest.cc b/content/browser/navigation_browsertest.cc index d802197f248736..0e1006e82aa8e9 100644 --- a/content/browser/navigation_browsertest.cc +++ b/content/browser/navigation_browsertest.cc @@ -12,7 +12,7 @@ #include "base/memory/ptr_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/test/test_timeouts.h" #include "base/threading/thread_restrictions.h" diff --git a/content/browser/navigation_mhtml_browsertest.cc b/content/browser/navigation_mhtml_browsertest.cc index a2e19ee5657282..ceef2a571ce5b0 100644 --- a/content/browser/navigation_mhtml_browsertest.cc +++ b/content/browser/navigation_mhtml_browsertest.cc @@ -11,7 +11,7 @@ #include "base/macros.h" #include "base/run_loop.h" #include "base/strings/string_util.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/threading/thread_restrictions.h" #include "content/browser/renderer_host/navigation_request.h" #include "content/browser/renderer_host/render_frame_host_impl.h" diff --git a/content/browser/net/accept_header_browsertest.cc b/content/browser/net/accept_header_browsertest.cc index 2a2ccc1a5caedb..91f60b4e4985ed 100644 --- a/content/browser/net/accept_header_browsertest.cc +++ b/content/browser/net/accept_header_browsertest.cc @@ -7,7 +7,7 @@ #include "base/bind.h" #include "base/run_loop.h" #include "base/synchronization/lock.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "build/build_config.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/web_contents.h" diff --git a/content/browser/network_service_browsertest.cc b/content/browser/network_service_browsertest.cc index 082093b9122e71..5c138eb226d8b1 100644 --- a/content/browser/network_service_browsertest.cc +++ b/content/browser/network_service_browsertest.cc @@ -6,7 +6,7 @@ #include "base/command_line.h" #include "base/files/file_util.h" #include "base/memory/ref_counted_memory.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "build/build_config.h" #include "content/browser/storage_partition_impl.h" diff --git a/content/browser/network_service_restart_browsertest.cc b/content/browser/network_service_restart_browsertest.cc index b8a1bc2b0e0423..e361b3c5879a46 100644 --- a/content/browser/network_service_restart_browsertest.cc +++ b/content/browser/network_service_restart_browsertest.cc @@ -8,7 +8,7 @@ #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" #include "base/synchronization/lock.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_command_line.h" #include "base/test/scoped_environment_variable_override.h" diff --git a/content/browser/notifications/notification_database_unittest.cc b/content/browser/notifications/notification_database_unittest.cc index 436ae9edbd41dd..7b7fd1a1937efa 100644 --- a/content/browser/notifications/notification_database_unittest.cc +++ b/content/browser/notifications/notification_database_unittest.cc @@ -12,7 +12,7 @@ #include "base/stl_util.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "content/public/browser/notification_database_data.h" #include "content/public/test/browser_task_environment.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/content/browser/notifications/platform_notification_context_trigger_unittest.cc b/content/browser/notifications/platform_notification_context_trigger_unittest.cc index be1575c01542d1..7c33482ebb9471 100644 --- a/content/browser/notifications/platform_notification_context_trigger_unittest.cc +++ b/content/browser/notifications/platform_notification_context_trigger_unittest.cc @@ -6,7 +6,7 @@ #include "base/bind.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h" #include "base/time/time.h" diff --git a/content/browser/notifications/platform_notification_context_unittest.cc b/content/browser/notifications/platform_notification_context_unittest.cc index 8c0f261ea680cf..a578b370073220 100644 --- a/content/browser/notifications/platform_notification_context_unittest.cc +++ b/content/browser/notifications/platform_notification_context_unittest.cc @@ -10,7 +10,7 @@ #include "base/memory/ptr_util.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h" #include "base/threading/thread_task_runner_handle.h" diff --git a/content/browser/origin_trials/origin_trials_browsertest.cc b/content/browser/origin_trials/origin_trials_browsertest.cc index ea2d34a54640d0..9788a539aa51fc 100644 --- a/content/browser/origin_trials/origin_trials_browsertest.cc +++ b/content/browser/origin_trials/origin_trials_browsertest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/strings/strcat.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "content/public/browser/navigation_handle.h" #include "content/public/browser/render_process_host.h" #include "content/public/browser/web_contents.h" diff --git a/content/browser/picture_in_picture/picture_in_picture_service_impl_unittest.cc b/content/browser/picture_in_picture/picture_in_picture_service_impl_unittest.cc index 925d178a3e4c18..a14953e63d7e17 100644 --- a/content/browser/picture_in_picture/picture_in_picture_service_impl_unittest.cc +++ b/content/browser/picture_in_picture/picture_in_picture_service_impl_unittest.cc @@ -7,7 +7,7 @@ #include #include -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "build/build_config.h" #include "content/browser/picture_in_picture/picture_in_picture_window_controller_impl.h" #include "content/common/media/media_player_delegate_messages.h" diff --git a/content/browser/portal/portal_browsertest.cc b/content/browser/portal/portal_browsertest.cc index f7f6e8d46d2d45..7ac7257d6945f2 100644 --- a/content/browser/portal/portal_browsertest.cc +++ b/content/browser/portal/portal_browsertest.cc @@ -14,7 +14,7 @@ #include "base/run_loop.h" #include "base/strings/strcat.h" #include "base/strings/stringprintf.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/test/test_timeouts.h" #include "base/test/trace_event_analyzer.h" diff --git a/content/browser/renderer_host/clipboard_host_impl_unittest.cc b/content/browser/renderer_host/clipboard_host_impl_unittest.cc index 90dcb0fc27683d..6f9d758258549f 100644 --- a/content/browser/renderer_host/clipboard_host_impl_unittest.cc +++ b/content/browser/renderer_host/clipboard_host_impl_unittest.cc @@ -9,7 +9,7 @@ #include "base/callback_helpers.h" #include "base/run_loop.h" #include "base/strings/string16.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "content/browser/renderer_host/clipboard_host_impl.h" #include "content/public/test/browser_task_environment.h" #include "mojo/public/cpp/bindings/remote.h" diff --git a/content/browser/renderer_host/dwrite_font_lookup_table_builder_win_unittest.cc b/content/browser/renderer_host/dwrite_font_lookup_table_builder_win_unittest.cc index 6b36459d714e6a..6e3f0e121ab7d8 100644 --- a/content/browser/renderer_host/dwrite_font_lookup_table_builder_win_unittest.cc +++ b/content/browser/renderer_host/dwrite_font_lookup_table_builder_win_unittest.cc @@ -12,7 +12,7 @@ #include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/path_service.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h" #include "content/public/common/content_features.h" diff --git a/content/browser/renderer_host/input/input_event_browsertest.cc b/content/browser/renderer_host/input/input_event_browsertest.cc index 60966a518ced21..87e903e6179790 100644 --- a/content/browser/renderer_host/input/input_event_browsertest.cc +++ b/content/browser/renderer_host/input/input_event_browsertest.cc @@ -6,7 +6,7 @@ #include "base/json/json_reader.h" #include "base/macros.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "build/build_config.h" #include "content/browser/renderer_host/input/synthetic_gesture_controller.h" #include "content/browser/renderer_host/input/synthetic_gesture_target.h" diff --git a/content/browser/renderer_host/input/touch_action_browsertest.cc b/content/browser/renderer_host/input/touch_action_browsertest.cc index ad7214427cf6a1..853ada66d603fa 100644 --- a/content/browser/renderer_host/input/touch_action_browsertest.cc +++ b/content/browser/renderer_host/input/touch_action_browsertest.cc @@ -11,7 +11,7 @@ #include "base/macros.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h" #include "build/build_config.h" diff --git a/content/browser/renderer_host/media/service_video_capture_provider_unittest.cc b/content/browser/renderer_host/media/service_video_capture_provider_unittest.cc index 5f6d39284581da..3699ed8bbe8ad9 100644 --- a/content/browser/renderer_host/media/service_video_capture_provider_unittest.cc +++ b/content/browser/renderer_host/media/service_video_capture_provider_unittest.cc @@ -9,7 +9,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/mock_callback.h" #include "base/threading/thread.h" #include "content/public/browser/video_capture_device_launcher.h" diff --git a/content/browser/renderer_host/media/video_capture_controller_unittest.cc b/content/browser/renderer_host/media/video_capture_controller_unittest.cc index de7df42dc1b3dc..4b178b89d7d48d 100644 --- a/content/browser/renderer_host/media/video_capture_controller_unittest.cc +++ b/content/browser/renderer_host/media/video_capture_controller_unittest.cc @@ -19,7 +19,7 @@ #include "base/memory/ref_counted.h" #include "base/run_loop.h" #include "base/single_thread_task_runner.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/threading/thread_task_runner_handle.h" #include "content/browser/renderer_host/media/media_stream_provider.h" diff --git a/content/browser/renderer_host/media/video_capture_manager_unittest.cc b/content/browser/renderer_host/media/video_capture_manager_unittest.cc index d8a2423e321cf5..06e09ea7d8ec52 100644 --- a/content/browser/renderer_host/media/video_capture_manager_unittest.cc +++ b/content/browser/renderer_host/media/video_capture_manager_unittest.cc @@ -17,7 +17,7 @@ #include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/threading/thread_task_runner_handle.h" #include "build/build_config.h" #include "content/browser/renderer_host/media/in_process_video_capture_provider.h" diff --git a/content/browser/renderer_host/navigation_controller_impl_browsertest.cc b/content/browser/renderer_host/navigation_controller_impl_browsertest.cc index 56476f08f6cb2b..12dcea0de3091d 100644 --- a/content/browser/renderer_host/navigation_controller_impl_browsertest.cc +++ b/content/browser/renderer_host/navigation_controller_impl_browsertest.cc @@ -19,7 +19,7 @@ #include "base/sequenced_task_runner.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/threading/sequenced_task_runner_handle.h" #include "base/threading/thread_restrictions.h" diff --git a/content/browser/renderer_host/navigation_controller_impl_unittest.cc b/content/browser/renderer_host/navigation_controller_impl_unittest.cc index 4e8c54a32cd06a..ec8fec5dfe39e0 100644 --- a/content/browser/renderer_host/navigation_controller_impl_unittest.cc +++ b/content/browser/renderer_host/navigation_controller_impl_unittest.cc @@ -18,7 +18,7 @@ #include "base/stl_util.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/gtest_util.h" #include "base/time/time.h" #include "build/build_config.h" diff --git a/content/browser/renderer_host/render_document_host_user_data_browsertest.cc b/content/browser/renderer_host/render_document_host_user_data_browsertest.cc index e0836961308f48..cc1d2cd6f84df3 100644 --- a/content/browser/renderer_host/render_document_host_user_data_browsertest.cc +++ b/content/browser/renderer_host/render_document_host_user_data_browsertest.cc @@ -6,7 +6,7 @@ #include "base/command_line.h" #include "base/memory/weak_ptr.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "content/browser/renderer_host/frame_tree_node.h" #include "content/browser/renderer_host/navigation_request.h" diff --git a/content/browser/renderer_host/render_frame_host_impl_browsertest.cc b/content/browser/renderer_host/render_frame_host_impl_browsertest.cc index 661ffd864a7527..a3dccd5d384fa1 100644 --- a/content/browser/renderer_host/render_frame_host_impl_browsertest.cc +++ b/content/browser/renderer_host/render_frame_host_impl_browsertest.cc @@ -16,7 +16,7 @@ #include "base/strings/strcat.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/mock_callback.h" #include "base/test/scoped_feature_list.h" diff --git a/content/browser/renderer_host/render_frame_host_manager_browsertest.cc b/content/browser/renderer_host/render_frame_host_manager_browsertest.cc index 1a8aac99dbfde2..c935c8188bc7d9 100644 --- a/content/browser/renderer_host/render_frame_host_manager_browsertest.cc +++ b/content/browser/renderer_host/render_frame_host_manager_browsertest.cc @@ -22,7 +22,7 @@ #include "base/strings/string_split.h" #include "base/strings/utf_string_conversions.h" #include "base/synchronization/lock.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/thread_annotations.h" #include "base/threading/thread_task_runner_handle.h" diff --git a/content/browser/renderer_host/render_frame_message_filter_browsertest.cc b/content/browser/renderer_host/render_frame_message_filter_browsertest.cc index bebd2884b7e322..1c7b39863276fc 100644 --- a/content/browser/renderer_host/render_frame_message_filter_browsertest.cc +++ b/content/browser/renderer_host/render_frame_message_filter_browsertest.cc @@ -10,7 +10,7 @@ #include "base/files/file_path.h" #include "base/optional.h" #include "base/task/post_task.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h" #include "content/browser/bad_message.h" diff --git a/content/browser/renderer_host/render_widget_host_browsertest.cc b/content/browser/renderer_host/render_widget_host_browsertest.cc index d6cbc673e8ecdb..689091722fcd9d 100644 --- a/content/browser/renderer_host/render_widget_host_browsertest.cc +++ b/content/browser/renderer_host/render_widget_host_browsertest.cc @@ -6,7 +6,7 @@ #include "base/bind.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/test_timeouts.h" #include "base/time/time.h" #include "build/build_config.h" diff --git a/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc b/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc index 840201efd9eff8..ae85f3ded4ae6b 100644 --- a/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc +++ b/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc @@ -18,7 +18,7 @@ #include "base/run_loop.h" #include "base/single_thread_task_runner.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/null_task_runner.h" #include "base/test/scoped_feature_list.h" #include "base/test/test_timeouts.h" diff --git a/content/browser/renderer_host/render_widget_host_view_child_frame_browsertest.cc b/content/browser/renderer_host/render_widget_host_view_child_frame_browsertest.cc index 9c545cb026b89f..1fe454918c08dc 100644 --- a/content/browser/renderer_host/render_widget_host_view_child_frame_browsertest.cc +++ b/content/browser/renderer_host/render_widget_host_view_child_frame_browsertest.cc @@ -8,7 +8,7 @@ #include "base/bind_helpers.h" #include "base/macros.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/test/test_timeouts.h" #include "build/build_config.h" diff --git a/content/browser/renderer_host/web_database_host_impl_unittest.cc b/content/browser/renderer_host/web_database_host_impl_unittest.cc index b756fe4de31a00..65c64b78750375 100644 --- a/content/browser/renderer_host/web_database_host_impl_unittest.cc +++ b/content/browser/renderer_host/web_database_host_impl_unittest.cc @@ -8,7 +8,7 @@ #include "base/run_loop.h" #include "base/sequenced_task_runner.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "content/browser/child_process_security_policy_impl.h" #include "content/browser/isolation_context.h" #include "content/public/test/browser_task_environment.h" diff --git a/content/browser/resolve_proxy_helper_unittest.cc b/content/browser/resolve_proxy_helper_unittest.cc index 5a6f963edfb979..5d45e1c73d4775 100644 --- a/content/browser/resolve_proxy_helper_unittest.cc +++ b/content/browser/resolve_proxy_helper_unittest.cc @@ -8,7 +8,7 @@ #include "base/memory/ptr_util.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "content/public/test/browser_task_environment.h" #include "ipc/ipc_test_sink.h" #include "mojo/public/cpp/bindings/remote.h" diff --git a/content/browser/scheduler/browser_task_executor_unittest.cc b/content/browser/scheduler/browser_task_executor_unittest.cc index 57527840d2ae89..b18dfa92171d1f 100644 --- a/content/browser/scheduler/browser_task_executor_unittest.cc +++ b/content/browser/scheduler/browser_task_executor_unittest.cc @@ -13,7 +13,7 @@ #include "base/bind_helpers.h" #include "base/task/task_traits.h" #include "base/task/thread_pool/thread_pool_instance.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/mock_callback.h" #include "base/test/task_environment.h" #include "base/threading/thread_task_runner_handle.h" diff --git a/content/browser/scheduler/browser_task_queues_unittest.cc b/content/browser/scheduler/browser_task_queues_unittest.cc index 38550246427509..c3a7fcca2ffa10 100644 --- a/content/browser/scheduler/browser_task_queues_unittest.cc +++ b/content/browser/scheduler/browser_task_queues_unittest.cc @@ -11,7 +11,7 @@ #include "base/message_loop/message_pump_type.h" #include "base/run_loop.h" #include "base/task/sequence_manager/sequence_manager.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/mock_callback.h" #include "content/public/browser/browser_thread.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/content/browser/scheduler/responsiveness/jank_monitor_impl_unittest.cc b/content/browser/scheduler/responsiveness/jank_monitor_impl_unittest.cc index 7419eee4c8bb3e..6803f1eb8f2fdc 100644 --- a/content/browser/scheduler/responsiveness/jank_monitor_impl_unittest.cc +++ b/content/browser/scheduler/responsiveness/jank_monitor_impl_unittest.cc @@ -7,7 +7,7 @@ #include "base/bind_helpers.h" #include "base/callback.h" #include "base/synchronization/waitable_event.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/test_mock_time_task_runner.h" #include "content/browser/scheduler/responsiveness/native_event_observer.h" #include "content/public/browser/browser_task_traits.h" diff --git a/content/browser/scheduler/responsiveness/metric_source_unittest.cc b/content/browser/scheduler/responsiveness/metric_source_unittest.cc index 3817cbc09d7b8e..b2f0adebeca233 100644 --- a/content/browser/scheduler/responsiveness/metric_source_unittest.cc +++ b/content/browser/scheduler/responsiveness/metric_source_unittest.cc @@ -7,7 +7,7 @@ #include #include "base/bind_helpers.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "content/browser/scheduler/responsiveness/native_event_observer.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h" diff --git a/content/browser/serial/serial_unittest.cc b/content/browser/serial/serial_unittest.cc index 0918101ddcd87c..6cd1fe8c287853 100644 --- a/content/browser/serial/serial_unittest.cc +++ b/content/browser/serial/serial_unittest.cc @@ -5,7 +5,7 @@ #include "base/barrier_closure.h" #include "base/command_line.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/gmock_callback_support.h" #include "content/browser/serial/serial_test_utils.h" #include "content/public/common/content_client.h" diff --git a/content/browser/service_process_host_browsertest.cc b/content/browser/service_process_host_browsertest.cc index 0ad5dec941d827..05e745e2e2401e 100644 --- a/content/browser/service_process_host_browsertest.cc +++ b/content/browser/service_process_host_browsertest.cc @@ -9,7 +9,7 @@ #include "base/optional.h" #include "base/run_loop.h" #include "base/stl_util.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/time/time.h" #include "base/timer/elapsed_timer.h" #include "content/public/browser/service_process_host.h" diff --git a/content/browser/service_worker/service_worker_auth_browsertest.cc b/content/browser/service_worker/service_worker_auth_browsertest.cc index 4303d419a41580..9922d47678f9aa 100644 --- a/content/browser/service_worker/service_worker_auth_browsertest.cc +++ b/content/browser/service_worker/service_worker_auth_browsertest.cc @@ -4,7 +4,7 @@ #include "base/bind.h" #include "base/feature_list.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "content/public/test/browser_test.h" #include "content/public/test/browser_test_utils.h" diff --git a/content/browser/service_worker/service_worker_browsertest.cc b/content/browser/service_worker/service_worker_browsertest.cc index 3c0308859adda9..1db848d7257a22 100644 --- a/content/browser/service_worker/service_worker_browsertest.cc +++ b/content/browser/service_worker/service_worker_browsertest.cc @@ -26,7 +26,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/task/post_task.h" #include "base/task/task_traits.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/time/time.h" #include "build/build_config.h" diff --git a/content/browser/service_worker/service_worker_context_core_unittest.cc b/content/browser/service_worker/service_worker_context_core_unittest.cc index 5d63c738ecedf7..6812630952797c 100644 --- a/content/browser/service_worker/service_worker_context_core_unittest.cc +++ b/content/browser/service_worker/service_worker_context_core_unittest.cc @@ -6,7 +6,7 @@ #include -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "content/browser/service_worker/embedded_worker_test_helper.h" #include "content/browser/service_worker/service_worker_context_core.h" #include "content/browser/service_worker/service_worker_context_core_observer.h" diff --git a/content/browser/service_worker/service_worker_context_wrapper_unittest.cc b/content/browser/service_worker/service_worker_context_wrapper_unittest.cc index 7ea08973bb2833..364c2d5ed74276 100644 --- a/content/browser/service_worker/service_worker_context_wrapper_unittest.cc +++ b/content/browser/service_worker/service_worker_context_wrapper_unittest.cc @@ -9,7 +9,7 @@ #include "base/files/scoped_temp_dir.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "content/browser/service_worker/service_worker_context_core.h" #include "content/browser/service_worker/service_worker_registration.h" #include "content/browser/service_worker/service_worker_test_utils.h" diff --git a/content/browser/service_worker/service_worker_controllee_request_handler_unittest.cc b/content/browser/service_worker/service_worker_controllee_request_handler_unittest.cc index 039ce4c55ce648..e89c2d2e52f382 100644 --- a/content/browser/service_worker/service_worker_controllee_request_handler_unittest.cc +++ b/content/browser/service_worker/service_worker_controllee_request_handler_unittest.cc @@ -11,7 +11,7 @@ #include "base/callback_helpers.h" #include "base/files/scoped_temp_dir.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "components/offline_pages/buildflags/buildflags.h" #include "content/browser/service_worker/embedded_worker_test_helper.h" diff --git a/content/browser/service_worker/service_worker_disk_cache_unittest.cc b/content/browser/service_worker/service_worker_disk_cache_unittest.cc index 02d73ec53417ec..4270a60d3cb157 100644 --- a/content/browser/service_worker/service_worker_disk_cache_unittest.cc +++ b/content/browser/service_worker/service_worker_disk_cache_unittest.cc @@ -7,7 +7,7 @@ #include "base/bind_helpers.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "net/base/net_errors.h" #include "net/base/test_completion_callback.h" diff --git a/content/browser/service_worker/service_worker_job_unittest.cc b/content/browser/service_worker/service_worker_job_unittest.cc index 3b06d34841b1c4..6915a7eebc1771 100644 --- a/content/browser/service_worker/service_worker_job_unittest.cc +++ b/content/browser/service_worker/service_worker_job_unittest.cc @@ -13,7 +13,7 @@ #include "base/optional.h" #include "base/run_loop.h" #include "base/stl_util.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h" #include "base/test/test_simple_task_runner.h" diff --git a/content/browser/service_worker/service_worker_object_host_unittest.cc b/content/browser/service_worker/service_worker_object_host_unittest.cc index cad2e886108621..91668ea95cfa9a 100644 --- a/content/browser/service_worker/service_worker_object_host_unittest.cc +++ b/content/browser/service_worker/service_worker_object_host_unittest.cc @@ -9,7 +9,7 @@ #include "base/bind_helpers.h" #include "base/macros.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/simple_test_tick_clock.h" #include "content/browser/service_worker/embedded_worker_test_helper.h" #include "content/browser/service_worker/fake_embedded_worker_instance_client.h" diff --git a/content/browser/service_worker/service_worker_offline_capability_check_browsertest.cc b/content/browser/service_worker/service_worker_offline_capability_check_browsertest.cc index 8d15b6fef00ef1..f383ba8290dc22 100644 --- a/content/browser/service_worker/service_worker_offline_capability_check_browsertest.cc +++ b/content/browser/service_worker/service_worker_offline_capability_check_browsertest.cc @@ -11,7 +11,7 @@ #include "base/optional.h" #include "base/task/post_task.h" #include "base/task/task_traits.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "content/browser/service_worker/service_worker_context_wrapper.h" #include "content/browser/service_worker/service_worker_fetch_dispatcher.h" #include "content/browser/service_worker/service_worker_version.h" diff --git a/content/browser/service_worker/service_worker_process_browsertest.cc b/content/browser/service_worker/service_worker_process_browsertest.cc index 76455c7a83273d..e2dc73476fc32c 100644 --- a/content/browser/service_worker/service_worker_process_browsertest.cc +++ b/content/browser/service_worker/service_worker_process_browsertest.cc @@ -5,7 +5,7 @@ #include "base/command_line.h" #include "base/memory/scoped_refptr.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "content/browser/renderer_host/render_frame_host_impl.h" #include "content/browser/service_worker/service_worker_context_wrapper.h" diff --git a/content/browser/service_worker/service_worker_registration_unittest.cc b/content/browser/service_worker/service_worker_registration_unittest.cc index 26d4b30a75208e..5c0a96133bf983 100644 --- a/content/browser/service_worker/service_worker_registration_unittest.cc +++ b/content/browser/service_worker/service_worker_registration_unittest.cc @@ -17,7 +17,7 @@ #include "base/notreached.h" #include "base/optional.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/simple_test_tick_clock.h" #include "base/test/test_simple_task_runner.h" #include "base/threading/thread_task_runner_handle.h" diff --git a/content/browser/service_worker/service_worker_registry_unittest.cc b/content/browser/service_worker/service_worker_registry_unittest.cc index 08ed528b1d37c3..69c7144a446f27 100644 --- a/content/browser/service_worker/service_worker_registry_unittest.cc +++ b/content/browser/service_worker/service_worker_registry_unittest.cc @@ -4,7 +4,7 @@ #include "content/browser/service_worker/service_worker_registry.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "content/browser/service_worker/embedded_worker_test_helper.h" #include "content/browser/service_worker/service_worker_context_core.h" diff --git a/content/browser/service_worker/service_worker_single_script_update_checker_unittest.cc b/content/browser/service_worker/service_worker_single_script_update_checker_unittest.cc index 434b3796b1993f..ec4c410c6d0d65 100644 --- a/content/browser/service_worker/service_worker_single_script_update_checker_unittest.cc +++ b/content/browser/service_worker/service_worker_single_script_update_checker_unittest.cc @@ -8,7 +8,7 @@ #include "base/bind.h" #include "base/containers/queue.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "content/browser/service_worker/service_worker_context_wrapper.h" #include "content/browser/service_worker/service_worker_test_utils.h" #include "content/public/test/browser_task_environment.h" diff --git a/content/browser/service_worker/service_worker_storage_control_impl_unittest.cc b/content/browser/service_worker/service_worker_storage_control_impl_unittest.cc index 46301fa1b31234..a25ffb703f8e75 100644 --- a/content/browser/service_worker/service_worker_storage_control_impl_unittest.cc +++ b/content/browser/service_worker/service_worker_storage_control_impl_unittest.cc @@ -11,7 +11,7 @@ #include "base/containers/flat_map.h" #include "base/containers/span.h" #include "base/files/scoped_temp_dir.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/threading/thread_task_runner_handle.h" #include "base/time/time.h" diff --git a/content/browser/service_worker/service_worker_storage_unittest.cc b/content/browser/service_worker/service_worker_storage_unittest.cc index 9ed6188a745b10..d7569e607d8edc 100644 --- a/content/browser/service_worker/service_worker_storage_unittest.cc +++ b/content/browser/service_worker/service_worker_storage_unittest.cc @@ -15,7 +15,7 @@ #include "base/files/scoped_temp_dir.h" #include "base/run_loop.h" #include "base/stl_util.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/threading/thread_task_runner_handle.h" #include "build/build_config.h" diff --git a/content/browser/service_worker/service_worker_test_utils.cc b/content/browser/service_worker/service_worker_test_utils.cc index 7e63cf04e6bce1..8c369ec82c2868 100644 --- a/content/browser/service_worker/service_worker_test_utils.cc +++ b/content/browser/service_worker/service_worker_test_utils.cc @@ -12,7 +12,7 @@ #include #include "base/barrier_closure.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/time/time.h" #include "content/browser/renderer_host/frame_tree_node.h" #include "content/browser/service_worker/embedded_worker_test_helper.h" diff --git a/content/browser/service_worker/service_worker_version_browsertest.cc b/content/browser/service_worker/service_worker_version_browsertest.cc index 33801d745f713c..5ed137a6799b7e 100644 --- a/content/browser/service_worker/service_worker_version_browsertest.cc +++ b/content/browser/service_worker/service_worker_version_browsertest.cc @@ -23,7 +23,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/task/post_task.h" #include "base/task/task_traits.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/time/time.h" #include "build/build_config.h" diff --git a/content/browser/service_worker/service_worker_version_unittest.cc b/content/browser/service_worker/service_worker_version_unittest.cc index 89ebf4eabbeb8a..49791ece988752 100644 --- a/content/browser/service_worker/service_worker_version_unittest.cc +++ b/content/browser/service_worker/service_worker_version_unittest.cc @@ -15,7 +15,7 @@ #include "base/macros.h" #include "base/memory/ptr_util.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h" #include "base/test/simple_test_tick_clock.h" diff --git a/content/browser/site_per_process_browsertest.cc b/content/browser/site_per_process_browsertest.cc index 89fb798c5924f3..43b082a8a28b15 100644 --- a/content/browser/site_per_process_browsertest.cc +++ b/content/browser/site_per_process_browsertest.cc @@ -39,7 +39,7 @@ #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/test_timeouts.h" #include "base/threading/sequenced_task_runner_handle.h" diff --git a/content/browser/site_per_process_hit_test_browsertest.cc b/content/browser/site_per_process_hit_test_browsertest.cc index e40d095c38ced7..54ada297703482 100644 --- a/content/browser/site_per_process_hit_test_browsertest.cc +++ b/content/browser/site_per_process_hit_test_browsertest.cc @@ -12,7 +12,7 @@ #include "base/numerics/safe_conversions.h" #include "base/stl_util.h" #include "base/task/post_task.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/test/test_timeouts.h" #include "build/build_config.h" diff --git a/content/browser/sms/sms_browsertest.cc b/content/browser/sms/sms_browsertest.cc index d8128c245405da..0db71ebc649535 100644 --- a/content/browser/sms/sms_browsertest.cc +++ b/content/browser/sms/sms_browsertest.cc @@ -5,7 +5,7 @@ #include #include -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "components/ukm/test_ukm_recorder.h" #include "content/browser/browser_main_loop.h" diff --git a/content/browser/sms/user_consent_handler_unittest.cc b/content/browser/sms/user_consent_handler_unittest.cc index a3c0b6fbd79a46..8a1cb13d6a6648 100644 --- a/content/browser/sms/user_consent_handler_unittest.cc +++ b/content/browser/sms/user_consent_handler_unittest.cc @@ -5,7 +5,7 @@ #include "content/browser/sms/user_consent_handler.h" #include "base/callback.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "content/browser/sms/test/mock_sms_web_contents_delegate.h" #include "content/browser/web_contents/web_contents_impl.h" #include "content/public/test/navigation_simulator.h" diff --git a/content/browser/sms/webotp_service_unittest.cc b/content/browser/sms/webotp_service_unittest.cc index 8da21a8abd1135..53c4662dce8442 100644 --- a/content/browser/sms/webotp_service_unittest.cc +++ b/content/browser/sms/webotp_service_unittest.cc @@ -16,7 +16,7 @@ #include "base/run_loop.h" #include "base/single_thread_task_runner.h" #include "base/task/post_task.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "content/browser/sms/sms_fetcher_impl.h" #include "content/browser/sms/test/mock_sms_provider.h" diff --git a/content/browser/storage_partition_impl_browsertest.cc b/content/browser/storage_partition_impl_browsertest.cc index 056cd26347e8f8..e6f8ea9b04f450 100644 --- a/content/browser/storage_partition_impl_browsertest.cc +++ b/content/browser/storage_partition_impl_browsertest.cc @@ -6,7 +6,7 @@ #include -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "build/build_config.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/client_certificate_delegate.h" diff --git a/content/browser/storage_partition_impl_unittest.cc b/content/browser/storage_partition_impl_unittest.cc index e92b8aa8a76a78..e494b13028d333 100644 --- a/content/browser/storage_partition_impl_unittest.cc +++ b/content/browser/storage_partition_impl_unittest.cc @@ -17,7 +17,7 @@ #include "base/run_loop.h" #include "base/single_thread_task_runner.h" #include "base/stl_util.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/threading/thread.h" #include "base/threading/thread_task_runner_handle.h" diff --git a/content/browser/storage_service_restart_browsertest.cc b/content/browser/storage_service_restart_browsertest.cc index edd7e2ed728e3c..ed0dd7a67dd1a1 100644 --- a/content/browser/storage_service_restart_browsertest.cc +++ b/content/browser/storage_service_restart_browsertest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/threading/sequenced_task_runner_handle.h" #include "build/build_config.h" diff --git a/content/browser/storage_service_sandbox_browsertest.cc b/content/browser/storage_service_sandbox_browsertest.cc index efc64f030bce96..449fa85560e085 100644 --- a/content/browser/storage_service_sandbox_browsertest.cc +++ b/content/browser/storage_service_sandbox_browsertest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/threading/sequenced_task_runner_handle.h" #include "build/build_config.h" diff --git a/content/browser/web_contents/web_contents_impl_browsertest.cc b/content/browser/web_contents/web_contents_impl_browsertest.cc index 348d4bcf76889d..fa07ccb90a19e4 100644 --- a/content/browser/web_contents/web_contents_impl_browsertest.cc +++ b/content/browser/web_contents/web_contents_impl_browsertest.cc @@ -18,7 +18,7 @@ #include "base/stl_util.h" #include "base/strings/pattern.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/test/test_timeouts.h" #include "base/threading/thread_restrictions.h" diff --git a/content/browser/web_package/mock_web_bundle_reader_factory.cc b/content/browser/web_package/mock_web_bundle_reader_factory.cc index c61c05a20d61eb..8ea9b40456f9f0 100644 --- a/content/browser/web_package/mock_web_bundle_reader_factory.cc +++ b/content/browser/web_package/mock_web_bundle_reader_factory.cc @@ -13,7 +13,7 @@ #include "base/macros.h" #include "base/optional.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "components/web_package/mojom/web_bundle_parser.mojom.h" #include "content/browser/web_package/web_bundle_reader.h" #include "content/browser/web_package/web_bundle_source.h" diff --git a/content/browser/web_package/save_page_as_web_bundle_browsertest.cc b/content/browser/web_package/save_page_as_web_bundle_browsertest.cc index cd44973ba62da4..82495d64162b35 100644 --- a/content/browser/web_package/save_page_as_web_bundle_browsertest.cc +++ b/content/browser/web_package/save_page_as_web_bundle_browsertest.cc @@ -10,7 +10,7 @@ #include "base/files/scoped_temp_dir.h" #include "base/path_service.h" #include "base/strings/stringprintf.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/threading/scoped_blocking_call.h" #include "content/browser/renderer_host/render_frame_host_impl.h" #include "content/public/browser/web_contents.h" diff --git a/content/browser/web_package/signed_exchange_request_handler_browsertest.cc b/content/browser/web_package/signed_exchange_request_handler_browsertest.cc index 8ddce41022a499..0400267a242c54 100644 --- a/content/browser/web_package/signed_exchange_request_handler_browsertest.cc +++ b/content/browser/web_package/signed_exchange_request_handler_browsertest.cc @@ -11,7 +11,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/synchronization/lock.h" #include "base/task/post_task.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h" #include "base/threading/thread_restrictions.h" diff --git a/content/browser/web_package/web_bundle_browsertest.cc b/content/browser/web_package/web_bundle_browsertest.cc index a468f6ea7a4296..75e0e3c32ca45f 100644 --- a/content/browser/web_package/web_bundle_browsertest.cc +++ b/content/browser/web_package/web_bundle_browsertest.cc @@ -12,7 +12,7 @@ #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/system/sys_info.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/threading/thread_restrictions.h" #include "build/build_config.h" diff --git a/content/browser/webauth/authenticator_impl_unittest.cc b/content/browser/webauth/authenticator_impl_unittest.cc index 5e55e223e455e6..e996da8a8a1523 100644 --- a/content/browser/webauth/authenticator_impl_unittest.cc +++ b/content/browser/webauth/authenticator_impl_unittest.cc @@ -22,7 +22,7 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/system/sys_info.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/gtest_util.h" #include "base/test/scoped_feature_list.h" #include "base/test/test_mock_time_task_runner.h" diff --git a/content/browser/webauth/webauth_browsertest.cc b/content/browser/webauth/webauth_browsertest.cc index 51a261e99eea9c..c20becfdd68666 100644 --- a/content/browser/webauth/webauth_browsertest.cc +++ b/content/browser/webauth/webauth_browsertest.cc @@ -13,7 +13,7 @@ #include "base/json/json_reader.h" #include "base/macros.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/values.h" #include "build/build_config.h" diff --git a/content/browser/webui/web_ui_browsertest.cc b/content/browser/webui/web_ui_browsertest.cc index 5b4560703248c3..062400c0deb485 100644 --- a/content/browser/webui/web_ui_browsertest.cc +++ b/content/browser/webui/web_ui_browsertest.cc @@ -14,7 +14,7 @@ #include "base/run_loop.h" #include "base/strings/strcat.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/simple_test_tick_clock.h" #include "base/time/time.h" #include "build/build_config.h" diff --git a/content/browser/worker_host/worker_browsertest.cc b/content/browser/worker_host/worker_browsertest.cc index 880baf88470c89..0ee1d37ea7d2ca 100644 --- a/content/browser/worker_host/worker_browsertest.cc +++ b/content/browser/worker_host/worker_browsertest.cc @@ -10,7 +10,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/synchronization/lock.h" #include "base/system/sys_info.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/test/test_timeouts.h" #include "base/thread_annotations.h" diff --git a/content/browser/worker_network_isolation_key_browsertest.cc b/content/browser/worker_network_isolation_key_browsertest.cc index e56dbb312178cd..89566b84e23265 100644 --- a/content/browser/worker_network_isolation_key_browsertest.cc +++ b/content/browser/worker_network_isolation_key_browsertest.cc @@ -4,7 +4,7 @@ #include "base/path_service.h" #include "base/strings/strcat.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "build/build_config.h" #include "content/public/common/content_paths.h" diff --git a/content/common/service_manager/service_manager_connection_impl_unittest.cc b/content/common/service_manager/service_manager_connection_impl_unittest.cc index 608488a675cdc4..b5fd114c0e6301 100644 --- a/content/common/service_manager/service_manager_connection_impl_unittest.cc +++ b/content/common/service_manager/service_manager_connection_impl_unittest.cc @@ -6,7 +6,7 @@ #include "base/bind_helpers.h" #include "base/synchronization/waitable_event.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/threading/thread.h" #include "mojo/public/cpp/bindings/pending_remote.h" diff --git a/content/public/test/browser_task_environment_unittest.cc b/content/public/test/browser_task_environment_unittest.cc index 1f8b0cd23a155c..769cde3ff58107 100644 --- a/content/public/test/browser_task_environment_unittest.cc +++ b/content/public/test/browser_task_environment_unittest.cc @@ -14,7 +14,7 @@ #include "base/task/current_thread.h" #include "base/task/post_task.h" #include "base/task/thread_pool.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "build/build_config.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h" diff --git a/content/public/test/browser_test_base.cc b/content/public/test/browser_test_base.cc index 4c972bca0f2b80..d2a8465fb2e190 100644 --- a/content/public/test/browser_test_base.cc +++ b/content/public/test/browser_test_base.cc @@ -30,7 +30,7 @@ #include "base/system/sys_info.h" #include "base/task/current_thread.h" #include "base/task/thread_pool/thread_pool_instance.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_run_loop_timeout.h" #include "base/test/test_timeouts.h" #include "base/threading/thread_restrictions.h" diff --git a/content/public/test/browser_test_utils.cc b/content/public/test/browser_test_utils.cc index e930d185070a0d..ddd128138e4b42 100644 --- a/content/public/test/browser_test_utils.cc +++ b/content/public/test/browser_test_utils.cc @@ -27,7 +27,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/synchronization/waitable_event.h" #include "base/task/post_task.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/test_switches.h" #include "base/test/test_timeouts.h" #include "base/threading/thread_task_runner_handle.h" diff --git a/content/public/test/test_utils_unittest.cc b/content/public/test/test_utils_unittest.cc index a923b398fe380e..446efcbac63723 100644 --- a/content/public/test/test_utils_unittest.cc +++ b/content/public/test/test_utils_unittest.cc @@ -6,7 +6,7 @@ #include "base/run_loop.h" #include "base/task/thread_pool.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/threading/platform_thread.h" #include "content/public/browser/browser_task_traits.h" diff --git a/content/public/test/url_loader_interceptor.cc b/content/public/test/url_loader_interceptor.cc index 7d61f2f2b3cbbd..8bea1ae848c497 100644 --- a/content/public/test/url_loader_interceptor.cc +++ b/content/public/test/url_loader_interceptor.cc @@ -15,7 +15,7 @@ #include "base/run_loop.h" #include "base/strings/strcat.h" #include "base/synchronization/lock.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/threading/thread_restrictions.h" #include "build/build_config.h" #include "content/browser/loader/navigation_url_loader_impl.h" diff --git a/content/renderer/categorized_worker_pool_unittest.cc b/content/renderer/categorized_worker_pool_unittest.cc index e2c9bf011bff4c..6953dc5bc2a8a0 100644 --- a/content/renderer/categorized_worker_pool_unittest.cc +++ b/content/renderer/categorized_worker_pool_unittest.cc @@ -4,7 +4,7 @@ #include "content/renderer/categorized_worker_pool.h" #include "base/sequenced_task_runner.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/sequenced_task_runner_test_template.h" #include "base/test/task_runner_test_template.h" #include "base/threading/platform_thread.h" diff --git a/content/renderer/dom_serializer_browsertest.cc b/content/renderer/dom_serializer_browsertest.cc index a3a7df3b39d987..98cd168b124fdd 100644 --- a/content/renderer/dom_serializer_browsertest.cc +++ b/content/renderer/dom_serializer_browsertest.cc @@ -13,7 +13,7 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/task/current_thread.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/threading/thread_restrictions.h" #include "build/build_config.h" #include "content/public/browser/render_view_host.h" diff --git a/content/renderer/render_frame_impl_browsertest.cc b/content/renderer/render_frame_impl_browsertest.cc index 53c4735f6401dc..ace92c187bced7 100644 --- a/content/renderer/render_frame_impl_browsertest.cc +++ b/content/renderer/render_frame_impl_browsertest.cc @@ -14,7 +14,7 @@ #include "base/run_loop.h" #include "base/stl_util.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/gtest_util.h" #include "base/test/scoped_feature_list.h" #include "base/unguessable_token.h" diff --git a/content/renderer/render_thread_impl_discardable_memory_browsertest.cc b/content/renderer/render_thread_impl_discardable_memory_browsertest.cc index c205b8e7172455..4b6aec29858f3a 100644 --- a/content/renderer/render_thread_impl_discardable_memory_browsertest.cc +++ b/content/renderer/render_thread_impl_discardable_memory_browsertest.cc @@ -19,7 +19,7 @@ #include "base/memory/madv_free_discardable_memory_allocator_posix.h" #include "base/memory/madv_free_discardable_memory_posix.h" #include "base/memory/memory_pressure_listener.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/time/time.h" #include "build/build_config.h" #include "components/discardable_memory/client/client_discardable_shared_memory_manager.h" diff --git a/content/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc index 747a741f04a795..7e0cf313ea0b49 100644 --- a/content/renderer/render_view_browsertest.cc +++ b/content/renderer/render_view_browsertest.cc @@ -18,7 +18,7 @@ #include "base/stl_util.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/gmock_callback_support.h" #include "base/threading/thread_task_runner_handle.h" #include "base/time/time.h" diff --git a/content/test/top_frame_population_browsertest.cc b/content/test/top_frame_population_browsertest.cc index 62f90e95a11a4d..54f3436edf8c2e 100644 --- a/content/test/top_frame_population_browsertest.cc +++ b/content/test/top_frame_population_browsertest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "content/public/test/browser_test.h" #include "content/public/test/content_browser_test.h" diff --git a/content/test/trust_token_browsertest.cc b/content/test/trust_token_browsertest.cc index f1806999dcc077..696c8e458faa2b 100644 --- a/content/test/trust_token_browsertest.cc +++ b/content/test/trust_token_browsertest.cc @@ -9,7 +9,7 @@ #include "base/base64.h" #include "base/strings/string_piece.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/threading/thread_restrictions.h" #include "content/browser/web_contents/web_contents_impl.h" diff --git a/content/test/trust_token_origin_trial_browsertest.cc b/content/test/trust_token_origin_trial_browsertest.cc index 4ee301e528b105..9b7871c1604580 100644 --- a/content/test/trust_token_origin_trial_browsertest.cc +++ b/content/test/trust_token_origin_trial_browsertest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/strings/string_util.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/thread_annotations.h" #include "content/public/test/browser_test.h" diff --git a/content/test/trust_token_parameters_browsertest.cc b/content/test/trust_token_parameters_browsertest.cc index 8f6cde18e9526f..526e4385976ca4 100644 --- a/content/test/trust_token_parameters_browsertest.cc +++ b/content/test/trust_token_parameters_browsertest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "content/public/common/network_service_util.h" #include "content/public/test/browser_test.h" diff --git a/content/test/url_loader_interceptor_test.cc b/content/test/url_loader_interceptor_test.cc index b7a6e8f747fe26..d36ba1673da6ba 100644 --- a/content/test/url_loader_interceptor_test.cc +++ b/content/test/url_loader_interceptor_test.cc @@ -5,7 +5,7 @@ #include "content/public/test/url_loader_interceptor.h" #include "base/command_line.h" #include "base/single_thread_task_runner.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/threading/thread_task_runner_handle.h" #include "build/build_config.h" #include "content/public/browser/browser_context.h" diff --git a/device/bluetooth/adapter_unittest.cc b/device/bluetooth/adapter_unittest.cc index febb3ba59498f9..b9823086ab66d8 100644 --- a/device/bluetooth/adapter_unittest.cc +++ b/device/bluetooth/adapter_unittest.cc @@ -7,7 +7,7 @@ #include "base/callback_helpers.h" #include "base/run_loop.h" #include "base/task/thread_pool.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/gmock_callback_support.h" #include "base/test/task_environment.h" #include "build/build_config.h" diff --git a/device/bluetooth/bluetooth_adapter_mac_unittest.mm b/device/bluetooth/bluetooth_adapter_mac_unittest.mm index 3eb3f81eaea774..6540c036552d24 100644 --- a/device/bluetooth/bluetooth_adapter_mac_unittest.mm +++ b/device/bluetooth/bluetooth_adapter_mac_unittest.mm @@ -16,7 +16,7 @@ #include "base/memory/ptr_util.h" #include "base/memory/ref_counted.h" #include "base/sequenced_task_runner.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/test/test_simple_task_runner.h" #include "build/build_config.h" diff --git a/device/bluetooth/bluetooth_adapter_unittest.cc b/device/bluetooth/bluetooth_adapter_unittest.cc index 38668cb8c56af9..290b21b1e63c9a 100644 --- a/device/bluetooth/bluetooth_adapter_unittest.cc +++ b/device/bluetooth/bluetooth_adapter_unittest.cc @@ -17,7 +17,7 @@ #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/threading/thread_task_runner_handle.h" #include "build/build_config.h" diff --git a/device/bluetooth/bluetooth_adapter_win_unittest.cc b/device/bluetooth/bluetooth_adapter_win_unittest.cc index 6d5eb30b97e168..9cd71b4c1d225b 100644 --- a/device/bluetooth/bluetooth_adapter_win_unittest.cc +++ b/device/bluetooth/bluetooth_adapter_win_unittest.cc @@ -11,7 +11,7 @@ #include "base/memory/ptr_util.h" #include "base/memory/ref_counted.h" #include "base/strings/string_number_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/test_simple_task_runner.h" #include "device/bluetooth/bluetooth_adapter.h" #include "device/bluetooth/bluetooth_adapter_win.h" diff --git a/device/bluetooth/bluetooth_device_unittest.cc b/device/bluetooth/bluetooth_device_unittest.cc index 43ff071c3093bb..dee3fb95b591b2 100644 --- a/device/bluetooth/bluetooth_device_unittest.cc +++ b/device/bluetooth/bluetooth_device_unittest.cc @@ -11,7 +11,7 @@ #include "base/run_loop.h" #include "base/stl_util.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" #include "device/bluetooth/bluetooth_remote_gatt_service.h" diff --git a/device/bluetooth/bluetooth_low_energy_advertisement_manager_mac_unittest.mm b/device/bluetooth/bluetooth_low_energy_advertisement_manager_mac_unittest.mm index c7b1c9579bc163..da96ade4447997 100644 --- a/device/bluetooth/bluetooth_low_energy_advertisement_manager_mac_unittest.mm +++ b/device/bluetooth/bluetooth_low_energy_advertisement_manager_mac_unittest.mm @@ -9,7 +9,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/memory/ref_counted.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/test_simple_task_runner.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/ocmock/OCMock/OCMock.h" diff --git a/device/bluetooth/bluetooth_remote_gatt_characteristic_unittest.cc b/device/bluetooth/bluetooth_remote_gatt_characteristic_unittest.cc index f4d172acc705d6..f0cc2fb7ff1a6c 100644 --- a/device/bluetooth/bluetooth_remote_gatt_characteristic_unittest.cc +++ b/device/bluetooth/bluetooth_remote_gatt_characteristic_unittest.cc @@ -11,7 +11,7 @@ #include "base/logging.h" #include "base/run_loop.h" #include "base/stl_util.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "build/build_config.h" #include "device/bluetooth/bluetooth_remote_gatt_characteristic.h" #include "device/bluetooth/bluetooth_remote_gatt_service.h" diff --git a/device/bluetooth/bluez/bluetooth_adapter_profile_bluez_unittest.cc b/device/bluetooth/bluez/bluetooth_adapter_profile_bluez_unittest.cc index 985034de816c4d..1681eeda24eb1a 100644 --- a/device/bluetooth/bluez/bluetooth_adapter_profile_bluez_unittest.cc +++ b/device/bluetooth/bluez/bluetooth_adapter_profile_bluez_unittest.cc @@ -9,7 +9,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "device/bluetooth/bluetooth_adapter.h" #include "device/bluetooth/bluetooth_adapter_factory.h" diff --git a/device/bluetooth/bluez/bluetooth_advertisement_bluez_unittest.cc b/device/bluetooth/bluez/bluetooth_advertisement_bluez_unittest.cc index 8ce1f88b9a3ebb..676509e627e401 100644 --- a/device/bluetooth/bluez/bluetooth_advertisement_bluez_unittest.cc +++ b/device/bluetooth/bluez/bluetooth_advertisement_bluez_unittest.cc @@ -12,7 +12,7 @@ #include "base/memory/ptr_util.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "device/bluetooth/bluetooth_adapter.h" #include "device/bluetooth/bluetooth_adapter_factory.h" diff --git a/device/bluetooth/bluez/bluetooth_bluez_unittest.cc b/device/bluetooth/bluez/bluetooth_bluez_unittest.cc index 27af3b5b1394f5..ddd837c4d830c6 100644 --- a/device/bluetooth/bluez/bluetooth_bluez_unittest.cc +++ b/device/bluetooth/bluez/bluetooth_bluez_unittest.cc @@ -15,7 +15,7 @@ #include "base/stl_util.h" #include "base/strings/utf_string_conversions.h" #include "base/task/current_thread.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "build/chromeos_buildflags.h" #include "dbus/object_path.h" diff --git a/device/bluetooth/bluez/bluetooth_gatt_bluez_unittest.cc b/device/bluetooth/bluez/bluetooth_gatt_bluez_unittest.cc index 168ba3b757efe6..ea896a1ba0fdf4 100644 --- a/device/bluetooth/bluez/bluetooth_gatt_bluez_unittest.cc +++ b/device/bluetooth/bluez/bluetooth_gatt_bluez_unittest.cc @@ -12,7 +12,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "build/chromeos_buildflags.h" #include "dbus/object_path.h" diff --git a/device/bluetooth/bluez/bluetooth_socket_bluez_unittest.cc b/device/bluetooth/bluez/bluetooth_socket_bluez_unittest.cc index b73fd3b74cbd1f..b8bc4a25722057 100644 --- a/device/bluetooth/bluez/bluetooth_socket_bluez_unittest.cc +++ b/device/bluetooth/bluez/bluetooth_socket_bluez_unittest.cc @@ -10,7 +10,7 @@ #include "base/bind_helpers.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "device/bluetooth/bluetooth_adapter.h" #include "device/bluetooth/bluetooth_adapter_factory.h" diff --git a/device/bluetooth/test/bluetooth_test.cc b/device/bluetooth/test/bluetooth_test.cc index 01be431391f8a0..099dd884330a09 100644 --- a/device/bluetooth/test/bluetooth_test.cc +++ b/device/bluetooth/test/bluetooth_test.cc @@ -12,7 +12,7 @@ #include "base/memory/ptr_util.h" #include "base/notreached.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "device/bluetooth/bluetooth_adapter.h" #include "device/bluetooth/bluetooth_common.h" diff --git a/device/bluetooth/test/bluetooth_test_win.cc b/device/bluetooth/test/bluetooth_test_win.cc index 7d71a0ac98ecbd..bfdb4f81fc66ee 100644 --- a/device/bluetooth/test/bluetooth_test_win.cc +++ b/device/bluetooth/test/bluetooth_test_win.cc @@ -21,7 +21,7 @@ #include "base/run_loop.h" #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/test_pending_task.h" #include "base/time/time.h" #include "base/win/vector.h" diff --git a/device/bluetooth/test/fake_bluetooth_le_device_winrt.cc b/device/bluetooth/test/fake_bluetooth_le_device_winrt.cc index c40645a4e2adbf..aaf5ec7cc2c391 100644 --- a/device/bluetooth/test/fake_bluetooth_le_device_winrt.cc +++ b/device/bluetooth/test/fake_bluetooth_le_device_winrt.cc @@ -10,7 +10,7 @@ #include "base/bind.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/threading/thread_task_runner_handle.h" #include "base/win/async_operation.h" #include "base/win/scoped_hstring.h" diff --git a/device/bluetooth/test/fake_device_information_custom_pairing_winrt.cc b/device/bluetooth/test/fake_device_information_custom_pairing_winrt.cc index 898a1877fae5d8..e9f8dadf52a637 100644 --- a/device/bluetooth/test/fake_device_information_custom_pairing_winrt.cc +++ b/device/bluetooth/test/fake_device_information_custom_pairing_winrt.cc @@ -9,7 +9,7 @@ #include #include "base/bind.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/threading/thread_task_runner_handle.h" #include "base/win/async_operation.h" #include "device/bluetooth/test/fake_device_pairing_requested_event_args_winrt.h" diff --git a/device/bluetooth/test/fake_gatt_session_winrt.cc b/device/bluetooth/test/fake_gatt_session_winrt.cc index c7778e785ad2da..4dd05adf2fa2b8 100644 --- a/device/bluetooth/test/fake_gatt_session_winrt.cc +++ b/device/bluetooth/test/fake_gatt_session_winrt.cc @@ -6,7 +6,7 @@ #include -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/threading/thread_task_runner_handle.h" #include "base/win/async_operation.h" #include "device/bluetooth/test/bluetooth_test_win.h" diff --git a/device/bluetooth/test/fake_radio_winrt.cc b/device/bluetooth/test/fake_radio_winrt.cc index e77b6c641e1196..25ec78dae8b008 100644 --- a/device/bluetooth/test/fake_radio_winrt.cc +++ b/device/bluetooth/test/fake_radio_winrt.cc @@ -7,7 +7,7 @@ #include #include "base/bind.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/threading/thread_task_runner_handle.h" #include "base/win/async_operation.h" diff --git a/device/fido/fake_fido_discovery_unittest.cc b/device/fido/fake_fido_discovery_unittest.cc index 6161e32e2837db..cc291729c8928c 100644 --- a/device/fido/fake_fido_discovery_unittest.cc +++ b/device/fido/fake_fido_discovery_unittest.cc @@ -7,7 +7,7 @@ #include #include "base/macros.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/threading/thread_task_runner_handle.h" #include "build/build_config.h" diff --git a/device/fido/test_callback_receiver_unittest.cc b/device/fido/test_callback_receiver_unittest.cc index f8184db3521927..6fde23bac918cc 100644 --- a/device/fido/test_callback_receiver_unittest.cc +++ b/device/fido/test_callback_receiver_unittest.cc @@ -8,7 +8,7 @@ #include #include -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/threading/thread_task_runner_handle.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/device/fido/virtual_ctap2_device_unittest.cc b/device/fido/virtual_ctap2_device_unittest.cc index c8b27854e78469..102e8ec9616661 100644 --- a/device/fido/virtual_ctap2_device_unittest.cc +++ b/device/fido/virtual_ctap2_device_unittest.cc @@ -8,7 +8,7 @@ #include "base/callback.h" #include "base/memory/scoped_refptr.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "components/cbor/reader.h" #include "device/fido/attestation_statement.h" diff --git a/device/fido/virtual_u2f_device_unittest.cc b/device/fido/virtual_u2f_device_unittest.cc index 0d10805f85a01d..b01ad5d277a499 100644 --- a/device/fido/virtual_u2f_device_unittest.cc +++ b/device/fido/virtual_u2f_device_unittest.cc @@ -8,7 +8,7 @@ #include "base/callback.h" #include "base/memory/scoped_refptr.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "device/fido/fido_parsing_utils.h" #include "device/fido/fido_test_data.h" diff --git a/docs/callback.md b/docs/callback.md index 5a77276fb01bb5..fa21023ab38732 100644 --- a/docs/callback.md +++ b/docs/callback.md @@ -232,7 +232,7 @@ When writing tests, it is often useful to capture arguments that need to be modified in a callback. ``` cpp -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" int i = 2; base::Callback lambda_cb = base::BindLambdaForTesting([&]() { i++; }); diff --git a/extensions/browser/api/socket/mojo_data_pump_unittest.cc b/extensions/browser/api/socket/mojo_data_pump_unittest.cc index 1eda573165a617..64d0a19413092f 100644 --- a/extensions/browser/api/socket/mojo_data_pump_unittest.cc +++ b/extensions/browser/api/socket/mojo_data_pump_unittest.cc @@ -9,7 +9,7 @@ #include #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "mojo/public/cpp/system/data_pipe.h" #include "net/base/test_completion_callback.h" diff --git a/extensions/browser/content_verify_job_unittest.cc b/extensions/browser/content_verify_job_unittest.cc index bbf6a573797444..940f4eadba8d13 100644 --- a/extensions/browser/content_verify_job_unittest.cc +++ b/extensions/browser/content_verify_job_unittest.cc @@ -8,7 +8,7 @@ #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/path_service.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/version.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h" diff --git a/extensions/renderer/bindings/api_event_handler_unittest.cc b/extensions/renderer/bindings/api_event_handler_unittest.cc index 92b06ad0af36bb..2d329b66788742 100644 --- a/extensions/renderer/bindings/api_event_handler_unittest.cc +++ b/extensions/renderer/bindings/api_event_handler_unittest.cc @@ -11,7 +11,7 @@ #include "base/optional.h" #include "base/run_loop.h" #include "base/stl_util.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/mock_callback.h" #include "base/values.h" #include "extensions/common/event_filtering_info.h" diff --git a/extensions/renderer/native_extension_bindings_system_unittest.cc b/extensions/renderer/native_extension_bindings_system_unittest.cc index cdad6defc3eba0..92fe4e08cc6d60 100644 --- a/extensions/renderer/native_extension_bindings_system_unittest.cc +++ b/extensions/renderer/native_extension_bindings_system_unittest.cc @@ -7,7 +7,7 @@ #include "base/macros.h" #include "base/stl_util.h" #include "base/strings/stringprintf.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "components/crx_file/id_util.h" #include "extensions/common/extension_api.h" #include "extensions/common/extension_builder.h" diff --git a/extensions/shell/browser/shell_desktop_controller_aura_browsertest.cc b/extensions/shell/browser/shell_desktop_controller_aura_browsertest.cc index 1562cff8a57a50..58174ce6f0506f 100644 --- a/extensions/shell/browser/shell_desktop_controller_aura_browsertest.cc +++ b/extensions/shell/browser/shell_desktop_controller_aura_browsertest.cc @@ -7,7 +7,7 @@ #include "base/bind.h" #include "base/macros.h" #include "base/task/post_task.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/time/time.h" #include "components/keep_alive_registry/keep_alive_registry.h" #include "extensions/browser/app_window/app_window.h" diff --git a/fuchsia/base/legacymetrics_client_unittest.cc b/fuchsia/base/legacymetrics_client_unittest.cc index 22d0c41f2963ce..433a4603c68864 100644 --- a/fuchsia/base/legacymetrics_client_unittest.cc +++ b/fuchsia/base/legacymetrics_client_unittest.cc @@ -10,7 +10,7 @@ #include "base/fuchsia/scoped_service_binding.h" #include "base/fuchsia/test_component_context_for_process.h" #include "base/metrics/histogram_macros.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/threading/thread_task_runner_handle.h" #include "fuchsia/base/legacymetrics_client.h" diff --git a/fuchsia/engine/browser/cookie_manager_impl_unittest.cc b/fuchsia/engine/browser/cookie_manager_impl_unittest.cc index b40b0710bac260..e8c4f5ab23ebd1 100644 --- a/fuchsia/engine/browser/cookie_manager_impl_unittest.cc +++ b/fuchsia/engine/browser/cookie_manager_impl_unittest.cc @@ -11,7 +11,7 @@ #include "base/macros.h" #include "base/optional.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "fuchsia/base/fit_adapter.h" #include "fuchsia/base/result_receiver.h" diff --git a/fuchsia/engine/browser/fake_semantic_tree.cc b/fuchsia/engine/browser/fake_semantic_tree.cc index 7986a96e08aa6a..1c3c006f07debc 100644 --- a/fuchsia/engine/browser/fake_semantic_tree.cc +++ b/fuchsia/engine/browser/fake_semantic_tree.cc @@ -10,7 +10,7 @@ #include "base/auto_reset.h" #include "base/notreached.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "testing/gtest/include/gtest/gtest.h" FakeSemanticTree::FakeSemanticTree() : semantic_tree_binding_(this) {} diff --git a/fuchsia/engine/browser/media_player_impl_unittest.cc b/fuchsia/engine/browser/media_player_impl_unittest.cc index dc9302c821837c..5eea168dd8e573 100644 --- a/fuchsia/engine/browser/media_player_impl_unittest.cc +++ b/fuchsia/engine/browser/media_player_impl_unittest.cc @@ -6,7 +6,7 @@ #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "content/public/browser/media_session.h" #include "mojo/public/cpp/bindings/pending_remote.h" diff --git a/fuchsia/engine/context_provider_impl_unittest.cc b/fuchsia/engine/context_provider_impl_unittest.cc index b3952651184323..9ef8dc5f8c0a44 100644 --- a/fuchsia/engine/context_provider_impl_unittest.cc +++ b/fuchsia/engine/context_provider_impl_unittest.cc @@ -29,7 +29,7 @@ #include "base/fuchsia/file_utils.h" #include "base/fuchsia/fuchsia_logging.h" #include "base/path_service.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/multiprocess_test.h" #include "base/test/task_environment.h" #include "base/test/test_timeouts.h" diff --git a/fuchsia/engine/test_debug_listener.cc b/fuchsia/engine/test_debug_listener.cc index da6064901dc3f6..4d64e643ec17d3 100644 --- a/fuchsia/engine/test_debug_listener.cc +++ b/fuchsia/engine/test_debug_listener.cc @@ -6,7 +6,7 @@ #include "base/auto_reset.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "testing/gtest/include/gtest/gtest.h" TestDebugListener::TestDebugListener() {} diff --git a/fuchsia/engine/web_engine_integration_logging_test.cc b/fuchsia/engine/web_engine_integration_logging_test.cc index 3b193ff3525fd6..2dffdbbf29052a 100644 --- a/fuchsia/engine/web_engine_integration_logging_test.cc +++ b/fuchsia/engine/web_engine_integration_logging_test.cc @@ -10,7 +10,7 @@ #include "base/fuchsia/process_context.h" #include "base/fuchsia/test_log_listener_safe.h" #include "base/strings/string_piece.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "fuchsia/base/context_provider_test_connector.h" #include "fuchsia/base/frame_test_util.h" #include "fuchsia/engine/web_engine_integration_test_base.h" diff --git a/fuchsia/runners/cast/api_bindings_client_browsertest.cc b/fuchsia/runners/cast/api_bindings_client_browsertest.cc index a818504c36943b..16bdc883d33c67 100644 --- a/fuchsia/runners/cast/api_bindings_client_browsertest.cc +++ b/fuchsia/runners/cast/api_bindings_client_browsertest.cc @@ -9,7 +9,7 @@ #include "base/base_paths_fuchsia.h" #include "base/files/file_util.h" #include "base/path_service.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "components/cast/message_port/message_port_fuchsia.h" #include "content/public/test/browser_test.h" #include "fuchsia/base/fit_adapter.h" diff --git a/fuchsia/runners/cast/cast_runner_integration_test.cc b/fuchsia/runners/cast/cast_runner_integration_test.cc index e9d4a4069f2672..710f468ea8010e 100644 --- a/fuchsia/runners/cast/cast_runner_integration_test.cc +++ b/fuchsia/runners/cast/cast_runner_integration_test.cc @@ -25,7 +25,7 @@ #include "base/path_service.h" #include "base/strings/strcat.h" #include "base/strings/stringprintf.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/threading/sequenced_task_runner_handle.h" #include "build/build_config.h" diff --git a/google_apis/gaia/gaia_auth_fetcher_unittest.cc b/google_apis/gaia/gaia_auth_fetcher_unittest.cc index 1b6d6d9a0b9119..90c6033e924d35 100644 --- a/google_apis/gaia/gaia_auth_fetcher_unittest.cc +++ b/google_apis/gaia/gaia_auth_fetcher_unittest.cc @@ -14,7 +14,7 @@ #include "base/memory/ref_counted.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/values.h" #include "build/build_config.h" diff --git a/google_apis/gcm/base/socket_stream_unittest.cc b/google_apis/gcm/base/socket_stream_unittest.cc index 079d1189886a17..a12f09034a223f 100644 --- a/google_apis/gcm/base/socket_stream_unittest.cc +++ b/google_apis/gcm/base/socket_stream_unittest.cc @@ -15,7 +15,7 @@ #include "base/run_loop.h" #include "base/stl_util.h" #include "base/strings/string_piece.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "mojo/public/cpp/bindings/pending_remote.h" #include "mojo/public/cpp/bindings/remote.h" diff --git a/google_apis/gcm/engine/connection_handler_impl_unittest.cc b/google_apis/gcm/engine/connection_handler_impl_unittest.cc index 1c45b725e3460d..87f4e1ab76e288 100644 --- a/google_apis/gcm/engine/connection_handler_impl_unittest.cc +++ b/google_apis/gcm/engine/connection_handler_impl_unittest.cc @@ -13,7 +13,7 @@ #include "base/bind.h" #include "base/run_loop.h" #include "base/strings/string_number_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/test/test_timeouts.h" #include "base/threading/thread_task_runner_handle.h" diff --git a/gpu/ipc/host/shader_disk_cache_unittest.cc b/gpu/ipc/host/shader_disk_cache_unittest.cc index 6f53c16859df60..e0456b9d2f7e1c 100644 --- a/gpu/ipc/host/shader_disk_cache_unittest.cc +++ b/gpu/ipc/host/shader_disk_cache_unittest.cc @@ -6,7 +6,7 @@ #include "base/files/scoped_temp_dir.h" #include "base/macros.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "net/base/test_completion_callback.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/headless/test/headless_origin_trials_browsertest.cc b/headless/test/headless_origin_trials_browsertest.cc index 8c000c0b52bf70..2ceaff66911ffc 100644 --- a/headless/test/headless_origin_trials_browsertest.cc +++ b/headless/test/headless_origin_trials_browsertest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/strings/strcat.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "build/build_config.h" #include "content/public/test/browser_test.h" #include "content/public/test/content_browser_test.h" diff --git a/ios/chrome/browser/history/history_tab_helper_unittest.mm b/ios/chrome/browser/history/history_tab_helper_unittest.mm index 6220cfccb73ec9..beed1eb8bfa4d5 100644 --- a/ios/chrome/browser/history/history_tab_helper_unittest.mm +++ b/ios/chrome/browser/history/history_tab_helper_unittest.mm @@ -8,7 +8,7 @@ #include "base/callback.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "components/history/core/browser/history_service.h" #include "components/keyed_service/core/service_access_type.h" diff --git a/ios/chrome/browser/passwords/ios_chrome_password_check_manager_unittest.mm b/ios/chrome/browser/passwords/ios_chrome_password_check_manager_unittest.mm index cbfc25df870a9a..79a07a493789e3 100644 --- a/ios/chrome/browser/passwords/ios_chrome_password_check_manager_unittest.mm +++ b/ios/chrome/browser/passwords/ios_chrome_password_check_manager_unittest.mm @@ -15,7 +15,7 @@ #include "base/strings/string_piece.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "components/password_manager/core/browser/bulk_leak_check_service.h" #include "components/password_manager/core/browser/mock_bulk_leak_check_service.h" diff --git a/ios/chrome/browser/policy/reporting/browser_report_generator_ios_unittest.mm b/ios/chrome/browser/policy/reporting/browser_report_generator_ios_unittest.mm index 643807acabbe8f..c1582fa4821c43 100644 --- a/ios/chrome/browser/policy/reporting/browser_report_generator_ios_unittest.mm +++ b/ios/chrome/browser/policy/reporting/browser_report_generator_ios_unittest.mm @@ -12,7 +12,7 @@ #include "base/files/file_path.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "ios/chrome/browser/browser_state/test_chrome_browser_state.h" #include "ios/chrome/browser/browser_state/test_chrome_browser_state_manager.h" diff --git a/ios/chrome/browser/policy/reporting/profile_report_generator_ios_unittest.mm b/ios/chrome/browser/policy/reporting/profile_report_generator_ios_unittest.mm index 78f97aafa4f8ae..b57cd8488be6bc 100644 --- a/ios/chrome/browser/policy/reporting/profile_report_generator_ios_unittest.mm +++ b/ios/chrome/browser/policy/reporting/profile_report_generator_ios_unittest.mm @@ -13,7 +13,7 @@ #include "base/files/file_path.h" #include "base/run_loop.h" #include "base/strings/sys_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "components/policy/core/common/mock_policy_service.h" #include "components/policy/core/common/policy_map.h" #include "components/policy/core/common/schema_registry.h" diff --git a/ios/chrome/browser/policy/reporting/report_generator_ios_unittest.mm b/ios/chrome/browser/policy/reporting/report_generator_ios_unittest.mm index 415bb48b097ae6..42d40bd29a0cd9 100644 --- a/ios/chrome/browser/policy/reporting/report_generator_ios_unittest.mm +++ b/ios/chrome/browser/policy/reporting/report_generator_ios_unittest.mm @@ -12,7 +12,7 @@ #include "base/files/file_path.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "components/policy/core/common/cloud/cloud_policy_util.h" #include "components/policy/core/common/mock_policy_service.h" diff --git a/ios/chrome/browser/safe_browsing/safe_browsing_service_unittest.mm b/ios/chrome/browser/safe_browsing/safe_browsing_service_unittest.mm index 000868181c6b2d..350bcc68cd0121 100644 --- a/ios/chrome/browser/safe_browsing/safe_browsing_service_unittest.mm +++ b/ios/chrome/browser/safe_browsing/safe_browsing_service_unittest.mm @@ -8,7 +8,7 @@ #include "base/path_service.h" #include "base/run_loop.h" #include "base/task/post_task.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "components/prefs/pref_service.h" #include "components/safe_browsing/core/browser/safe_browsing_url_checker_impl.h" diff --git a/ios/chrome/browser/signin/authentication_service_unittest.mm b/ios/chrome/browser/signin/authentication_service_unittest.mm index 54f6d05c47947d..9dc209cfdb3342 100644 --- a/ios/chrome/browser/signin/authentication_service_unittest.mm +++ b/ios/chrome/browser/signin/authentication_service_unittest.mm @@ -8,7 +8,7 @@ #include "base/run_loop.h" #include "base/scoped_observer.h" #include "base/strings/sys_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "components/keyed_service/core/service_access_type.h" #include "components/pref_registry/pref_registry_syncable.h" #include "components/prefs/pref_registry_simple.h" diff --git a/ios/chrome/browser/signin/gaia_auth_fetcher_ios_ns_url_session_bridge_unittests.mm b/ios/chrome/browser/signin/gaia_auth_fetcher_ios_ns_url_session_bridge_unittests.mm index 6e1293e0c57b34..467321f860c3a3 100644 --- a/ios/chrome/browser/signin/gaia_auth_fetcher_ios_ns_url_session_bridge_unittests.mm +++ b/ios/chrome/browser/signin/gaia_auth_fetcher_ios_ns_url_session_bridge_unittests.mm @@ -10,7 +10,7 @@ #include "base/bind_helpers.h" #include "base/ios/ios_util.h" #include "base/strings/sys_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #import "base/test/ios/wait_util.h" #include "ios/chrome/browser/browser_state/test_chrome_browser_state.h" #include "ios/chrome/browser/signin/gaia_auth_fetcher_ios_bridge.h" diff --git a/ios/chrome/browser/ui/settings/password/passwords_table_view_controller_unittest.mm b/ios/chrome/browser/ui/settings/password/passwords_table_view_controller_unittest.mm index 4b58d5d50070a0..f46f0a2710802f 100644 --- a/ios/chrome/browser/ui/settings/password/passwords_table_view_controller_unittest.mm +++ b/ios/chrome/browser/ui/settings/password/passwords_table_view_controller_unittest.mm @@ -9,7 +9,7 @@ #include "base/strings/string_piece.h" #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #import "base/test/ios/wait_util.h" #include "base/test/scoped_feature_list.h" #include "components/keyed_service/core/service_access_type.h" diff --git a/ios/net/cookies/cookie_store_ios_unittest.mm b/ios/net/cookies/cookie_store_ios_unittest.mm index 077854d9a93e91..6baf83fef166c6 100644 --- a/ios/net/cookies/cookie_store_ios_unittest.mm +++ b/ios/net/cookies/cookie_store_ios_unittest.mm @@ -14,7 +14,7 @@ #include "base/optional.h" #include "base/run_loop.h" #include "base/strings/sys_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "ios/net/cookies/cookie_store_ios_client.h" #import "ios/net/cookies/cookie_store_ios_test_util.h" diff --git a/ios/web/cookie_blocking_inttest.mm b/ios/web/cookie_blocking_inttest.mm index 2b63a998133de1..aee827b4ff4b33 100644 --- a/ios/web/cookie_blocking_inttest.mm +++ b/ios/web/cookie_blocking_inttest.mm @@ -5,7 +5,7 @@ #import #include "base/strings/utf_string_conversions.h" -#import "base/test/bind_test_util.h" +#import "base/test/bind.h" #import "base/test/ios/wait_util.h" #include "ios/testing/embedded_test_server_handlers.h" #include "ios/web/public/browsing_data/cookie_blocking_mode.h" diff --git a/ios/web/url_loader_inttest.mm b/ios/web/url_loader_inttest.mm index 0542cbf6be0d55..e7c1d7d18034b3 100644 --- a/ios/web/url_loader_inttest.mm +++ b/ios/web/url_loader_inttest.mm @@ -5,7 +5,7 @@ #include #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #import "ios/web/public/test/web_test.h" #import "ios/web/public/web_client.h" #include "net/test/embedded_test_server/embedded_test_server.h" diff --git a/ios/web_view/internal/autofill/cwv_credit_card_saver_unittest.mm b/ios/web_view/internal/autofill/cwv_credit_card_saver_unittest.mm index c04c2a35314e84..979aac812f177c 100644 --- a/ios/web_view/internal/autofill/cwv_credit_card_saver_unittest.mm +++ b/ios/web_view/internal/autofill/cwv_credit_card_saver_unittest.mm @@ -9,7 +9,7 @@ #include "base/bind.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #import "base/test/ios/wait_util.h" #include "components/autofill/core/browser/autofill_client.h" #include "components/autofill/core/browser/autofill_test_utils.h" diff --git a/ios/web_view/internal/signin/web_view_device_accounts_provider_impl_unittest.mm b/ios/web_view/internal/signin/web_view_device_accounts_provider_impl_unittest.mm index a65d71febcc951..f1e6d36f283b2c 100644 --- a/ios/web_view/internal/signin/web_view_device_accounts_provider_impl_unittest.mm +++ b/ios/web_view/internal/signin/web_view_device_accounts_provider_impl_unittest.mm @@ -10,7 +10,7 @@ #include "base/bind.h" #include "base/callback.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "components/signin/public/identity_manager/ios/device_accounts_provider.h" #import "ios/web_view/public/cwv_identity.h" #import "ios/web_view/public/cwv_sync_controller.h" diff --git a/ios/web_view/internal/sync/cwv_sync_controller_unittest.mm b/ios/web_view/internal/sync/cwv_sync_controller_unittest.mm index 0bc41d7fafd023..375a96f75765ed 100644 --- a/ios/web_view/internal/sync/cwv_sync_controller_unittest.mm +++ b/ios/web_view/internal/sync/cwv_sync_controller_unittest.mm @@ -11,7 +11,7 @@ #include "base/callback.h" #include "base/files/file_path.h" #include "base/strings/sys_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h" #include "components/autofill/core/common/autofill_prefs.h" diff --git a/ipc/ipc_channel_mojo_unittest.cc b/ipc/ipc_channel_mojo_unittest.cc index ae9d1a134981cd..5951f0c140aee6 100644 --- a/ipc/ipc_channel_mojo_unittest.cc +++ b/ipc/ipc_channel_mojo_unittest.cc @@ -32,7 +32,7 @@ #include "base/single_thread_task_runner.h" #include "base/strings/stringprintf.h" #include "base/synchronization/waitable_event.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/test/test_io_thread.h" #include "base/test/test_shared_memory_util.h" diff --git a/media/audio/audio_output_unittest.cc b/media/audio/audio_output_unittest.cc index b4bfe90b86213f..c69ba66da6f6c6 100644 --- a/media/audio/audio_output_unittest.cc +++ b/media/audio/audio_output_unittest.cc @@ -9,7 +9,7 @@ #include "base/command_line.h" #include "base/memory/aligned_memory.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h" #include "base/test/test_timeouts.h" diff --git a/media/base/offloading_video_encoder_unittest.cc b/media/base/offloading_video_encoder_unittest.cc index 5eb8c12a0a3979..778fce4af0c496 100644 --- a/media/base/offloading_video_encoder_unittest.cc +++ b/media/base/offloading_video_encoder_unittest.cc @@ -9,7 +9,7 @@ #include "base/bind_helpers.h" #include "base/run_loop.h" #include "base/sequenced_task_runner.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/gmock_callback_support.h" #include "base/test/task_environment.h" #include "media/base/media_util.h" diff --git a/media/blink/webmediaplayer_impl_unittest.cc b/media/blink/webmediaplayer_impl_unittest.cc index e430090227966f..54b343640d0483 100644 --- a/media/blink/webmediaplayer_impl_unittest.cc +++ b/media/blink/webmediaplayer_impl_unittest.cc @@ -18,7 +18,7 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "base/task_runner_util.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/gmock_callback_support.h" #include "base/test/mock_callback.h" #include "base/test/scoped_feature_list.h" diff --git a/media/capture/video/chromeos/camera_device_delegate_unittest.cc b/media/capture/video/chromeos/camera_device_delegate_unittest.cc index 8c569077b7be47..2891cccd10414c 100644 --- a/media/capture/video/chromeos/camera_device_delegate_unittest.cc +++ b/media/capture/video/chromeos/camera_device_delegate_unittest.cc @@ -13,7 +13,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "media/base/bind_to_current_loop.h" #include "media/capture/video/chromeos/camera_buffer_factory.h" diff --git a/media/capture/video/chromeos/camera_hal_delegate_unittest.cc b/media/capture/video/chromeos/camera_hal_delegate_unittest.cc index c7469a70d0b277..89208e5610f7f4 100644 --- a/media/capture/video/chromeos/camera_hal_delegate_unittest.cc +++ b/media/capture/video/chromeos/camera_hal_delegate_unittest.cc @@ -11,7 +11,7 @@ #include #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "media/capture/video/chromeos/mock_camera_module.h" #include "media/capture/video/chromeos/mock_vendor_tag_ops.h" diff --git a/media/capture/video/fake_video_capture_device_unittest.cc b/media/capture/video/fake_video_capture_device_unittest.cc index aa043fabb6f665..b87657666ddb06 100644 --- a/media/capture/video/fake_video_capture_device_unittest.cc +++ b/media/capture/video/fake_video_capture_device_unittest.cc @@ -13,7 +13,7 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/test/test_timeouts.h" #include "base/threading/thread.h" diff --git a/media/capture/video/fuchsia/video_capture_device_factory_fuchsia_test.cc b/media/capture/video/fuchsia/video_capture_device_factory_fuchsia_test.cc index 9b660dc8e5d826..644d25d8d8e2a6 100644 --- a/media/capture/video/fuchsia/video_capture_device_factory_fuchsia_test.cc +++ b/media/capture/video/fuchsia/video_capture_device_factory_fuchsia_test.cc @@ -6,7 +6,7 @@ #include "base/fuchsia/test_component_context_for_process.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "media/fuchsia/camera/fake_fuchsia_camera.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/media/capture/video/fuchsia/video_capture_device_fuchsia_test.cc b/media/capture/video/fuchsia/video_capture_device_fuchsia_test.cc index 532f78af77acb5..849fa5f8086f2e 100644 --- a/media/capture/video/fuchsia/video_capture_device_fuchsia_test.cc +++ b/media/capture/video/fuchsia/video_capture_device_fuchsia_test.cc @@ -5,7 +5,7 @@ #include "media/capture/video/fuchsia/video_capture_device_fuchsia.h" #include "base/fuchsia/test_component_context_for_process.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "media/capture/video/fuchsia/video_capture_device_factory_fuchsia.h" #include "media/fuchsia/camera/fake_fuchsia_camera.h" diff --git a/media/capture/video/linux/video_capture_device_factory_linux_unittest.cc b/media/capture/video/linux/video_capture_device_factory_linux_unittest.cc index 39f14546f5e0eb..a98b8c0eb78b52 100644 --- a/media/capture/video/linux/video_capture_device_factory_linux_unittest.cc +++ b/media/capture/video/linux/video_capture_device_factory_linux_unittest.cc @@ -5,7 +5,7 @@ #include "media/capture/video/linux/video_capture_device_factory_linux.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "media/capture/video/linux/fake_device_provider.h" #include "media/capture/video/linux/fake_v4l2_impl.h" diff --git a/media/capture/video/mac/test/video_capture_test_utils_mac.mm b/media/capture/video/mac/test/video_capture_test_utils_mac.mm index 1e6b8c88460bf5..63de11c52c02e0 100644 --- a/media/capture/video/mac/test/video_capture_test_utils_mac.mm +++ b/media/capture/video/mac/test/video_capture_test_utils_mac.mm @@ -8,7 +8,7 @@ #include #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/gmock_callback_support.h" #include "base/test/task_environment.h" #include "base/threading/thread_task_runner_handle.h" diff --git a/media/capture/video/mac/video_capture_device_factory_mac_unittest.mm b/media/capture/video/mac/video_capture_device_factory_mac_unittest.mm index 4b6f6acea123bb..8c89e4ee2a2fe1 100644 --- a/media/capture/video/mac/video_capture_device_factory_mac_unittest.mm +++ b/media/capture/video/mac/video_capture_device_factory_mac_unittest.mm @@ -5,7 +5,7 @@ #include "base/bind.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h" #include "media/base/media_switches.h" diff --git a/media/capture/video/video_capture_device_unittest.cc b/media/capture/video/video_capture_device_unittest.cc index 1091b2c0477431..06379d3a093d92 100644 --- a/media/capture/video/video_capture_device_unittest.cc +++ b/media/capture/video/video_capture_device_unittest.cc @@ -15,7 +15,7 @@ #include "base/memory/ref_counted.h" #include "base/run_loop.h" #include "base/single_thread_task_runner.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/gmock_callback_support.h" #include "base/test/task_environment.h" #include "base/test/test_timeouts.h" diff --git a/media/capture/video/win/video_capture_device_factory_win_unittest.cc b/media/capture/video/win/video_capture_device_factory_win_unittest.cc index d762c643511384..7cd97c083b3482 100644 --- a/media/capture/video/win/video_capture_device_factory_win_unittest.cc +++ b/media/capture/video/win/video_capture_device_factory_win_unittest.cc @@ -17,7 +17,7 @@ #include "base/memory/scoped_refptr.h" #include "base/run_loop.h" #include "base/strings/sys_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/win/windows_version.h" #include "media/capture/video/win/video_capture_device_factory_win.h" diff --git a/media/filters/fuchsia/fuchsia_video_decoder_unittest.cc b/media/filters/fuchsia/fuchsia_video_decoder_unittest.cc index 14591185f0687d..48dad93131f58d 100644 --- a/media/filters/fuchsia/fuchsia_video_decoder_unittest.cc +++ b/media/filters/fuchsia/fuchsia_video_decoder_unittest.cc @@ -13,7 +13,7 @@ #include "base/containers/flat_set.h" #include "base/fuchsia/fuchsia_logging.h" #include "base/fuchsia/process_context.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "components/viz/common/gpu/raster_context_provider.h" #include "components/viz/test/test_context_support.h" diff --git a/media/fuchsia/cdm/service/fuchsia_cdm_manager_test.cc b/media/fuchsia/cdm/service/fuchsia_cdm_manager_test.cc index 4ba76c602c1b82..9cf99b78cc478f 100644 --- a/media/fuchsia/cdm/service/fuchsia_cdm_manager_test.cc +++ b/media/fuchsia/cdm/service/fuchsia_cdm_manager_test.cc @@ -14,7 +14,7 @@ #include "base/callback.h" #include "base/files/scoped_temp_dir.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "media/fuchsia/cdm/service/mock_provision_fetcher.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/media/fuchsia/cdm/service/provisioning_fetcher_impl_test.cc b/media/fuchsia/cdm/service/provisioning_fetcher_impl_test.cc index 5c4036ab5efd0c..9b3f753bd3d472 100644 --- a/media/fuchsia/cdm/service/provisioning_fetcher_impl_test.cc +++ b/media/fuchsia/cdm/service/provisioning_fetcher_impl_test.cc @@ -9,7 +9,7 @@ #include "base/bind.h" #include "base/location.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "fuchsia/base/mem_buffer_util.h" #include "media/fuchsia/cdm/service/mock_provision_fetcher.h" diff --git a/media/gpu/android/frame_info_helper_unittest.cc b/media/gpu/android/frame_info_helper_unittest.cc index a03fffca28d41e..94dc6b5fa09e4e 100644 --- a/media/gpu/android/frame_info_helper_unittest.cc +++ b/media/gpu/android/frame_info_helper_unittest.cc @@ -4,7 +4,7 @@ #include "media/gpu/android/frame_info_helper.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/threading/thread_task_runner_handle.h" #include "gpu/command_buffer/service/mock_texture_owner.h" diff --git a/media/mojo/services/video_decode_perf_history_unittest.cc b/media/mojo/services/video_decode_perf_history_unittest.cc index d6760e76553c3d..a475f85b2952c8 100644 --- a/media/mojo/services/video_decode_perf_history_unittest.cc +++ b/media/mojo/services/video_decode_perf_history_unittest.cc @@ -11,7 +11,7 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" #include "base/task/post_task.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h" #include "components/ukm/test_ukm_recorder.h" diff --git a/mojo/core/channel_unittest.cc b/mojo/core/channel_unittest.cc index 4fcb57b9651325..58d6ee44ad6cae 100644 --- a/mojo/core/channel_unittest.cc +++ b/mojo/core/channel_unittest.cc @@ -14,7 +14,7 @@ #include "base/process/process_metrics.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/threading/thread.h" #include "base/threading/thread_task_runner_handle.h" diff --git a/mojo/core/invitation_unittest.cc b/mojo/core/invitation_unittest.cc index 684bbfe2a41bc7..c88c20bf83a231 100644 --- a/mojo/core/invitation_unittest.cc +++ b/mojo/core/invitation_unittest.cc @@ -18,7 +18,7 @@ #include "base/process/process.h" #include "base/run_loop.h" #include "base/synchronization/lock.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/multiprocess_test.h" #include "base/test/task_environment.h" #include "base/threading/sequenced_task_runner_handle.h" diff --git a/mojo/core/trap_unittest.cc b/mojo/core/trap_unittest.cc index 8ff1f74a6ad0a1..65595510930847 100644 --- a/mojo/core/trap_unittest.cc +++ b/mojo/core/trap_unittest.cc @@ -14,7 +14,7 @@ #include "base/memory/ptr_util.h" #include "base/rand_util.h" #include "base/synchronization/waitable_event.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/threading/platform_thread.h" #include "base/threading/simple_thread.h" #include "base/time/time.h" diff --git a/mojo/public/cpp/bindings/tests/associated_interface_unittest.cc b/mojo/public/cpp/bindings/tests/associated_interface_unittest.cc index 38ef52e7c9cca7..cacd0bff66e5c2 100644 --- a/mojo/public/cpp/bindings/tests/associated_interface_unittest.cc +++ b/mojo/public/cpp/bindings/tests/associated_interface_unittest.cc @@ -15,7 +15,7 @@ #include "base/synchronization/waitable_event.h" #include "base/task/post_task.h" #include "base/task/thread_pool.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/threading/sequenced_task_runner_handle.h" #include "base/threading/thread.h" diff --git a/mojo/public/cpp/bindings/tests/bind_task_runner_unittest.cc b/mojo/public/cpp/bindings/tests/bind_task_runner_unittest.cc index 39df40cc0686ce..df90d846025706 100644 --- a/mojo/public/cpp/bindings/tests/bind_task_runner_unittest.cc +++ b/mojo/public/cpp/bindings/tests/bind_task_runner_unittest.cc @@ -10,7 +10,7 @@ #include "base/sequenced_task_runner.h" #include "base/synchronization/lock.h" #include "base/synchronization/waitable_event.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/threading/platform_thread.h" #include "mojo/public/cpp/bindings/associated_receiver.h" diff --git a/mojo/public/cpp/bindings/tests/binder_map_unittest.cc b/mojo/public/cpp/bindings/tests/binder_map_unittest.cc index 53e99642ce15d3..c4a6741184e929 100644 --- a/mojo/public/cpp/bindings/tests/binder_map_unittest.cc +++ b/mojo/public/cpp/bindings/tests/binder_map_unittest.cc @@ -8,7 +8,7 @@ #include "base/run_loop.h" #include "base/task/post_task.h" #include "base/task/thread_pool.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/threading/sequenced_task_runner_handle.h" #include "mojo/public/cpp/bindings/generic_pending_receiver.h" diff --git a/mojo/public/cpp/bindings/tests/connection_group_unittest.cc b/mojo/public/cpp/bindings/tests/connection_group_unittest.cc index b677bab464b6b1..9e98157f04b920 100644 --- a/mojo/public/cpp/bindings/tests/connection_group_unittest.cc +++ b/mojo/public/cpp/bindings/tests/connection_group_unittest.cc @@ -5,7 +5,7 @@ #include "base/bind_helpers.h" #include "base/check.h" #include "base/macros.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/threading/sequenced_task_runner_handle.h" #include "mojo/public/cpp/bindings/binding_set.h" diff --git a/mojo/public/cpp/bindings/tests/flush_async_unittest.cc b/mojo/public/cpp/bindings/tests/flush_async_unittest.cc index d4ce86a8bc60f5..f6c7b383051a5d 100644 --- a/mojo/public/cpp/bindings/tests/flush_async_unittest.cc +++ b/mojo/public/cpp/bindings/tests/flush_async_unittest.cc @@ -15,7 +15,7 @@ #include "base/synchronization/lock.h" #include "base/task/post_task.h" #include "base/task/thread_pool.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "mojo/public/cpp/bindings/async_flusher.h" #include "mojo/public/cpp/bindings/pending_flush.h" #include "mojo/public/cpp/bindings/pending_receiver.h" diff --git a/mojo/public/cpp/bindings/tests/idle_tracking_unittest.cc b/mojo/public/cpp/bindings/tests/idle_tracking_unittest.cc index cc67fc90b29004..814cf75fb8bff6 100644 --- a/mojo/public/cpp/bindings/tests/idle_tracking_unittest.cc +++ b/mojo/public/cpp/bindings/tests/idle_tracking_unittest.cc @@ -7,7 +7,7 @@ #include "base/macros.h" #include "base/notreached.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/time/time.h" #include "base/timer/elapsed_timer.h" #include "mojo/public/cpp/bindings/receiver.h" diff --git a/mojo/public/cpp/bindings/tests/lazy_serialization_unittest.cc b/mojo/public/cpp/bindings/tests/lazy_serialization_unittest.cc index 54cbee2b42c32f..756f0076e8c632 100644 --- a/mojo/public/cpp/bindings/tests/lazy_serialization_unittest.cc +++ b/mojo/public/cpp/bindings/tests/lazy_serialization_unittest.cc @@ -5,7 +5,7 @@ #include "base/bind.h" #include "base/macros.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "mojo/public/cpp/bindings/receiver.h" #include "mojo/public/cpp/bindings/remote.h" diff --git a/mojo/public/cpp/bindings/tests/receiver_callback_unittest.cc b/mojo/public/cpp/bindings/tests/receiver_callback_unittest.cc index c30cd89c593fc6..9ff268a085ac03 100644 --- a/mojo/public/cpp/bindings/tests/receiver_callback_unittest.cc +++ b/mojo/public/cpp/bindings/tests/receiver_callback_unittest.cc @@ -8,7 +8,7 @@ #include "base/callback.h" #include "base/check_op.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/gtest_util.h" #include "base/test/task_environment.h" #include "build/build_config.h" diff --git a/mojo/public/cpp/bindings/tests/receiver_set_unittest.cc b/mojo/public/cpp/bindings/tests/receiver_set_unittest.cc index 0fdb7e38add2bc..5e2ec8be252729 100644 --- a/mojo/public/cpp/bindings/tests/receiver_set_unittest.cc +++ b/mojo/public/cpp/bindings/tests/receiver_set_unittest.cc @@ -8,7 +8,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "mojo/public/cpp/bindings/associated_receiver_set.h" #include "mojo/public/cpp/bindings/receiver_set.h" #include "mojo/public/cpp/bindings/tests/bindings_test_base.h" diff --git a/mojo/public/cpp/bindings/tests/receiver_unittest.cc b/mojo/public/cpp/bindings/tests/receiver_unittest.cc index 5d3b5f6227695e..692bdb930d56d1 100644 --- a/mojo/public/cpp/bindings/tests/receiver_unittest.cc +++ b/mojo/public/cpp/bindings/tests/receiver_unittest.cc @@ -14,7 +14,7 @@ #include "base/notreached.h" #include "base/run_loop.h" #include "base/synchronization/waitable_event.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/threading/thread.h" #include "mojo/public/cpp/bindings/lib/validation_errors.h" #include "mojo/public/cpp/bindings/pending_receiver.h" diff --git a/mojo/public/cpp/bindings/tests/remote_unittest.cc b/mojo/public/cpp/bindings/tests/remote_unittest.cc index ac4a8b9a29492e..3e45f35de9fa9b 100644 --- a/mojo/public/cpp/bindings/tests/remote_unittest.cc +++ b/mojo/public/cpp/bindings/tests/remote_unittest.cc @@ -16,7 +16,7 @@ #include "base/sequenced_task_runner.h" #include "base/task/post_task.h" #include "base/task/thread_pool.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/threading/sequenced_task_runner_handle.h" #include "base/threading/thread.h" diff --git a/mojo/public/cpp/bindings/tests/report_bad_message_unittest.cc b/mojo/public/cpp/bindings/tests/report_bad_message_unittest.cc index 8fef6ea698b341..d6c7447950bd80 100644 --- a/mojo/public/cpp/bindings/tests/report_bad_message_unittest.cc +++ b/mojo/public/cpp/bindings/tests/report_bad_message_unittest.cc @@ -7,7 +7,7 @@ #include "base/callback.h" #include "base/macros.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "mojo/public/cpp/bindings/message.h" #include "mojo/public/cpp/bindings/receiver.h" #include "mojo/public/cpp/bindings/remote.h" diff --git a/mojo/public/cpp/bindings/tests/request_response_unittest.cc b/mojo/public/cpp/bindings/tests/request_response_unittest.cc index 50cf63ff91717c..cd5e1777e42a7e 100644 --- a/mojo/public/cpp/bindings/tests/request_response_unittest.cc +++ b/mojo/public/cpp/bindings/tests/request_response_unittest.cc @@ -7,7 +7,7 @@ #include "base/bind.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "mojo/public/cpp/bindings/receiver.h" #include "mojo/public/cpp/bindings/remote.h" #include "mojo/public/cpp/bindings/tests/bindings_test_base.h" diff --git a/mojo/public/cpp/bindings/tests/service_factory_unittest.cc b/mojo/public/cpp/bindings/tests/service_factory_unittest.cc index ef6f2ceee8c936..1024ea0a1c09fd 100644 --- a/mojo/public/cpp/bindings/tests/service_factory_unittest.cc +++ b/mojo/public/cpp/bindings/tests/service_factory_unittest.cc @@ -8,7 +8,7 @@ #include "base/no_destructor.h" #include "base/optional.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "mojo/public/cpp/bindings/generic_pending_receiver.h" #include "mojo/public/cpp/bindings/pending_receiver.h" diff --git a/mojo/public/cpp/bindings/tests/sync_method_unittest.cc b/mojo/public/cpp/bindings/tests/sync_method_unittest.cc index 519f31f0387b8f..52fd2bca1d8bfc 100644 --- a/mojo/public/cpp/bindings/tests/sync_method_unittest.cc +++ b/mojo/public/cpp/bindings/tests/sync_method_unittest.cc @@ -11,7 +11,7 @@ #include "base/sequence_token.h" #include "base/task/post_task.h" #include "base/task/thread_pool.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/threading/thread.h" #include "mojo/public/cpp/bindings/associated_receiver.h" diff --git a/mojo/public/cpp/system/tests/invitation_unittest.cc b/mojo/public/cpp/system/tests/invitation_unittest.cc index 90f6a8acbb425b..be93814f12c047 100644 --- a/mojo/public/cpp/system/tests/invitation_unittest.cc +++ b/mojo/public/cpp/system/tests/invitation_unittest.cc @@ -16,7 +16,7 @@ #include "base/path_service.h" #include "base/run_loop.h" #include "base/strings/string_piece.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/multiprocess_test.h" #include "base/test/task_environment.h" #include "base/test/test_timeouts.h" diff --git a/mojo/public/cpp/system/tests/scope_to_message_pipe_unittest.cc b/mojo/public/cpp/system/tests/scope_to_message_pipe_unittest.cc index e8cc7d45ce2983..8fa266bbadd3a1 100644 --- a/mojo/public/cpp/system/tests/scope_to_message_pipe_unittest.cc +++ b/mojo/public/cpp/system/tests/scope_to_message_pipe_unittest.cc @@ -8,7 +8,7 @@ #include "base/callback.h" #include "base/macros.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "mojo/public/cpp/system/message_pipe.h" #include "mojo/public/cpp/system/simple_watcher.h" diff --git a/net/cert/coalescing_cert_verifier_unittest.cc b/net/cert/coalescing_cert_verifier_unittest.cc index c90f9898f7bba5..124444bcfcc668 100644 --- a/net/cert/coalescing_cert_verifier_unittest.cc +++ b/net/cert/coalescing_cert_verifier_unittest.cc @@ -7,7 +7,7 @@ #include #include "base/bind.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "net/base/net_errors.h" #include "net/base/test_completion_callback.h" diff --git a/net/cert/trial_comparison_cert_verifier_unittest.cc b/net/cert/trial_comparison_cert_verifier_unittest.cc index ac646274a08747..540b6390c2fa6c 100644 --- a/net/cert/trial_comparison_cert_verifier_unittest.cc +++ b/net/cert/trial_comparison_cert_verifier_unittest.cc @@ -8,7 +8,7 @@ #include #include "base/bind.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/threading/sequenced_task_runner_handle.h" #include "build/build_config.h" diff --git a/net/cookies/cookie_monster_unittest.cc b/net/cookies/cookie_monster_unittest.cc index 15cc111ed22aab..1e44111e2f634f 100644 --- a/net/cookies/cookie_monster_unittest.cc +++ b/net/cookies/cookie_monster_unittest.cc @@ -26,7 +26,7 @@ #include "base/strings/string_split.h" #include "base/strings/string_tokenizer.h" #include "base/strings/stringprintf.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/mock_callback.h" #include "base/test/scoped_feature_list.h" diff --git a/net/cookies/cookie_util_unittest.cc b/net/cookies/cookie_util_unittest.cc index 8093a6f440e5f5..a4a3f625423fcd 100644 --- a/net/cookies/cookie_util_unittest.cc +++ b/net/cookies/cookie_util_unittest.cc @@ -7,7 +7,7 @@ #include "base/callback.h" #include "base/strings/string_split.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "net/cookies/cookie_util.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/net/dns/host_resolver_manager_unittest.cc b/net/dns/host_resolver_manager_unittest.cc index 1582cedb41272d..e36a523e45aa6a 100644 --- a/net/dns/host_resolver_manager_unittest.cc +++ b/net/dns/host_resolver_manager_unittest.cc @@ -30,7 +30,7 @@ #include "base/synchronization/lock.h" #include "base/task/post_task.h" #include "base/task/thread_pool/thread_pool_instance.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h" #include "base/test/simple_test_clock.h" diff --git a/net/extras/sqlite/sqlite_persistent_cookie_store_unittest.cc b/net/extras/sqlite/sqlite_persistent_cookie_store_unittest.cc index dd5038ae02bd10..53b74e601e2782 100644 --- a/net/extras/sqlite/sqlite_persistent_cookie_store_unittest.cc +++ b/net/extras/sqlite/sqlite_persistent_cookie_store_unittest.cc @@ -22,7 +22,7 @@ #include "base/synchronization/waitable_event.h" #include "base/task/post_task.h" #include "base/task/thread_pool.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/threading/thread_restrictions.h" #include "base/threading/thread_task_runner_handle.h" #include "base/time/time.h" diff --git a/net/extras/sqlite/sqlite_persistent_reporting_and_nel_store_unittest.cc b/net/extras/sqlite/sqlite_persistent_reporting_and_nel_store_unittest.cc index 38717ca093ccde..73245eef71ee72 100644 --- a/net/extras/sqlite/sqlite_persistent_reporting_and_nel_store_unittest.cc +++ b/net/extras/sqlite/sqlite_persistent_reporting_and_nel_store_unittest.cc @@ -15,7 +15,7 @@ #include "base/synchronization/waitable_event.h" #include "base/task/post_task.h" #include "base/task/thread_pool.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h" #include "base/test/simple_test_clock.h" diff --git a/net/http/http_server_properties_manager_unittest.cc b/net/http/http_server_properties_manager_unittest.cc index 4d4443f8e5619b..39c91d0d84cdcd 100644 --- a/net/http/http_server_properties_manager_unittest.cc +++ b/net/http/http_server_properties_manager_unittest.cc @@ -16,7 +16,7 @@ #include "base/single_thread_task_runner.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/threading/thread_task_runner_handle.h" #include "base/time/default_tick_clock.h" diff --git a/net/network_error_logging/mock_persistent_nel_store_unittest.cc b/net/network_error_logging/mock_persistent_nel_store_unittest.cc index 9ec59af5a064a0..8914640b700ae5 100644 --- a/net/network_error_logging/mock_persistent_nel_store_unittest.cc +++ b/net/network_error_logging/mock_persistent_nel_store_unittest.cc @@ -6,7 +6,7 @@ #include "base/location.h" #include "base/strings/strcat.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "net/base/network_isolation_key.h" #include "net/network_error_logging/mock_persistent_nel_store.h" #include "net/network_error_logging/network_error_logging_service.h" diff --git a/net/nqe/connectivity_monitor_unittest.cc b/net/nqe/connectivity_monitor_unittest.cc index 1d2535300164c7..8b504711d25b80 100644 --- a/net/nqe/connectivity_monitor_unittest.cc +++ b/net/nqe/connectivity_monitor_unittest.cc @@ -8,7 +8,7 @@ #include "base/optional.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h" diff --git a/net/reporting/mock_persistent_reporting_store_unittest.cc b/net/reporting/mock_persistent_reporting_store_unittest.cc index aeff851910ec17..04439db578bf32 100644 --- a/net/reporting/mock_persistent_reporting_store_unittest.cc +++ b/net/reporting/mock_persistent_reporting_store_unittest.cc @@ -7,7 +7,7 @@ #include #include "base/location.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/time/time.h" #include "net/base/network_isolation_key.h" #include "net/reporting/reporting_endpoint.h" diff --git a/net/socket/tcp_client_socket_unittest.cc b/net/socket/tcp_client_socket_unittest.cc index 8d7ce636d01af8..5b3f52124b3734 100644 --- a/net/socket/tcp_client_socket_unittest.cc +++ b/net/socket/tcp_client_socket_unittest.cc @@ -13,7 +13,7 @@ #include "base/power_monitor/power_monitor.h" #include "base/power_monitor/power_monitor_source.h" #include "base/strings/string_number_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h" #include "build/build_config.h" diff --git a/net/socket/tcp_socket_unittest.cc b/net/socket/tcp_socket_unittest.cc index c211c6bb7cb5c9..74b60b784c9963 100644 --- a/net/socket/tcp_socket_unittest.cc +++ b/net/socket/tcp_socket_unittest.cc @@ -13,7 +13,7 @@ #include "base/bind.h" #include "base/memory/ref_counted.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/time/time.h" #include "build/build_config.h" #include "net/base/address_list.h" diff --git a/net/socket/transport_client_socket_pool_unittest.cc b/net/socket/transport_client_socket_pool_unittest.cc index 89cc8a4c97d355..e38e331bce88e5 100644 --- a/net/socket/transport_client_socket_pool_unittest.cc +++ b/net/socket/transport_client_socket_pool_unittest.cc @@ -13,7 +13,7 @@ #include "base/optional.h" #include "base/run_loop.h" #include "base/stl_util.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/threading/platform_thread.h" #include "build/build_config.h" diff --git a/net/spdy/spdy_session_pool_unittest.cc b/net/spdy/spdy_session_pool_unittest.cc index 23ffbe403b2e10..6a5e091000e74e 100644 --- a/net/spdy/spdy_session_pool_unittest.cc +++ b/net/spdy/spdy_session_pool_unittest.cc @@ -11,7 +11,7 @@ #include "base/memory/ref_counted.h" #include "base/run_loop.h" #include "base/stl_util.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/trace_event/memory_allocator_dump.h" #include "base/trace_event/process_memory_dump.h" diff --git a/net/test/embedded_test_server/embedded_test_server.cc b/net/test/embedded_test_server/embedded_test_server.cc index f41afb19e1e717..17994acf67e7c3 100644 --- a/net/test/embedded_test_server/embedded_test_server.cc +++ b/net/test/embedded_test_server/embedded_test_server.cc @@ -21,7 +21,7 @@ #include "base/task/current_thread.h" #include "base/task/single_thread_task_executor.h" #include "base/task_runner_util.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/threading/thread_restrictions.h" #include "base/threading/thread_task_runner_handle.h" #include "crypto/rsa_private_key.h" diff --git a/net/url_request/url_request_http_job_unittest.cc b/net/url_request/url_request_http_job_unittest.cc index 2ea016cb48dbc8..5de6c860a6b462 100644 --- a/net/url_request/url_request_http_job_unittest.cc +++ b/net/url_request/url_request_http_job_unittest.cc @@ -18,7 +18,7 @@ #include "base/run_loop.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/task_environment.h" #include "net/base/auth.h" diff --git a/net/url_request/url_request_quic_unittest.cc b/net/url_request/url_request_quic_unittest.cc index 4e23afc51ed9d5..5c933da2d124fa 100644 --- a/net/url_request/url_request_quic_unittest.cc +++ b/net/url_request/url_request_quic_unittest.cc @@ -10,7 +10,7 @@ #include "base/run_loop.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "build/build_config.h" #include "net/base/features.h" diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc index 9bfa245adab78e..8560dc252f20db 100644 --- a/net/url_request/url_request_unittest.cc +++ b/net/url_request/url_request_unittest.cc @@ -44,7 +44,7 @@ #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h" #include "base/threading/thread_task_runner_handle.h" diff --git a/remoting/base/protobuf_http_client_unittest.cc b/remoting/base/protobuf_http_client_unittest.cc index 737fea1730219e..632b49cafe6367 100644 --- a/remoting/base/protobuf_http_client_unittest.cc +++ b/remoting/base/protobuf_http_client_unittest.cc @@ -7,7 +7,7 @@ #include #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/gmock_callback_support.h" #include "base/test/mock_callback.h" #include "base/test/task_environment.h" diff --git a/remoting/host/heartbeat_sender_unittest.cc b/remoting/host/heartbeat_sender_unittest.cc index 0f9f4cb5931bd8..4c236bff6dac9a 100644 --- a/remoting/host/heartbeat_sender_unittest.cc +++ b/remoting/host/heartbeat_sender_unittest.cc @@ -12,7 +12,7 @@ #include "base/run_loop.h" #include "base/strings/string_number_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/mock_callback.h" #include "base/test/task_environment.h" #include "base/threading/sequenced_task_runner_handle.h" diff --git a/remoting/host/zombie_host_detector_unittest.cc b/remoting/host/zombie_host_detector_unittest.cc index 33496a814fb394..36ff71bf3cf8a4 100644 --- a/remoting/host/zombie_host_detector_unittest.cc +++ b/remoting/host/zombie_host_detector_unittest.cc @@ -4,7 +4,7 @@ #include "remoting/host/zombie_host_detector.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/mock_callback.h" #include "base/test/task_environment.h" #include "net/base/mock_network_change_notifier.h" diff --git a/remoting/ios/audio/audio_playback_sink_ios_unittest.cc b/remoting/ios/audio/audio_playback_sink_ios_unittest.cc index 268d7f6adc1d84..a531fa9a841a75 100644 --- a/remoting/ios/audio/audio_playback_sink_ios_unittest.cc +++ b/remoting/ios/audio/audio_playback_sink_ios_unittest.cc @@ -5,7 +5,7 @@ #include "remoting/ios/audio/audio_playback_sink_ios.h" #include "base/bind.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/threading/platform_thread.h" #include "base/threading/thread.h" #include "remoting/client/audio/audio_stream_format.h" diff --git a/remoting/protocol/webrtc_transport_unittest.cc b/remoting/protocol/webrtc_transport_unittest.cc index 95a9b69a0829b6..e2a86c3cb085d0 100644 --- a/remoting/protocol/webrtc_transport_unittest.cc +++ b/remoting/protocol/webrtc_transport_unittest.cc @@ -11,7 +11,7 @@ #include "base/macros.h" #include "base/run_loop.h" #include "base/strings/string_util.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/threading/platform_thread.h" #include "base/threading/watchdog.h" diff --git a/remoting/signaling/ftl_message_reception_channel_unittest.cc b/remoting/signaling/ftl_message_reception_channel_unittest.cc index 3274f209c911c8..e63056edda4084 100644 --- a/remoting/signaling/ftl_message_reception_channel_unittest.cc +++ b/remoting/signaling/ftl_message_reception_channel_unittest.cc @@ -15,7 +15,7 @@ #include "base/memory/weak_ptr.h" #include "base/notreached.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/mock_callback.h" #include "base/test/task_environment.h" #include "base/threading/sequenced_task_runner_handle.h" diff --git a/remoting/signaling/ftl_messaging_client_unittest.cc b/remoting/signaling/ftl_messaging_client_unittest.cc index 8b8ecd8b0d5e57..3ae8379ba6125f 100644 --- a/remoting/signaling/ftl_messaging_client_unittest.cc +++ b/remoting/signaling/ftl_messaging_client_unittest.cc @@ -18,7 +18,7 @@ #include "base/strings/stringprintf.h" #include "base/task/post_task.h" #include "base/task/thread_pool.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/mock_callback.h" #include "base/test/task_environment.h" #include "remoting/base/fake_oauth_token_getter.h" diff --git a/sandbox/linux/integration_tests/seccomp_broker_process_unittest.cc b/sandbox/linux/integration_tests/seccomp_broker_process_unittest.cc index fd6cd00bc67185..9da9c689114284 100644 --- a/sandbox/linux/integration_tests/seccomp_broker_process_unittest.cc +++ b/sandbox/linux/integration_tests/seccomp_broker_process_unittest.cc @@ -21,7 +21,7 @@ #include "base/logging.h" #include "base/macros.h" #include "base/posix/eintr_wrapper.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "build/build_config.h" #include "sandbox/linux/bpf_dsl/bpf_dsl.h" #include "sandbox/linux/bpf_dsl/policy.h" diff --git a/sandbox/linux/syscall_broker/broker_simple_message_unittest.cc b/sandbox/linux/syscall_broker/broker_simple_message_unittest.cc index 721617db22c439..e274c881ea7efe 100644 --- a/sandbox/linux/syscall_broker/broker_simple_message_unittest.cc +++ b/sandbox/linux/syscall_broker/broker_simple_message_unittest.cc @@ -16,7 +16,7 @@ #include "base/run_loop.h" #include "base/synchronization/waitable_event.h" #include "base/task/thread_pool.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/test/test_timeouts.h" #include "base/threading/thread.h" diff --git a/sandbox/linux/syscall_broker/remote_syscall_arg_handler_unittest.cc b/sandbox/linux/syscall_broker/remote_syscall_arg_handler_unittest.cc index c452d1d02d637d..58f69899d52515 100644 --- a/sandbox/linux/syscall_broker/remote_syscall_arg_handler_unittest.cc +++ b/sandbox/linux/syscall_broker/remote_syscall_arg_handler_unittest.cc @@ -16,7 +16,7 @@ #include "base/macros.h" #include "base/posix/unix_domain_socket.h" #include "base/process/process_metrics.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "sandbox/linux/tests/unit_tests.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/services/cert_verifier/cert_verifier_service_factory_unittest.cc b/services/cert_verifier/cert_verifier_service_factory_unittest.cc index b19e5372239038..d8dcc5cf3bc274 100644 --- a/services/cert_verifier/cert_verifier_service_factory_unittest.cc +++ b/services/cert_verifier/cert_verifier_service_factory_unittest.cc @@ -13,7 +13,7 @@ #include "base/check_op.h" #include "base/memory/scoped_refptr.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "mojo/public/cpp/bindings/pending_receiver.h" #include "mojo/public/cpp/bindings/pending_remote.h" diff --git a/services/cert_verifier/cert_verifier_service_unittest.cc b/services/cert_verifier/cert_verifier_service_unittest.cc index a4fca51061089d..6fe75dde7efc3e 100644 --- a/services/cert_verifier/cert_verifier_service_unittest.cc +++ b/services/cert_verifier/cert_verifier_service_unittest.cc @@ -15,7 +15,7 @@ #include "base/memory/scoped_refptr.h" #include "base/no_destructor.h" #include "base/strings/string_number_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "mojo/public/cpp/bindings/pending_remote.h" #include "mojo/public/cpp/bindings/receiver.h" diff --git a/services/cert_verifier/integration_tests/network_service_unittest.cc b/services/cert_verifier/integration_tests/network_service_unittest.cc index 1ce0aa5c0aa0f1..9b78d130d836f3 100644 --- a/services/cert_verifier/integration_tests/network_service_unittest.cc +++ b/services/cert_verifier/integration_tests/network_service_unittest.cc @@ -9,7 +9,7 @@ #include "base/run_loop.h" #include "base/sequenced_task_runner.h" #include "base/task/task_traits.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h" #include "build/build_config.h" diff --git a/services/data_decoder/public/cpp/json_sanitizer_unittest.cc b/services/data_decoder/public/cpp/json_sanitizer_unittest.cc index cbc0d7da423d4c..8eb8fab9bdc2b5 100644 --- a/services/data_decoder/public/cpp/json_sanitizer_unittest.cc +++ b/services/data_decoder/public/cpp/json_sanitizer_unittest.cc @@ -10,7 +10,7 @@ #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/values.h" #include "services/data_decoder/public/cpp/test_support/in_process_data_decoder.h" diff --git a/services/data_decoder/public/cpp/safe_xml_parser_unittest.cc b/services/data_decoder/public/cpp/safe_xml_parser_unittest.cc index 3e992892a7ec81..0e094c0e167ce0 100644 --- a/services/data_decoder/public/cpp/safe_xml_parser_unittest.cc +++ b/services/data_decoder/public/cpp/safe_xml_parser_unittest.cc @@ -7,7 +7,7 @@ #include #include "base/bind.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/values.h" #include "build/build_config.h" #include "services/data_decoder/xml_parser.h" diff --git a/services/device/bluetooth/bluetooth_system_unittest.cc b/services/device/bluetooth/bluetooth_system_unittest.cc index f0f053f8efe254..6aa09bf2ca2002 100644 --- a/services/device/bluetooth/bluetooth_system_unittest.cc +++ b/services/device/bluetooth/bluetooth_system_unittest.cc @@ -17,7 +17,7 @@ #include "base/run_loop.h" #include "base/stl_util.h" #include "base/strings/stringprintf.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "device/bluetooth/dbus/bluetooth_adapter_client.h" #include "device/bluetooth/dbus/bluetooth_device_client.h" #include "device/bluetooth/dbus/bluez_dbus_manager.h" diff --git a/services/device/generic_sensor/platform_sensor_and_provider_unittest_linux.cc b/services/device/generic_sensor/platform_sensor_and_provider_unittest_linux.cc index 4e22fac5376bad..a30e3de33f1ffd 100644 --- a/services/device/generic_sensor/platform_sensor_and_provider_unittest_linux.cc +++ b/services/device/generic_sensor/platform_sensor_and_provider_unittest_linux.cc @@ -12,7 +12,7 @@ #include "base/run_loop.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/threading/thread_restrictions.h" #include "base/threading/thread_task_runner_handle.h" diff --git a/services/device/generic_sensor/platform_sensor_provider_winrt_unittest.cc b/services/device/generic_sensor/platform_sensor_provider_winrt_unittest.cc index 228ca68ce6d13b..fde2c6b7ce31cb 100644 --- a/services/device/generic_sensor/platform_sensor_provider_winrt_unittest.cc +++ b/services/device/generic_sensor/platform_sensor_provider_winrt_unittest.cc @@ -5,7 +5,7 @@ #include "services/device/generic_sensor/platform_sensor_provider_winrt.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "services/device/generic_sensor/platform_sensor_reader_win_base.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/services/device/generic_sensor/platform_sensor_reader_winrt_unittests.cc b/services/device/generic_sensor/platform_sensor_reader_winrt_unittests.cc index 80f13277a5ec1f..da4a7f4837676a 100644 --- a/services/device/generic_sensor/platform_sensor_reader_winrt_unittests.cc +++ b/services/device/generic_sensor/platform_sensor_reader_winrt_unittests.cc @@ -7,7 +7,7 @@ #include #include "base/numerics/math_constants.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/win/core_winrt_util.h" #include "base/win/scoped_com_initializer.h" diff --git a/services/device/geolocation/core_location_provider_unittest.mm b/services/device/geolocation/core_location_provider_unittest.mm index d32adc573f001a..43218df1bf0bba 100644 --- a/services/device/geolocation/core_location_provider_unittest.mm +++ b/services/device/geolocation/core_location_provider_unittest.mm @@ -5,7 +5,7 @@ #include "services/device/geolocation/core_location_provider.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "services/device/public/cpp/geolocation/geoposition.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/services/device/geolocation/geolocation_service_unittest.cc b/services/device/geolocation/geolocation_service_unittest.cc index e0a0ca252dea65..255f1aa647c6a2 100644 --- a/services/device/geolocation/geolocation_service_unittest.cc +++ b/services/device/geolocation/geolocation_service_unittest.cc @@ -4,7 +4,7 @@ #include "base/bind.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" diff --git a/services/device/serial/bluetooth_serial_port_impl_unittest.cc b/services/device/serial/bluetooth_serial_port_impl_unittest.cc index dec10c6e683777..d839f80793503d 100644 --- a/services/device/serial/bluetooth_serial_port_impl_unittest.cc +++ b/services/device/serial/bluetooth_serial_port_impl_unittest.cc @@ -5,7 +5,7 @@ #include "services/device/serial/bluetooth_serial_port_impl.h" #include "base/command_line.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/gmock_callback_support.h" #include "base/test/task_environment.h" #include "device/bluetooth/bluetooth_adapter_factory.h" diff --git a/services/device/serial/serial_port_impl_unittest.cc b/services/device/serial/serial_port_impl_unittest.cc index d0a60b1b593e4c..806a828783b7d6 100644 --- a/services/device/serial/serial_port_impl_unittest.cc +++ b/services/device/serial/serial_port_impl_unittest.cc @@ -5,7 +5,7 @@ #include "services/device/serial/serial_port_impl.h" #include "base/stl_util.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "mojo/public/cpp/bindings/pending_remote.h" #include "mojo/public/cpp/bindings/remote.h" #include "mojo/public/cpp/bindings/self_owned_receiver.h" diff --git a/services/device/serial/serial_port_manager_impl_unittest.cc b/services/device/serial/serial_port_manager_impl_unittest.cc index d2afe20710bf9c..75d998b3d76698 100644 --- a/services/device/serial/serial_port_manager_impl_unittest.cc +++ b/services/device/serial/serial_port_manager_impl_unittest.cc @@ -13,7 +13,7 @@ #include "base/command_line.h" #include "base/macros.h" #include "base/task/post_task.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/gmock_callback_support.h" #include "base/threading/thread.h" #include "device/bluetooth/bluetooth_adapter_factory.h" diff --git a/services/device/usb/mojo/device_impl_unittest.cc b/services/device/usb/mojo/device_impl_unittest.cc index 5e0af598c905f7..ecd9ac6b8108ac 100644 --- a/services/device/usb/mojo/device_impl_unittest.cc +++ b/services/device/usb/mojo/device_impl_unittest.cc @@ -22,7 +22,7 @@ #include "base/memory/ref_counted_memory.h" #include "base/run_loop.h" #include "base/stl_util.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "mojo/public/cpp/bindings/receiver.h" #include "mojo/public/cpp/bindings/remote.h" diff --git a/services/network/cookie_manager_unittest.cc b/services/network/cookie_manager_unittest.cc index 0a7fd0d389c827..86e98597a3e45e 100644 --- a/services/network/cookie_manager_unittest.cc +++ b/services/network/cookie_manager_unittest.cc @@ -14,7 +14,7 @@ #include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/task/thread_pool/thread_pool_instance.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/time/time.h" #include "net/cookies/cookie_access_result.h" diff --git a/services/network/expect_ct_reporter_unittest.cc b/services/network/expect_ct_reporter_unittest.cc index 4eed0b4655dd05..06f7f4f2cf7459 100644 --- a/services/network/expect_ct_reporter_unittest.cc +++ b/services/network/expect_ct_reporter_unittest.cc @@ -12,7 +12,7 @@ #include "base/command_line.h" #include "base/json/json_reader.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h" diff --git a/services/network/host_resolver_unittest.cc b/services/network/host_resolver_unittest.cc index c74df377252e45..8b9a4b7e9a8421 100644 --- a/services/network/host_resolver_unittest.cc +++ b/services/network/host_resolver_unittest.cc @@ -11,7 +11,7 @@ #include "base/check.h" #include "base/optional.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/time/time.h" #include "mojo/public/cpp/bindings/pending_remote.h" diff --git a/services/network/http_cache_data_counter_unittest.cc b/services/network/http_cache_data_counter_unittest.cc index ea7d6c5d1a3393..0ff12005ff4600 100644 --- a/services/network/http_cache_data_counter_unittest.cc +++ b/services/network/http_cache_data_counter_unittest.cc @@ -14,7 +14,7 @@ #include "base/files/scoped_temp_dir.h" #include "base/run_loop.h" #include "base/stl_util.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/threading/thread_task_runner_handle.h" #include "mojo/public/cpp/bindings/remote.h" diff --git a/services/network/network_context_unittest.cc b/services/network/network_context_unittest.cc index affa1e42a94a14..b4854640318eb8 100644 --- a/services/network/network_context_unittest.cc +++ b/services/network/network_context_unittest.cc @@ -32,7 +32,7 @@ #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/synchronization/waitable_event.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/gtest_util.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/mock_entropy_provider.h" diff --git a/services/network/network_service_unittest.cc b/services/network/network_service_unittest.cc index 4524d109f3c9ca..2a1e2b88b33815 100644 --- a/services/network/network_service_unittest.cc +++ b/services/network/network_service_unittest.cc @@ -17,7 +17,7 @@ #include "base/path_service.h" #include "base/run_loop.h" #include "base/strings/string_util.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h" #include "base/threading/thread_task_runner_handle.h" diff --git a/services/network/p2p/socket_tcp_unittest.cc b/services/network/p2p/socket_tcp_unittest.cc index dd1f75cb2a225a..8cf4c8610af67a 100644 --- a/services/network/p2p/socket_tcp_unittest.cc +++ b/services/network/p2p/socket_tcp_unittest.cc @@ -11,7 +11,7 @@ #include "base/stl_util.h" #include "base/strings/stringprintf.h" #include "base/sys_byteorder.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h" #include "jingle/glue/fake_ssl_client_socket.h" diff --git a/services/network/p2p/socket_test_utils.cc b/services/network/p2p/socket_test_utils.cc index 663202e1b89733..fc0af6ebe592b6 100644 --- a/services/network/p2p/socket_test_utils.cc +++ b/services/network/p2p/socket_test_utils.cc @@ -10,7 +10,7 @@ #include "base/check.h" #include "base/notreached.h" #include "base/sys_byteorder.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/threading/thread_task_runner_handle.h" #include "net/base/io_buffer.h" #include "net/base/ip_address.h" diff --git a/services/network/pending_callback_chain_unittest.cc b/services/network/pending_callback_chain_unittest.cc index d7a03a4147d1ea..5cefd185fd826e 100644 --- a/services/network/pending_callback_chain_unittest.cc +++ b/services/network/pending_callback_chain_unittest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "services/network/pending_callback_chain.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "testing/gtest/include/gtest/gtest.h" namespace network { diff --git a/services/network/proxy_resolving_socket_mojo_unittest.cc b/services/network/proxy_resolving_socket_mojo_unittest.cc index f840843a0620b8..6e0eb6421f6d54 100644 --- a/services/network/proxy_resolving_socket_mojo_unittest.cc +++ b/services/network/proxy_resolving_socket_mojo_unittest.cc @@ -9,7 +9,7 @@ #include "base/containers/span.h" #include "base/macros.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "jingle/glue/fake_ssl_client_socket.h" #include "mojo/public/cpp/bindings/pending_receiver.h" diff --git a/services/network/public/cpp/cert_verifier/mojo_cert_verifier_unittest.cc b/services/network/public/cpp/cert_verifier/mojo_cert_verifier_unittest.cc index d43349ff7bbe95..1bd82c2928ee16 100644 --- a/services/network/public/cpp/cert_verifier/mojo_cert_verifier_unittest.cc +++ b/services/network/public/cpp/cert_verifier/mojo_cert_verifier_unittest.cc @@ -9,7 +9,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "mojo/public/cpp/bindings/pending_remote.h" #include "net/base/test_completion_callback.h" diff --git a/services/network/public/cpp/cross_thread_pending_shared_url_loader_factory_unittest.cc b/services/network/public/cpp/cross_thread_pending_shared_url_loader_factory_unittest.cc index 5b853b2106869d..a3a647f627a031 100644 --- a/services/network/public/cpp/cross_thread_pending_shared_url_loader_factory_unittest.cc +++ b/services/network/public/cpp/cross_thread_pending_shared_url_loader_factory_unittest.cc @@ -13,7 +13,7 @@ #include "base/sequenced_task_runner.h" #include "base/task/post_task.h" #include "base/task/thread_pool.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/threading/sequenced_task_runner_handle.h" #include "mojo/public/cpp/bindings/pending_receiver.h" diff --git a/services/network/public/cpp/simple_url_loader_unittest.cc b/services/network/public/cpp/simple_url_loader_unittest.cc index 0e2479b8159356..2b9a8a21413174 100644 --- a/services/network/public/cpp/simple_url_loader_unittest.cc +++ b/services/network/public/cpp/simple_url_loader_unittest.cc @@ -28,7 +28,7 @@ #include "base/sequenced_task_runner.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/test/test_timeouts.h" #include "base/time/time.h" diff --git a/services/network/quic_transport_unittest.cc b/services/network/quic_transport_unittest.cc index 07243209c997ca..23d588c063a262 100644 --- a/services/network/quic_transport_unittest.cc +++ b/services/network/quic_transport_unittest.cc @@ -9,7 +9,7 @@ #include "base/rand_util.h" #include "base/stl_util.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "net/cert/mock_cert_verifier.h" #include "net/dns/mock_host_resolver.h" diff --git a/services/network/restricted_cookie_manager_unittest.cc b/services/network/restricted_cookie_manager_unittest.cc index 12ec0dfc1b52e3..a322cdf090eaed 100644 --- a/services/network/restricted_cookie_manager_unittest.cc +++ b/services/network/restricted_cookie_manager_unittest.cc @@ -8,7 +8,7 @@ #include "base/bind.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h" #include "base/time/time.h" diff --git a/services/network/tcp_bound_socket_unittest.cc b/services/network/tcp_bound_socket_unittest.cc index c6800ff89a967d..e18accf56201d2 100644 --- a/services/network/tcp_bound_socket_unittest.cc +++ b/services/network/tcp_bound_socket_unittest.cc @@ -11,7 +11,7 @@ #include "base/bind.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "build/build_config.h" #include "mojo/public/cpp/bindings/pending_remote.h" diff --git a/services/network/tcp_socket_unittest.cc b/services/network/tcp_socket_unittest.cc index 9e65857c518081..e5b3ae44f7c979 100644 --- a/services/network/tcp_socket_unittest.cc +++ b/services/network/tcp_socket_unittest.cc @@ -13,7 +13,7 @@ #include "base/location.h" #include "base/macros.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/threading/thread.h" #include "build/build_config.h" diff --git a/services/network/test/udp_socket_test_util.cc b/services/network/test/udp_socket_test_util.cc index dd9d2d3d0caa51..5923f4241a22d1 100644 --- a/services/network/test/udp_socket_test_util.cc +++ b/services/network/test/udp_socket_test_util.cc @@ -7,7 +7,7 @@ #include #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "net/traffic_annotation/network_traffic_annotation_test_helper.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/services/network/tls_client_socket_unittest.cc b/services/network/tls_client_socket_unittest.cc index 4c13918e9d314e..23a2930f733b12 100644 --- a/services/network/tls_client_socket_unittest.cc +++ b/services/network/tls_client_socket_unittest.cc @@ -12,7 +12,7 @@ #include "base/check_op.h" #include "base/macros.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/threading/thread.h" #include "mojo/public/cpp/bindings/pending_receiver.h" diff --git a/services/network/transitional_url_loader_factory_owner_unittest.cc b/services/network/transitional_url_loader_factory_owner_unittest.cc index e3169d6f592263..388672163ecd87 100644 --- a/services/network/transitional_url_loader_factory_owner_unittest.cc +++ b/services/network/transitional_url_loader_factory_owner_unittest.cc @@ -9,7 +9,7 @@ #include "base/message_loop/message_pump_type.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/threading/thread.h" #include "net/test/embedded_test_server/default_handlers.h" diff --git a/services/network/trust_tokens/has_trust_tokens_answerer_unittest.cc b/services/network/trust_tokens/has_trust_tokens_answerer_unittest.cc index f94124aa50f519..555fefb8be674a 100644 --- a/services/network/trust_tokens/has_trust_tokens_answerer_unittest.cc +++ b/services/network/trust_tokens/has_trust_tokens_answerer_unittest.cc @@ -5,7 +5,7 @@ #include "services/network/trust_tokens/has_trust_tokens_answerer.h" #include "base/strings/stringprintf.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "services/network/public/cpp/trust_token_parameterization.h" #include "services/network/public/mojom/trust_tokens.mojom.h" #include "services/network/trust_tokens/pending_trust_token_store.h" diff --git a/services/network/trust_tokens/local_trust_token_operation_delegate_impl_unittest.cc b/services/network/trust_tokens/local_trust_token_operation_delegate_impl_unittest.cc index 9957fcd8053f9c..e5e39a2d873bd4 100644 --- a/services/network/trust_tokens/local_trust_token_operation_delegate_impl_unittest.cc +++ b/services/network/trust_tokens/local_trust_token_operation_delegate_impl_unittest.cc @@ -6,7 +6,7 @@ #include "base/callback.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/mock_callback.h" #include "base/test/task_environment.h" #include "services/network/public/mojom/trust_tokens.mojom.h" diff --git a/services/network/trust_tokens/pending_trust_token_store_unittest.cc b/services/network/trust_tokens/pending_trust_token_store_unittest.cc index b180816ace882a..77d1a83d56eab3 100644 --- a/services/network/trust_tokens/pending_trust_token_store_unittest.cc +++ b/services/network/trust_tokens/pending_trust_token_store_unittest.cc @@ -4,7 +4,7 @@ #include "services/network/trust_tokens/pending_trust_token_store.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "services/network/trust_tokens/trust_token_store.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/services/network/trust_tokens/sqlite_trust_token_persister_unittest.cc b/services/network/trust_tokens/sqlite_trust_token_persister_unittest.cc index d89947bb068d13..7a8e18dcbe8c47 100644 --- a/services/network/trust_tokens/sqlite_trust_token_persister_unittest.cc +++ b/services/network/trust_tokens/sqlite_trust_token_persister_unittest.cc @@ -12,7 +12,7 @@ #include "base/files/scoped_temp_dir.h" #include "base/run_loop.h" #include "base/task/post_task.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/threading/thread_task_runner_handle.h" #include "components/sqlite_proto/key_value_data.h" diff --git a/services/network/trust_tokens/test/test_server_handler_registration.cc b/services/network/trust_tokens/test/test_server_handler_registration.cc index e76ffa076deae8..bb41819e6c79ee 100644 --- a/services/network/trust_tokens/test/test_server_handler_registration.cc +++ b/services/network/trust_tokens/test/test_server_handler_registration.cc @@ -11,7 +11,7 @@ #include "base/logging.h" #include "base/optional.h" #include "base/strings/string_piece.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "net/http/http_request_headers.h" #include "net/test/embedded_test_server/http_request.h" #include "net/test/embedded_test_server/http_response.h" diff --git a/services/network/trust_tokens/test/trust_token_request_handler.cc b/services/network/trust_tokens/test/trust_token_request_handler.cc index 2f0eecb990fd51..a6938235dba9c6 100644 --- a/services/network/trust_tokens/test/trust_token_request_handler.cc +++ b/services/network/trust_tokens/test/trust_token_request_handler.cc @@ -13,7 +13,7 @@ #include "base/strings/string_piece.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "components/cbor/reader.h" #include "components/cbor/values.h" #include "crypto/sha2.h" diff --git a/services/network/trust_tokens/test/trust_token_test_util.cc b/services/network/trust_tokens/test/trust_token_test_util.cc index ddb48158e3833d..81450ef111bd70 100644 --- a/services/network/trust_tokens/test/trust_token_test_util.cc +++ b/services/network/trust_tokens/test/trust_token_test_util.cc @@ -6,7 +6,7 @@ #include "base/json/json_reader.h" #include "base/json/json_string_value_serializer.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/values.h" diff --git a/services/network/trust_tokens/trust_token_database_owner_unittest.cc b/services/network/trust_tokens/trust_token_database_owner_unittest.cc index c935b819dfe2fe..9dbf033652b6d4 100644 --- a/services/network/trust_tokens/trust_token_database_owner_unittest.cc +++ b/services/network/trust_tokens/trust_token_database_owner_unittest.cc @@ -4,7 +4,7 @@ #include "services/network/trust_tokens/trust_token_database_owner.h" #include "base/task/post_task.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/threading/thread_task_runner_handle.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/services/network/trust_tokens/trust_token_key_commitment_controller_unittest.cc b/services/network/trust_tokens/trust_token_key_commitment_controller_unittest.cc index dee87c1cd70b6e..4aafd98db93778 100644 --- a/services/network/trust_tokens/trust_token_key_commitment_controller_unittest.cc +++ b/services/network/trust_tokens/trust_token_key_commitment_controller_unittest.cc @@ -9,7 +9,7 @@ #include "base/bind.h" #include "base/no_destructor.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "net/base/load_flags.h" #include "net/base/net_errors.h" diff --git a/services/network/trust_tokens/trust_token_key_commitment_parser_unittest.cc b/services/network/trust_tokens/trust_token_key_commitment_parser_unittest.cc index 1040d8bd96defd..ccdd5e6ccfad98 100644 --- a/services/network/trust_tokens/trust_token_key_commitment_parser_unittest.cc +++ b/services/network/trust_tokens/trust_token_key_commitment_parser_unittest.cc @@ -9,7 +9,7 @@ #include "base/no_destructor.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/time/time.h" #include "mojo/public/cpp/bindings/struct_ptr.h" diff --git a/services/network/trust_tokens/trust_token_key_commitments_unittest.cc b/services/network/trust_tokens/trust_token_key_commitments_unittest.cc index aec05c8110243b..c908c087605bc6 100644 --- a/services/network/trust_tokens/trust_token_key_commitments_unittest.cc +++ b/services/network/trust_tokens/trust_token_key_commitments_unittest.cc @@ -5,7 +5,7 @@ #include "services/network/trust_tokens/trust_token_key_commitments.h" #include "base/base64.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_command_line.h" #include "base/test/task_environment.h" #include "services/network/public/cpp/network_switches.h" diff --git a/services/network/trust_tokens/trust_token_persister_unittest.cc b/services/network/trust_tokens/trust_token_persister_unittest.cc index a082bd6e162aa9..a13ae55080695d 100644 --- a/services/network/trust_tokens/trust_token_persister_unittest.cc +++ b/services/network/trust_tokens/trust_token_persister_unittest.cc @@ -8,7 +8,7 @@ #include #include -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/threading/thread_task_runner_handle.h" #include "services/network/trust_tokens/in_memory_trust_token_persister.h" diff --git a/services/network/trust_tokens/trust_token_request_helper_factory_unittest.cc b/services/network/trust_tokens/trust_token_request_helper_factory_unittest.cc index 0f87d799699e2b..28efbc084d9452 100644 --- a/services/network/trust_tokens/trust_token_request_helper_factory_unittest.cc +++ b/services/network/trust_tokens/trust_token_request_helper_factory_unittest.cc @@ -6,7 +6,7 @@ #include "base/optional.h" #include "base/strings/strcat.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/task_environment.h" #include "net/base/isolation_info.h" diff --git a/services/network/trust_tokens/trust_token_request_issuance_helper_unittest.cc b/services/network/trust_tokens/trust_token_request_issuance_helper_unittest.cc index 576cfd1a95707d..b15ad6192ec474 100644 --- a/services/network/trust_tokens/trust_token_request_issuance_helper_unittest.cc +++ b/services/network/trust_tokens/trust_token_request_issuance_helper_unittest.cc @@ -8,7 +8,7 @@ #include "base/callback.h" #include "base/no_destructor.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h" #include "build/build_config.h" diff --git a/services/network/trust_tokens/trust_token_request_signing_helper_unittest.cc b/services/network/trust_tokens/trust_token_request_signing_helper_unittest.cc index aac5becb29bf13..4653c4137ca6ac 100644 --- a/services/network/trust_tokens/trust_token_request_signing_helper_unittest.cc +++ b/services/network/trust_tokens/trust_token_request_signing_helper_unittest.cc @@ -16,7 +16,7 @@ #include "base/ranges/algorithm.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/time/time_to_iso8601.h" #include "components/cbor/reader.h" diff --git a/services/network/url_loader_unittest.cc b/services/network/url_loader_unittest.cc index 5771022c76a474..5bb51ccc89b109 100644 --- a/services/network/url_loader_unittest.cc +++ b/services/network/url_loader_unittest.cc @@ -26,7 +26,7 @@ #include "base/path_service.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/gtest_util.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/task_environment.h" diff --git a/services/service_manager/public/cpp/standalone_connector_impl_unittest.cc b/services/service_manager/public/cpp/standalone_connector_impl_unittest.cc index 64c41918ee9c99..60eb9530b9667b 100644 --- a/services/service_manager/public/cpp/standalone_connector_impl_unittest.cc +++ b/services/service_manager/public/cpp/standalone_connector_impl_unittest.cc @@ -7,7 +7,7 @@ #include "base/macros.h" #include "base/optional.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "mojo/public/cpp/bindings/generic_pending_receiver.h" #include "mojo/public/cpp/bindings/remote.h" diff --git a/services/service_manager/tests/connect/connect_unittest.cc b/services/service_manager/tests/connect/connect_unittest.cc index c41c01f36b499b..96ee2dc95fe463 100644 --- a/services/service_manager/tests/connect/connect_unittest.cc +++ b/services/service_manager/tests/connect/connect_unittest.cc @@ -17,7 +17,7 @@ #include "base/process/process.h" #include "base/run_loop.h" #include "base/strings/strcat.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/gtest_util.h" #include "base/test/task_environment.h" #include "base/test/test_suite.h" diff --git a/services/shape_detection/barcode_detection_impl_barhopper_unittest.cc b/services/shape_detection/barcode_detection_impl_barhopper_unittest.cc index 49f7a7682a5a51..d934ca7585b872 100644 --- a/services/shape_detection/barcode_detection_impl_barhopper_unittest.cc +++ b/services/shape_detection/barcode_detection_impl_barhopper_unittest.cc @@ -4,7 +4,7 @@ #include "base/files/file_util.h" #include "base/path_service.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "mojo/public/cpp/bindings/remote.h" #include "services/shape_detection/barcode_detection_provider_barhopper.h" diff --git a/services/shape_detection/barcode_detection_provider_mac_unittest.mm b/services/shape_detection/barcode_detection_provider_mac_unittest.mm index afdf7c75804512..bd58060f5a0745 100644 --- a/services/shape_detection/barcode_detection_provider_mac_unittest.mm +++ b/services/shape_detection/barcode_detection_provider_mac_unittest.mm @@ -12,7 +12,7 @@ #include "base/bind.h" #include "base/callback_forward.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/gmock_callback_support.h" #include "base/test/task_environment.h" #include "mojo/public/cpp/bindings/remote.h" diff --git a/services/tracing/perfetto/consumer_host_unittest.cc b/services/tracing/perfetto/consumer_host_unittest.cc index 522d68b2fe7a2a..c2ba198409df56 100644 --- a/services/tracing/perfetto/consumer_host_unittest.cc +++ b/services/tracing/perfetto/consumer_host_unittest.cc @@ -17,7 +17,7 @@ #include "base/strings/string_number_conversions.h" #include "base/task/post_task.h" #include "base/task/thread_pool.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "mojo/public/cpp/bindings/receiver.h" #include "mojo/public/cpp/system/data_pipe.h" diff --git a/services/tracing/perfetto/perfetto_integration_unittest.cc b/services/tracing/perfetto/perfetto_integration_unittest.cc index c5b00b316c7221..c74b5c98a4c5f4 100644 --- a/services/tracing/perfetto/perfetto_integration_unittest.cc +++ b/services/tracing/perfetto/perfetto_integration_unittest.cc @@ -10,7 +10,7 @@ #include "base/bind.h" #include "base/run_loop.h" #include "base/strings/strcat.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/threading/thread.h" #include "services/tracing/perfetto/perfetto_service.h" diff --git a/services/tracing/perfetto/system_perfetto_unittest.cc b/services/tracing/perfetto/system_perfetto_unittest.cc index 0b6c066c2c2212..5d17978173c28c 100644 --- a/services/tracing/perfetto/system_perfetto_unittest.cc +++ b/services/tracing/perfetto/system_perfetto_unittest.cc @@ -16,7 +16,7 @@ #include "base/run_loop.h" #include "base/strings/strcat.h" #include "base/strings/string_number_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h" #include "base/trace_event/trace_config.h" diff --git a/services/tracing/public/cpp/stack_sampling/loader_lock_sampler_win_unittest.cc b/services/tracing/public/cpp/stack_sampling/loader_lock_sampler_win_unittest.cc index 5fd8a91f61425d..f11034230d11ae 100644 --- a/services/tracing/public/cpp/stack_sampling/loader_lock_sampler_win_unittest.cc +++ b/services/tracing/public/cpp/stack_sampling/loader_lock_sampler_win_unittest.cc @@ -10,7 +10,7 @@ #include "base/scoped_native_library.h" #include "base/strings/string16.h" #include "base/task/thread_pool.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/test/test_timeouts.h" #include "base/test/test_waitable_event.h" diff --git a/services/tracing/tracing_service_unittest.cc b/services/tracing/tracing_service_unittest.cc index 2ace6959df02da..9c725f42ce3b74 100644 --- a/services/tracing/tracing_service_unittest.cc +++ b/services/tracing/tracing_service_unittest.cc @@ -10,7 +10,7 @@ #include "base/macros.h" #include "base/run_loop.h" #include "base/strings/string_number_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h" #include "base/test/test_simple_task_runner.h" diff --git a/storage/browser/blob/blob_builder_from_stream_unittest.cc b/storage/browser/blob/blob_builder_from_stream_unittest.cc index 3c27c863187a66..7d2bb6344475b7 100644 --- a/storage/browser/blob/blob_builder_from_stream_unittest.cc +++ b/storage/browser/blob/blob_builder_from_stream_unittest.cc @@ -15,7 +15,7 @@ #include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/task/thread_pool/thread_pool_instance.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "mojo/public/cpp/bindings/associated_receiver.h" #include "mojo/public/cpp/bindings/associated_remote.h" diff --git a/storage/browser/blob/blob_reader_unittest.cc b/storage/browser/blob/blob_reader_unittest.cc index bdba18feb7e03d..14f7891e7e1650 100644 --- a/storage/browser/blob/blob_reader_unittest.cc +++ b/storage/browser/blob/blob_reader_unittest.cc @@ -22,7 +22,7 @@ #include "base/run_loop.h" #include "base/strings/stringprintf.h" #include "base/task_runner.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/threading/thread_task_runner_handle.h" #include "base/time/time.h" diff --git a/storage/browser/blob/blob_registry_impl_unittest.cc b/storage/browser/blob/blob_registry_impl_unittest.cc index 8f076e17c248ef..343dd78e67fa52 100644 --- a/storage/browser/blob/blob_registry_impl_unittest.cc +++ b/storage/browser/blob/blob_registry_impl_unittest.cc @@ -18,7 +18,7 @@ #include "base/sequenced_task_runner.h" #include "base/task/post_task.h" #include "base/task/thread_pool.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/threading/thread_restrictions.h" #include "mojo/public/cpp/bindings/associated_receiver.h" diff --git a/storage/browser/blob/blob_storage_context_mojo_unittest.cc b/storage/browser/blob/blob_storage_context_mojo_unittest.cc index 9a6d716e1e4149..ea95526e8bd566 100644 --- a/storage/browser/blob/blob_storage_context_mojo_unittest.cc +++ b/storage/browser/blob/blob_storage_context_mojo_unittest.cc @@ -14,7 +14,7 @@ #include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/test/test_simple_task_runner.h" #include "base/threading/thread_restrictions.h" diff --git a/storage/browser/blob/blob_url_store_impl_unittest.cc b/storage/browser/blob/blob_url_store_impl_unittest.cc index 13de8d09ca401d..f8dcfb605bcde0 100644 --- a/storage/browser/blob/blob_url_store_impl_unittest.cc +++ b/storage/browser/blob/blob_url_store_impl_unittest.cc @@ -6,7 +6,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "mojo/public/cpp/bindings/self_owned_receiver.h" #include "mojo/public/cpp/system/functions.h" diff --git a/storage/browser/database/database_quota_client_unittest.cc b/storage/browser/database/database_quota_client_unittest.cc index e89a39179b1b44..2b3c50443f6c07 100644 --- a/storage/browser/database/database_quota_client_unittest.cc +++ b/storage/browser/database/database_quota_client_unittest.cc @@ -17,7 +17,7 @@ #include "base/run_loop.h" #include "base/single_thread_task_runner.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/threading/sequenced_task_runner_handle.h" #include "net/base/completion_once_callback.h" diff --git a/storage/browser/database/database_tracker_unittest.cc b/storage/browser/database/database_tracker_unittest.cc index 4a4edf9174be5e..04c31e2b0d1bcf 100644 --- a/storage/browser/database/database_tracker_unittest.cc +++ b/storage/browser/database/database_tracker_unittest.cc @@ -15,7 +15,7 @@ #include "base/memory/ptr_util.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/threading/sequenced_task_runner_handle.h" #include "base/time/time.h" diff --git a/storage/browser/quota/quota_manager_unittest.cc b/storage/browser/quota/quota_manager_unittest.cc index 2349ba4f9f1b75..434521fcd4738d 100644 --- a/storage/browser/quota/quota_manager_unittest.cc +++ b/storage/browser/quota/quota_manager_unittest.cc @@ -23,7 +23,7 @@ #include "base/run_loop.h" #include "base/stl_util.h" #include "base/system/sys_info.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h" diff --git a/storage/browser/quota/quota_settings_unittest.cc b/storage/browser/quota/quota_settings_unittest.cc index 5d786352863592..2654212f214459 100644 --- a/storage/browser/quota/quota_settings_unittest.cc +++ b/storage/browser/quota/quota_settings_unittest.cc @@ -8,7 +8,7 @@ #include "base/bind.h" #include "base/callback.h" #include "base/files/scoped_temp_dir.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h" #include "storage/browser/quota/quota_device_info_helper.h" diff --git a/third_party/blink/common/loader/throttling_url_loader_unittest.cc b/third_party/blink/common/loader/throttling_url_loader_unittest.cc index 77036229e2fa18..bdf70d7878a4c7 100644 --- a/third_party/blink/common/loader/throttling_url_loader_unittest.cc +++ b/third_party/blink/common/loader/throttling_url_loader_unittest.cc @@ -9,7 +9,7 @@ #include "base/memory/ptr_util.h" #include "base/notreached.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "mojo/public/cpp/bindings/pending_remote.h" #include "net/traffic_annotation/network_traffic_annotation_test_helper.h" diff --git a/third_party/blink/renderer/core/DEPS b/third_party/blink/renderer/core/DEPS index 4c7e1a67f2c5a1..c1d86ea88d13c2 100644 --- a/third_party/blink/renderer/core/DEPS +++ b/third_party/blink/renderer/core/DEPS @@ -17,7 +17,7 @@ include_rules = [ "+base/synchronization/waitable_event.h", "+base/values.h", "+base/task/sequence_manager/task_time_observer.h", - "+base/test/bind_test_util.h", + "+base/test/bind.h", "+base/test/simple_test_tick_clock.h", "+base/time", "+base/unguessable_token.h", diff --git a/third_party/blink/renderer/core/input/event_handler_test.cc b/third_party/blink/renderer/core/input/event_handler_test.cc index aa4038d85710b7..1d0175cb1ac91f 100644 --- a/third_party/blink/renderer/core/input/event_handler_test.cc +++ b/third_party/blink/renderer/core/input/event_handler_test.cc @@ -7,7 +7,7 @@ #include #include "base/optional.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "build/build_config.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/blink/public/common/features.h" diff --git a/third_party/blink/renderer/core/loader/resource_load_observer_for_frame_test.cc b/third_party/blink/renderer/core/loader/resource_load_observer_for_frame_test.cc index 52a12373814fbb..bb96148014ec75 100644 --- a/third_party/blink/renderer/core/loader/resource_load_observer_for_frame_test.cc +++ b/third_party/blink/renderer/core/loader/resource_load_observer_for_frame_test.cc @@ -4,7 +4,7 @@ #include "third_party/blink/renderer/core/loader/resource_load_observer_for_frame.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/blink/public/mojom/fetch/fetch_api_request.mojom-blink.h" diff --git a/third_party/blink/renderer/core/page/scrolling/text_fragment_selector_generator_test.cc b/third_party/blink/renderer/core/page/scrolling/text_fragment_selector_generator_test.cc index b9bc63d90104bc..a0f2ac5aa14b17 100644 --- a/third_party/blink/renderer/core/page/scrolling/text_fragment_selector_generator_test.cc +++ b/third_party/blink/renderer/core/page/scrolling/text_fragment_selector_generator_test.cc @@ -7,7 +7,7 @@ #include #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "mojo/public/cpp/bindings/receiver_set.h" #include "third_party/blink/public/common/browser_interface_broker_proxy.h" #include "third_party/blink/public/mojom/link_to_text/link_to_text.mojom-blink.h" diff --git a/third_party/blink/renderer/core/scheduler_integration_tests/frame_throttling_test.cc b/third_party/blink/renderer/core/scheduler_integration_tests/frame_throttling_test.cc index ea65f7005babbf..866d3eedf2255f 100644 --- a/third_party/blink/renderer/core/scheduler_integration_tests/frame_throttling_test.cc +++ b/third_party/blink/renderer/core/scheduler_integration_tests/frame_throttling_test.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/callback.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "cc/layers/picture_layer.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/blink/public/common/features.h" diff --git a/third_party/blink/renderer/core/scroll/scroll_test.cc b/third_party/blink/renderer/core/scroll/scroll_test.cc index b62feda82f5915..b623eaf2f1f8c1 100644 --- a/third_party/blink/renderer/core/scroll/scroll_test.cc +++ b/third_party/blink/renderer/core/scroll/scroll_test.cc @@ -4,7 +4,7 @@ #include "third_party/blink/renderer/core/scroll/scroll_animator.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/blink/public/web/web_script_source.h" #include "third_party/blink/renderer/core/css/css_style_declaration.h" diff --git a/third_party/blink/renderer/core/testing/page_test_base.cc b/third_party/blink/renderer/core/testing/page_test_base.cc index 11fc9aa694989d..cd07e256f18e89 100644 --- a/third_party/blink/renderer/core/testing/page_test_base.cc +++ b/third_party/blink/renderer/core/testing/page_test_base.cc @@ -5,7 +5,7 @@ #include "third_party/blink/renderer/core/testing/page_test_base.h" #include "base/callback.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/time/default_tick_clock.h" #include "third_party/blink/public/common/browser_interface_broker_proxy.h" #include "third_party/blink/renderer/bindings/core/v8/string_or_array_buffer_or_array_buffer_view.h" diff --git a/third_party/blink/renderer/modules/DEPS b/third_party/blink/renderer/modules/DEPS index f87df72a701078..33f2edaef7082c 100644 --- a/third_party/blink/renderer/modules/DEPS +++ b/third_party/blink/renderer/modules/DEPS @@ -38,6 +38,6 @@ specific_include_rules = { "+testing/libfuzzer/proto/lpm_interface.h", ], "canvas_fuzzer.cc": [ - "+base/test/bind_test_util.h", + "+base/test/bind.h", ], } diff --git a/third_party/blink/renderer/modules/canvas/canvas_fuzzer.cc b/third_party/blink/renderer/modules/canvas/canvas_fuzzer.cc index c828a0228e0bc5..08fafde4d299da 100644 --- a/third_party/blink/renderer/modules/canvas/canvas_fuzzer.cc +++ b/third_party/blink/renderer/modules/canvas/canvas_fuzzer.cc @@ -5,7 +5,7 @@ #include #include #include -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/time/default_tick_clock.h" #include "third_party/blink/renderer/core/frame/local_frame_view.h" #include "third_party/blink/renderer/core/frame/settings.h" diff --git a/third_party/blink/renderer/modules/media/audio/DEPS b/third_party/blink/renderer/modules/media/audio/DEPS index a8cbd488aa6b09..5490fdeabe36c7 100644 --- a/third_party/blink/renderer/modules/media/audio/DEPS +++ b/third_party/blink/renderer/modules/media/audio/DEPS @@ -17,7 +17,7 @@ specific_include_rules = { ".*test\.cc" : [ "+base/message_loop/message_pump_type.h", "+base/run_loop.h", - "+base/test/bind_test_util.h", + "+base/test/bind.h", "+base/test/gtest_util.h", "+base/test/test_mock_time_task_runner.h", "+base/threading/thread.h", diff --git a/third_party/blink/renderer/modules/media/audio/web_audio_output_ipc_factory_test.cc b/third_party/blink/renderer/modules/media/audio/web_audio_output_ipc_factory_test.cc index 9d11aca74fa7fb..c0d48eac0db46d 100644 --- a/third_party/blink/renderer/modules/media/audio/web_audio_output_ipc_factory_test.cc +++ b/third_party/blink/renderer/modules/media/audio/web_audio_output_ipc_factory_test.cc @@ -11,7 +11,7 @@ #include "base/bind.h" #include "base/message_loop/message_pump_type.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/threading/thread.h" #include "media/audio/audio_output_ipc.h" #include "mojo/public/cpp/bindings/pending_receiver.h" diff --git a/third_party/blink/renderer/modules/media_capabilities/DEPS b/third_party/blink/renderer/modules/media_capabilities/DEPS index 3b8d2749b4f486..9dbd53be033679 100644 --- a/third_party/blink/renderer/modules/media_capabilities/DEPS +++ b/third_party/blink/renderer/modules/media_capabilities/DEPS @@ -20,7 +20,7 @@ specific_include_rules = { "media_capabilities_test\.cc": [ "+base/run_loop.h", "+base/strings/string_number_conversions.h", - "+base/test/bind_test_util.h", + "+base/test/bind.h", "+media/mojo/mojom/watch_time_recorder.mojom-blink.h", "+media/video/mock_gpu_video_accelerator_factories.h", ], diff --git a/third_party/blink/renderer/modules/media_capabilities/media_capabilities_test.cc b/third_party/blink/renderer/modules/media_capabilities/media_capabilities_test.cc index 8880c87a81cdde..e98b19c3c88e36 100644 --- a/third_party/blink/renderer/modules/media_capabilities/media_capabilities_test.cc +++ b/third_party/blink/renderer/modules/media_capabilities/media_capabilities_test.cc @@ -10,7 +10,7 @@ #include "base/strings/string_number_conversions.h" #include "base/task/post_task.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "media/base/media_switches.h" #include "media/base/video_codecs.h" diff --git a/third_party/blink/renderer/modules/mediastream/DEPS b/third_party/blink/renderer/modules/mediastream/DEPS index 186a3eaea84bf4..89ddbdb77f1335 100644 --- a/third_party/blink/renderer/modules/mediastream/DEPS +++ b/third_party/blink/renderer/modules/mediastream/DEPS @@ -63,7 +63,7 @@ specific_include_rules = { "+base/files/scoped_temp_dir.h", "+base/memory/aligned_memory.h", "+base/path_service.h", - "+base/test/bind_test_util.h", + "+base/test/bind.h", "+base/threading/thread.h", "+third_party/blink/renderer/platform/testing/video_frame_utils.h", ], diff --git a/third_party/blink/renderer/modules/mediastream/media_stream_video_track_test.cc b/third_party/blink/renderer/modules/mediastream/media_stream_video_track_test.cc index d1e9e2ef3d2b44..a9ea4202a83624 100644 --- a/third_party/blink/renderer/modules/mediastream/media_stream_video_track_test.cc +++ b/third_party/blink/renderer/modules/mediastream/media_stream_video_track_test.cc @@ -10,7 +10,7 @@ #include "base/memory/ptr_util.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/gmock_callback_support.h" #include "base/threading/thread_checker.h" #include "media/base/video_frame.h" diff --git a/third_party/blink/renderer/modules/mediastream/video_track_adapter_unittest.cc b/third_party/blink/renderer/modules/mediastream/video_track_adapter_unittest.cc index c842b1a065b164..98a9eeb3e74f07 100644 --- a/third_party/blink/renderer/modules/mediastream/video_track_adapter_unittest.cc +++ b/third_party/blink/renderer/modules/mediastream/video_track_adapter_unittest.cc @@ -9,7 +9,7 @@ #include "base/bind_helpers.h" #include "base/run_loop.h" #include "base/synchronization/waitable_event.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/threading/thread.h" #include "media/base/limits.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/third_party/blink/renderer/modules/nfc/DEPS b/third_party/blink/renderer/modules/nfc/DEPS index 7537a71ad2ede1..c16de1f8af6742 100644 --- a/third_party/blink/renderer/modules/nfc/DEPS +++ b/third_party/blink/renderer/modules/nfc/DEPS @@ -6,6 +6,6 @@ include_rules = [ specific_include_rules = { "nfc_proxy_test\.cc": [ "+base/run_loop.h", - "+base/test/bind_test_util.h", + "+base/test/bind.h", ], } diff --git a/third_party/blink/renderer/modules/nfc/nfc_proxy_test.cc b/third_party/blink/renderer/modules/nfc/nfc_proxy_test.cc index da1702554715c6..2f65ec30f94594 100644 --- a/third_party/blink/renderer/modules/nfc/nfc_proxy_test.cc +++ b/third_party/blink/renderer/modules/nfc/nfc_proxy_test.cc @@ -7,7 +7,7 @@ #include #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "mojo/public/cpp/bindings/pending_receiver.h" #include "mojo/public/cpp/bindings/receiver.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/third_party/blink/renderer/platform/graphics/video_frame_submitter_test.cc b/third_party/blink/renderer/platform/graphics/video_frame_submitter_test.cc index 0e916eeb3168b9..e242e03bca3c34 100644 --- a/third_party/blink/renderer/platform/graphics/video_frame_submitter_test.cc +++ b/third_party/blink/renderer/platform/graphics/video_frame_submitter_test.cc @@ -12,7 +12,7 @@ #include "base/macros.h" #include "base/memory/ptr_util.h" #include "base/memory/read_only_shared_memory_region.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/simple_test_tick_clock.h" #include "base/test/task_environment.h" #include "base/time/time.h" diff --git a/third_party/blink/renderer/platform/scheduler/common/throttling/task_queue_throttler_unittest.cc b/third_party/blink/renderer/platform/scheduler/common/throttling/task_queue_throttler_unittest.cc index 6c93abb6412a5a..5ccf80d1ebe3e9 100644 --- a/third_party/blink/renderer/platform/scheduler/common/throttling/task_queue_throttler_unittest.cc +++ b/third_party/blink/renderer/platform/scheduler/common/throttling/task_queue_throttler_unittest.cc @@ -13,7 +13,7 @@ #include "base/macros.h" #include "base/task/sequence_manager/sequence_manager.h" #include "base/task/sequence_manager/test/sequence_manager_for_test.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/test_mock_time_task_runner.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/third_party/blink/renderer/platform/scheduler/main_thread/frame_scheduler_impl_unittest.cc b/third_party/blink/renderer/platform/scheduler/main_thread/frame_scheduler_impl_unittest.cc index 08f350ee7b5546..e076b0a5b53211 100644 --- a/third_party/blink/renderer/platform/scheduler/main_thread/frame_scheduler_impl_unittest.cc +++ b/third_party/blink/renderer/platform/scheduler/main_thread/frame_scheduler_impl_unittest.cc @@ -16,7 +16,7 @@ #include "base/metrics/field_trial_params.h" #include "base/run_loop.h" #include "base/task/sequence_manager/test/sequence_manager_for_test.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_command_line.h" #include "base/test/scoped_feature_list.h" diff --git a/third_party/blink/renderer/platform/scheduler/main_thread/main_thread_scheduler_impl_unittest.cc b/third_party/blink/renderer/platform/scheduler/main_thread/main_thread_scheduler_impl_unittest.cc index 0e97ae03adf6b3..006a901f95a23b 100644 --- a/third_party/blink/renderer/platform/scheduler/main_thread/main_thread_scheduler_impl_unittest.cc +++ b/third_party/blink/renderer/platform/scheduler/main_thread/main_thread_scheduler_impl_unittest.cc @@ -19,7 +19,7 @@ #include "base/task/sequence_manager/test/fake_task.h" #include "base/task/sequence_manager/test/sequence_manager_for_test.h" #include "base/task/task_executor.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h" #include "base/test/simple_test_tick_clock.h" diff --git a/third_party/blink/renderer/platform/video_capture/video_capture_impl_test.cc b/third_party/blink/renderer/platform/video_capture/video_capture_impl_test.cc index 4bed3967aba3a1..c7076a10d07257 100644 --- a/third_party/blink/renderer/platform/video_capture/video_capture_impl_test.cc +++ b/third_party/blink/renderer/platform/video_capture/video_capture_impl_test.cc @@ -10,7 +10,7 @@ #include "base/macros.h" #include "base/memory/read_only_shared_memory_region.h" #include "base/memory/unsafe_shared_memory_region.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h" #include "media/capture/mojom/video_capture.mojom-blink.h" diff --git a/third_party/blink/renderer/platform/widget/input/input_handler_proxy_unittest.cc b/third_party/blink/renderer/platform/widget/input/input_handler_proxy_unittest.cc index ac7fc392b2cc47..75c14538fccbe0 100644 --- a/third_party/blink/renderer/platform/widget/input/input_handler_proxy_unittest.cc +++ b/third_party/blink/renderer/platform/widget/input/input_handler_proxy_unittest.cc @@ -10,7 +10,7 @@ #include "base/bind_helpers.h" #include "base/containers/circular_deque.h" #include "base/macros.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h" #include "base/test/simple_test_tick_clock.h" diff --git a/ui/aura/window_event_dispatcher_unittest.cc b/ui/aura/window_event_dispatcher_unittest.cc index d0ea995bbfbc95..35fd78d0632f0c 100644 --- a/ui/aura/window_event_dispatcher_unittest.cc +++ b/ui/aura/window_event_dispatcher_unittest.cc @@ -14,7 +14,7 @@ #include "base/run_loop.h" #include "base/single_thread_task_runner.h" #include "base/stl_util.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/threading/thread_task_runner_handle.h" #include "build/build_config.h" diff --git a/ui/aura/window_occlusion_tracker_unittest.cc b/ui/aura/window_occlusion_tracker_unittest.cc index 31ba4e71245151..2dfe0dabed132d 100644 --- a/ui/aura/window_occlusion_tracker_unittest.cc +++ b/ui/aura/window_occlusion_tracker_unittest.cc @@ -7,7 +7,7 @@ #include "base/bind_helpers.h" #include "base/macros.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/gtest_util.h" #include "base/test/scoped_feature_list.h" #include "build/build_config.h" diff --git a/ui/aura/window_unittest.cc b/ui/aura/window_unittest.cc index 54265f64c98cce..6bf4c71aff6cfc 100644 --- a/ui/aura/window_unittest.cc +++ b/ui/aura/window_unittest.cc @@ -15,7 +15,7 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "build/build_config.h" #include "cc/trees/layer_tree_frame_sink.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/ui/aura_extra/window_position_in_root_monitor_unittest.cc b/ui/aura_extra/window_position_in_root_monitor_unittest.cc index 785e23a35bbabe..30a446d644c3aa 100644 --- a/ui/aura_extra/window_position_in_root_monitor_unittest.cc +++ b/ui/aura_extra/window_position_in_root_monitor_unittest.cc @@ -6,7 +6,7 @@ #include "base/bind.h" #include "base/callback.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "ui/aura/test/aura_test_base.h" #include "ui/aura/test/test_windows.h" #include "ui/aura/window.h" diff --git a/ui/base/clipboard/test/clipboard_test_util.cc b/ui/base/clipboard/test/clipboard_test_util.cc index fd12f1c5437764..d54f20f652f05b 100644 --- a/ui/base/clipboard/test/clipboard_test_util.cc +++ b/ui/base/clipboard/test/clipboard_test_util.cc @@ -5,7 +5,7 @@ #include "ui/base/clipboard/test/clipboard_test_util.h" #include "base/synchronization/waitable_event.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "third_party/skia/include/core/SkImage.h" #include "ui/base/clipboard/clipboard.h" diff --git a/ui/base/ime/chromeos/input_method_chromeos_unittest.cc b/ui/base/ime/chromeos/input_method_chromeos_unittest.cc index 4b19003d1bec7d..a9b5586d322070 100644 --- a/ui/base/ime/chromeos/input_method_chromeos_unittest.cc +++ b/ui/base/ime/chromeos/input_method_chromeos_unittest.cc @@ -14,7 +14,7 @@ #include "base/i18n/char_iterator.h" #include "base/macros.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/ui/base/pointer/touch_ui_controller_unittest.cc b/ui/base/pointer/touch_ui_controller_unittest.cc index 1cfa4b8e170541..98d7baa084827c 100644 --- a/ui/base/pointer/touch_ui_controller_unittest.cc +++ b/ui/base/pointer/touch_ui_controller_unittest.cc @@ -6,7 +6,7 @@ #include "base/macros.h" #include "base/scoped_observer.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/pointer/touch_ui_controller.h" diff --git a/ui/compositor/animation_throughput_reporter_unittest.cc b/ui/compositor/animation_throughput_reporter_unittest.cc index 20cfae3dd237dc..d39b01bfdab850 100644 --- a/ui/compositor/animation_throughput_reporter_unittest.cc +++ b/ui/compositor/animation_throughput_reporter_unittest.cc @@ -7,7 +7,7 @@ #include #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/threading/thread_task_runner_handle.h" #include "base/time/time.h" diff --git a/ui/compositor/compositor_unittest.cc b/ui/compositor/compositor_unittest.cc index 2f9937475200e4..242a508436d752 100644 --- a/ui/compositor/compositor_unittest.cc +++ b/ui/compositor/compositor_unittest.cc @@ -7,7 +7,7 @@ #include "base/macros.h" #include "base/run_loop.h" #include "base/single_thread_task_runner.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/test/test_mock_time_task_runner.h" #include "base/threading/thread_task_runner_handle.h" diff --git a/ui/compositor/layer_unittest.cc b/ui/compositor/layer_unittest.cc index 3da9eb1b2bb07e..b4db7e463888e6 100644 --- a/ui/compositor/layer_unittest.cc +++ b/ui/compositor/layer_unittest.cc @@ -22,7 +22,7 @@ #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/time/time.h" #include "base/trace_event/trace_event.h" diff --git a/ui/compositor/test/test_utils.cc b/ui/compositor/test/test_utils.cc index aa829ae28db685..555aa642c9ceb0 100644 --- a/ui/compositor/test/test_utils.cc +++ b/ui/compositor/test/test_utils.cc @@ -6,7 +6,7 @@ #include "base/cancelable_callback.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/timer/timer.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/compositor/compositor.h" diff --git a/ui/gfx/animation/animation_runner_unittest.cc b/ui/gfx/animation/animation_runner_unittest.cc index 85038aaf6c673f..174fe72dde88ab 100644 --- a/ui/gfx/animation/animation_runner_unittest.cc +++ b/ui/gfx/animation/animation_runner_unittest.cc @@ -4,7 +4,7 @@ #include "ui/gfx/animation/animation_runner.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/ui/gfx/codec/jpeg_codec_unittest.cc b/ui/gfx/codec/jpeg_codec_unittest.cc index 0e892f6af0c3e7..54c57a1b723805 100644 --- a/ui/gfx/codec/jpeg_codec_unittest.cc +++ b/ui/gfx/codec/jpeg_codec_unittest.cc @@ -10,7 +10,7 @@ #include "base/run_loop.h" #include "base/stl_util.h" #include "base/task/thread_pool.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/gfx/codec/jpeg_codec.h" diff --git a/ui/views/animation/compositor_animation_runner_unittest.cc b/ui/views/animation/compositor_animation_runner_unittest.cc index 03b24ce9a1e861..8b20337e434b1b 100644 --- a/ui/views/animation/compositor_animation_runner_unittest.cc +++ b/ui/views/animation/compositor_animation_runner_unittest.cc @@ -4,7 +4,7 @@ #include "ui/views/animation/compositor_animation_runner.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/timer/timer.h" #include "ui/compositor/test/draw_waiter_for_test.h" #include "ui/compositor/throughput_tracker.h" diff --git a/ui/views/controls/menu/menu_closure_animation_mac_unittest.cc b/ui/views/controls/menu/menu_closure_animation_mac_unittest.cc index 790d6cacfd154c..1e99f895b55759 100644 --- a/ui/views/controls/menu/menu_closure_animation_mac_unittest.cc +++ b/ui/views/controls/menu/menu_closure_animation_mac_unittest.cc @@ -6,7 +6,7 @@ #include -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/task_environment.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/views/test/menu_test_utils.h" diff --git a/ui/views/controls/menu/menu_controller_unittest.cc b/ui/views/controls/menu/menu_controller_unittest.cc index d3b53c958a31bd..6da82efce9c491 100644 --- a/ui/views/controls/menu/menu_controller_unittest.cc +++ b/ui/views/controls/menu/menu_controller_unittest.cc @@ -13,7 +13,7 @@ #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/task/current_thread.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/threading/thread_task_runner_handle.h" #include "build/build_config.h" #include "ui/accessibility/ax_action_data.h" diff --git a/ui/views/controls/menu/menu_item_view_unittest.cc b/ui/views/controls/menu/menu_item_view_unittest.cc index 48bbbf7213e5dd..b942a3d978e90b 100644 --- a/ui/views/controls/menu/menu_item_view_unittest.cc +++ b/ui/views/controls/menu/menu_item_view_unittest.cc @@ -9,7 +9,7 @@ #include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/l10n/l10n_util.h" #include "ui/compositor/canvas_painter.h" diff --git a/ui/views/test/widget_test.cc b/ui/views/test/widget_test.cc index 4c079b18eef483..e6c48cfcb8bc15 100644 --- a/ui/views/test/widget_test.cc +++ b/ui/views/test/widget_test.cc @@ -5,7 +5,7 @@ #include "ui/views/test/widget_test.h" #include "base/rand_util.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "build/build_config.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/gfx/native_widget_types.h" diff --git a/ui/views/test/widget_test.h b/ui/views/test/widget_test.h index 3a0ead058c8777..02565096cd90d1 100644 --- a/ui/views/test/widget_test.h +++ b/ui/views/test/widget_test.h @@ -13,7 +13,7 @@ #include "base/macros.h" #include "base/run_loop.h" #include "base/scoped_observer.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "build/build_config.h" #include "ui/gfx/native_widget_types.h" #include "ui/views/test/views_test_base.h" diff --git a/ui/views/widget/any_widget_observer_unittest.cc b/ui/views/widget/any_widget_observer_unittest.cc index 344fd0943bdb98..e67837940af68f 100644 --- a/ui/views/widget/any_widget_observer_unittest.cc +++ b/ui/views/widget/any_widget_observer_unittest.cc @@ -8,7 +8,7 @@ #include #include "base/bind.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/threading/thread_task_runner_handle.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/views/test/native_widget_factory.h" diff --git a/ui/views/widget/widget_delegate_unittest.cc b/ui/views/widget/widget_delegate_unittest.cc index 6129e449e1a6ba..e5f3305f9d0c33 100644 --- a/ui/views/widget/widget_delegate_unittest.cc +++ b/ui/views/widget/widget_delegate_unittest.cc @@ -6,7 +6,7 @@ #include -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "ui/views/test/views_test_base.h" #include "ui/views/view.h" #include "ui/views/view_tracker.h" diff --git a/ui/views/window/dialog_delegate_unittest.cc b/ui/views/window/dialog_delegate_unittest.cc index a0c0e570eb4366..426cfde3bb49b5 100644 --- a/ui/views/window/dialog_delegate_unittest.cc +++ b/ui/views/window/dialog_delegate_unittest.cc @@ -6,7 +6,7 @@ #include "base/stl_util.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "build/build_config.h" #include "ui/base/hit_test.h" #include "ui/events/event_processor.h" diff --git a/weblayer/browser/android/metrics/metrics_browsertest.cc b/weblayer/browser/android/metrics/metrics_browsertest.cc index ec8bff6d7a686f..60892c72947412 100644 --- a/weblayer/browser/android/metrics/metrics_browsertest.cc +++ b/weblayer/browser/android/metrics/metrics_browsertest.cc @@ -8,7 +8,7 @@ #include "base/metrics/metrics_hashes.h" #include "base/metrics/statistics_recorder.h" #include "base/no_destructor.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "components/metrics/log_decoder.h" #include "components/metrics/metrics_log_uploader.h" #include "components/metrics/metrics_switches.h" diff --git a/weblayer/browser/android/metrics/ukm_browsertest.cc b/weblayer/browser/android/metrics/ukm_browsertest.cc index 53bd22038078bc..e19898e6e26544 100644 --- a/weblayer/browser/android/metrics/ukm_browsertest.cc +++ b/weblayer/browser/android/metrics/ukm_browsertest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "components/ukm/ukm_test_helper.h" #include "weblayer/browser/android/metrics/metrics_test_helper.h" #include "weblayer/browser/android/metrics/weblayer_metrics_service_client.h" diff --git a/weblayer/browser/cookie_manager_browsertest.cc b/weblayer/browser/cookie_manager_browsertest.cc index 0d98a159a747d0..ca2cc7079bef95 100644 --- a/weblayer/browser/cookie_manager_browsertest.cc +++ b/weblayer/browser/cookie_manager_browsertest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "net/test/embedded_test_server/embedded_test_server.h" #include "weblayer/browser/profile_impl.h" #include "weblayer/public/cookie_manager.h" diff --git a/weblayer/browser/download_browsertest.cc b/weblayer/browser/download_browsertest.cc index c44c8c89fa0d06..8fc730d432a25a 100644 --- a/weblayer/browser/download_browsertest.cc +++ b/weblayer/browser/download_browsertest.cc @@ -9,7 +9,7 @@ #include "base/path_service.h" #include "base/run_loop.h" #include "base/task/post_task.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/threading/thread_restrictions.h" #include "content/public/browser/download_manager.h" #include "content/public/browser/web_contents.h" diff --git a/weblayer/browser/errorpage_browsertest.cc b/weblayer/browser/errorpage_browsertest.cc index 776b26ba143e1d..58abe90e6e9dcc 100644 --- a/weblayer/browser/errorpage_browsertest.cc +++ b/weblayer/browser/errorpage_browsertest.cc @@ -5,7 +5,7 @@ #include "weblayer/test/weblayer_browser_test.h" #include "base/macros.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "components/error_page/content/browser/net_error_auto_reloader.h" #include "content/public/test/browser_test_utils.h" diff --git a/weblayer/browser/navigation_browsertest.cc b/weblayer/browser/navigation_browsertest.cc index 648dc0ac7c322c..5bd4ca25c2f7c8 100644 --- a/weblayer/browser/navigation_browsertest.cc +++ b/weblayer/browser/navigation_browsertest.cc @@ -7,7 +7,7 @@ #include "base/callback.h" #include "base/files/file_path.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "components/variations/net/variations_http_headers.h" #include "components/variations/variations_ids_provider.h" #include "content/public/browser/web_contents_observer.h" diff --git a/weblayer/browser/page_load_metrics_browsertest.cc b/weblayer/browser/page_load_metrics_browsertest.cc index 643036782638a4..c82e49975a9515 100644 --- a/weblayer/browser/page_load_metrics_browsertest.cc +++ b/weblayer/browser/page_load_metrics_browsertest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "components/page_load_metrics/browser/page_load_metrics_observer.h" #include "components/page_load_metrics/browser/page_load_tracker.h" diff --git a/weblayer/browser/persistence/browser_persister_browsertest.cc b/weblayer/browser/persistence/browser_persister_browsertest.cc index 7a7572cae05645..67edec896c45b5 100644 --- a/weblayer/browser/persistence/browser_persister_browsertest.cc +++ b/weblayer/browser/persistence/browser_persister_browsertest.cc @@ -10,7 +10,7 @@ #include "base/guid.h" #include "base/path_service.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "base/threading/thread_restrictions.h" #include "build/build_config.h" #include "components/sessions/core/command_storage_manager_test_helper.h" diff --git a/weblayer/browser/prefetch_browsertest.cc b/weblayer/browser/prefetch_browsertest.cc index 4648c1c05b4d15..df3bcafc68a7d3 100644 --- a/weblayer/browser/prefetch_browsertest.cc +++ b/weblayer/browser/prefetch_browsertest.cc @@ -4,7 +4,7 @@ #include "base/files/file_path.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "build/build_config.h" #include "components/network_session_configurator/common/network_switches.h" #include "content/public/browser/web_contents.h" diff --git a/weblayer/browser/profile_browsertest.cc b/weblayer/browser/profile_browsertest.cc index 063adfebbfe200..e4fe35db1884b3 100644 --- a/weblayer/browser/profile_browsertest.cc +++ b/weblayer/browser/profile_browsertest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "build/build_config.h" #include "components/content_settings/core/browser/host_content_settings_map.h" #include "ui/gfx/image/image_unittest_util.h" diff --git a/weblayer/test/test_navigation_observer.cc b/weblayer/test/test_navigation_observer.cc index fde7688a1aa7e2..c1207f6fe88d40 100644 --- a/weblayer/test/test_navigation_observer.cc +++ b/weblayer/test/test_navigation_observer.cc @@ -4,7 +4,7 @@ #include "weblayer/test/test_navigation_observer.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "url/gurl.h" #include "weblayer/public/navigation.h" #include "weblayer/public/navigation_controller.h" diff --git a/weblayer/test/weblayer_browser_test_utils.cc b/weblayer/test/weblayer_browser_test_utils.cc index 4d920f8db0a5c5..11a0e22342d218 100644 --- a/weblayer/test/weblayer_browser_test_utils.cc +++ b/weblayer/test/weblayer_browser_test_utils.cc @@ -5,7 +5,7 @@ #include "weblayer/test/weblayer_browser_test_utils.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "url/gurl.h" #include "weblayer/browser/tab_impl.h" #include "weblayer/public/navigation_controller.h"