Skip to content

Commit

Permalink
Move base/test/bind_test_util.h to base/test/bind.h
Browse files Browse the repository at this point in the history 
Stop relying on us to remember arcane file names when writing tests,
and repeating the directory hierarchy into the file name.

[email protected]
TBR=
NOPRESUBMIT=true

Change-Id: I49c951162939c7dcef44883bee740f94b2f49e09
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2523099
Commit-Queue: danakj <[email protected]>
Reviewed-by: Daniel Cheng <[email protected]>
Cr-Commit-Position: refs/heads/master@{#825145}
  • Loading branch information
@danakj
danakj authored and Commit Bot committed Nov 7, 2020
1 parent 11a2d83 commit a4493a6
Show file tree
Hide file tree
Showing 1,065 changed files with 1,067 additions and 1,067 deletions.
2 changes: 1 addition & 1 deletion android_webview/test/shell/memory_metrics_logger_utils.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ash/ambient/ambient_controller_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ash/ambient/ambient_photo_controller_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ash/in_session_auth/in_session_auth_dialog_controller_impl_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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::_;

Expand Down
2 changes: 1 addition & 1 deletion ash/keyboard/keyboard_controller_impl_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ash/login/login_screen_controller_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion ash/login/ui/pin_request_view_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ash/metrics/presentation_time_recorder_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ash/public/cpp/external_arc/message_center/arc_notification_content_view_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ash/public/cpp/holding_space/holding_space_item_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ash/public/cpp/metrics_util_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion ash/system/holding_space/holding_space_tray_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ash/wallpaper/wallpaper_controller_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ash/wm/overview/overview_test_util.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion base/allocator/partition_allocator/partition_lock_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion base/allocator/partition_allocator/thread_cache_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion base/android/java_handler_thread_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion base/bind_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion base/bind_unittest.nc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion base/debug/task_trace_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include <ostream>

#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"

Expand Down
2 changes: 1 addition & 1 deletion base/files/important_file_writer_cleaner_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion base/fuchsia/intl_profile_watcher_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion base/logging_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion base/message_loop/message_pump_mac_unittest.mm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion base/message_loop/message_pump_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion base/message_loop/work_id_provider_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include <utility>

#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"

Expand Down
2 changes: 1 addition & 1 deletion base/observer_list_threadsafe_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion base/profiler/module_cache_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion base/profiler/native_unwinder_android_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion base/profiler/stack_sampling_profiler_test_util.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion base/profiler/stack_sampling_profiler_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion base/run_loop_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion base/sequence_checker_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion base/task/cancelable_task_tracker_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion base/task/common/task_annotator_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion base/task/job_perftest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion base/task/post_job_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include <numeric>

#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"
Expand Down
2 changes: 1 addition & 1 deletion base/task/post_task_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion base/task/sequence_manager/atomic_flag_set_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include <utility>
#include <vector>

#include "base/test/bind_test_util.h"
#include "base/test/bind.h"
#include "testing/gmock/include/gmock/gmock.h"

using testing::ElementsAre;
Expand Down
2 changes: 1 addition & 1 deletion base/task/sequence_manager/sequence_manager_impl_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion base/task/sequence_manager/thread_controller_with_message_pump_impl_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion base/task/single_thread_task_executor_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion base/task/thread_pool/can_run_policy_test.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion base/task/thread_pool/delayed_task_manager_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading

0 comments on commit a4493a6

Please sign in to comment.