Remove base/memory/page_size.h from base/process/process_metrics.h.

In https://crrev.com/879993, base::GetPageSize() moved into its own
header. Update all the callers to base::GetPageSize() to include
base/memory/page_size.h instead of base/process/process_metrics.h.

Change-Id: I666afa5e80f530a20727ab1862bc1f3d7461f036
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2897941
Reviewed-by: Mark Mentovai <mark@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Owners-Override: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#883202}

base/allocator/allocator_shim.cc

@@ -13,7 +13,7 @@
 #include "base/bits.h"
 #include "base/check_op.h"
 #include "base/macros.h"
-#include "base/process/process_metrics.h"
+#include "base/memory/page_size.h"
 #include "base/threading/platform_thread.h"
 #include "build/build_config.h"
 

base/allocator/allocator_shim_unittest.cc

@@ -16,7 +16,7 @@
 
 #include "base/allocator/buildflags.h"
 #include "base/allocator/partition_allocator/partition_alloc.h"
-#include "base/process/process_metrics.h"
+#include "base/memory/page_size.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/platform_thread.h"
 #include "base/threading/thread_local.h"

base/allocator/tcmalloc_unittest.cc

@@ -8,7 +8,7 @@
 #include "base/allocator/buildflags.h"
 #include "base/check_op.h"
 #include "base/compiler_specific.h"
-#include "base/process/process_metrics.h"
+#include "base/memory/page_size.h"
 #include "base/system/sys_info.h"
 #include "build/build_config.h"
 #include "testing/gtest/include/gtest/gtest.h"

base/memory/discardable_shared_memory.cc

@@ -15,9 +15,9 @@
 #include "base/logging.h"
 #include "base/memory/discardable_memory.h"
 #include "base/memory/discardable_memory_internal.h"
+#include "base/memory/page_size.h"
 #include "base/memory/shared_memory_tracker.h"
 #include "base/numerics/safe_math.h"
-#include "base/process/process_metrics.h"
 #include "base/tracing_buildflags.h"
 #include "build/build_config.h"
 

base/memory/discardable_shared_memory_unittest.cc

@@ -7,8 +7,8 @@
 
 #include "base/files/scoped_file.h"
 #include "base/memory/discardable_shared_memory.h"
+#include "base/memory/page_size.h"
 #include "base/memory/shared_memory_tracker.h"
-#include "base/process/process_metrics.h"
 #include "base/tracing_buildflags.h"
 #include "build/build_config.h"
 #include "testing/gtest/include/gtest/gtest.h"

base/memory/madv_free_discardable_memory_allocator_posix_unittest.cc

@@ -10,7 +10,7 @@
 #include "base/files/scoped_file.h"
 #include "base/memory/madv_free_discardable_memory_allocator_posix.h"
 #include "base/memory/madv_free_discardable_memory_posix.h"
-#include "base/process/process_metrics.h"
+#include "base/memory/page_size.h"
 #include "base/tracing_buildflags.h"
 #include "build/build_config.h"
 #include "testing/gtest/include/gtest/gtest.h"

base/memory/madv_free_discardable_memory_posix.cc

@@ -16,7 +16,7 @@
 #include "base/logging.h"
 #include "base/memory/madv_free_discardable_memory_allocator_posix.h"
 #include "base/memory/madv_free_discardable_memory_posix.h"
-#include "base/process/process_metrics.h"
+#include "base/memory/page_size.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/tracing_buildflags.h"

base/memory/madv_free_discardable_memory_posix_unittest.cc

@@ -14,7 +14,7 @@
 #include "base/files/scoped_file.h"
 #include "base/memory/madv_free_discardable_memory_allocator_posix.h"
 #include "base/memory/madv_free_discardable_memory_posix.h"
-#include "base/process/process_metrics.h"
+#include "base/memory/page_size.h"
 #include "build/build_config.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

base/memory/platform_shared_memory_region_android.cc

@@ -8,10 +8,10 @@
 
 #include "base/bits.h"
 #include "base/logging.h"
+#include "base/memory/page_size.h"
 #include "base/memory/shared_memory_tracker.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/posix/eintr_wrapper.h"
-#include "base/process/process_metrics.h"
 #include "third_party/ashmem/ashmem.h"
 
 namespace base {

base/memory/platform_shared_memory_region_fuchsia.cc

@@ -10,7 +10,7 @@
 
 #include "base/bits.h"
 #include "base/fuchsia/fuchsia_logging.h"
-#include "base/process/process_metrics.h"
+#include "base/memory/page_size.h"
 
 namespace base {
 namespace subtle {

base/memory/shared_memory_security_policy.cc

@@ -8,9 +8,9 @@
 #include <atomic>
 
 #include "base/bits.h"
+#include "base/memory/page_size.h"
 #include "base/numerics/checked_math.h"
 #include "base/optional.h"
-#include "base/process/process_metrics.h"
 #include "build/build_config.h"
 
 namespace base {

base/process/memory_unittest.cc

@@ -17,7 +17,7 @@
 #include "base/compiler_specific.h"
 #include "base/debug/alias.h"
 #include "base/memory/aligned_memory.h"
-#include "base/process/process_metrics.h"
+#include "base/memory/page_size.h"
 #include "build/build_config.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

base/process/process_metrics.h

@@ -21,9 +21,6 @@
 #include "build/build_config.h"
 #include "build/chromeos_buildflags.h"
 
-// TODO(thestig): Update GetPageSize() callers and remove.
-#include "base/memory/page_size.h"
-
 #if defined(OS_APPLE)
 #include <mach/mach.h>
 #include "base/process/port_provider_mac.h"

base/trace_event/process_memory_dump.cc

@@ -10,6 +10,7 @@
 #include <vector>
 
 #include "base/logging.h"
+#include "base/memory/page_size.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/shared_memory_tracker.h"
 #include "base/process/process_metrics.h"

chrome/browser/extensions/api/messaging/native_message_process_host_unittest.cc

@@ -21,8 +21,8 @@
 #include "base/files/scoped_file.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/json/json_reader.h"
+#include "base/memory/page_size.h"
 #include "base/path_service.h"
-#include "base/process/process_metrics.h"
 #include "base/rand_util.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"

chrome/browser/performance_manager/mechanisms/userspace_swap_chromeos.cc

@@ -10,8 +10,8 @@
 #include "base/bits.h"
 #include "base/callback_helpers.h"
 #include "base/files/scoped_file.h"
+#include "base/memory/page_size.h"
 #include "base/posix/safe_strerror.h"
-#include "base/process/process_metrics.h"
 #include "base/task/post_task.h"
 #include "base/threading/scoped_blocking_call.h"
 #include "chromeos/memory/userspace_swap/region.h"

chrome/browser/performance_manager/policies/dynamic_tcmalloc_policy_chromeos.cc

@@ -8,6 +8,7 @@
 
 #include "base/bind.h"
 #include "base/bits.h"
+#include "base/memory/page_size.h"
 #include "base/memory/weak_ptr.h"
 #include "base/process/process_metrics.h"
 #include "base/time/time.h"

chrome/browser/resources_integrity.cc

@@ -8,9 +8,9 @@
 
 #include "base/bind.h"
 #include "base/files/file.h"
+#include "base/memory/page_size.h"
 #include "base/metrics/histogram_functions.h"
 #include "base/path_service.h"
-#include "base/process/process_metrics.h"
 #include "base/ranges/algorithm.h"
 #include "base/task/thread_pool.h"
 #include "chrome/common/chrome_paths.h"

chromeos/memory/pagemap.cc

@@ -11,8 +11,8 @@
 
 #include "base/logging.h"
 #include "base/memory/aligned_memory.h"
+#include "base/memory/page_size.h"
 #include "base/posix/eintr_wrapper.h"
-#include "base/process/process_metrics.h"
 #include "base/strings/stringprintf.h"
 #include "base/threading/scoped_blocking_call.h"
 

chromeos/memory/pagemap_unittest.cc

@@ -13,8 +13,8 @@
 #include <random>
 
 #include "base/files/scoped_file.h"
+#include "base/memory/page_size.h"
 #include "base/posix/eintr_wrapper.h"
-#include "base/process/process_metrics.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace chromeos {

chromeos/memory/userspace_swap/userfaultfd_unittest.cc

@@ -15,7 +15,7 @@
 #include "base/bind.h"
 #include "base/files/scoped_file.h"
 #include "base/logging.h"
-#include "base/process/process_metrics.h"
+#include "base/memory/page_size.h"
 #include "base/rand_util.h"
 #include "base/task/thread_pool.h"
 #include "base/test/bind.h"

chromeos/memory/userspace_swap/userspace_swap.cc

@@ -9,8 +9,8 @@
 
 #include "base/feature_list.h"
 #include "base/files/file_util.h"
+#include "base/memory/page_size.h"
 #include "base/metrics/field_trial_params.h"
-#include "base/process/process_metrics.h"
 #include "base/rand_util.h"
 #include "base/time/time.h"
 #include "build/build_config.h"

components/discardable_memory/client/client_discardable_shared_memory_manager.cc

@@ -14,10 +14,10 @@
 #include "base/macros.h"
 #include "base/memory/discardable_memory.h"
 #include "base/memory/discardable_shared_memory.h"
+#include "base/memory/page_size.h"
 #include "base/metrics/histogram_functions.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/process/memory.h"
-#include "base/process/process_metrics.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/system/sys_info.h"

components/discardable_memory/client/client_discardable_shared_memory_manager_unittest.cc

@@ -5,7 +5,7 @@
 #include "components/discardable_memory/client/client_discardable_shared_memory_manager.h"
 #include "base/memory/discardable_memory.h"
 #include "base/memory/discardable_shared_memory.h"
-#include "base/process/process_metrics.h"
+#include "base/memory/page_size.h"
 #include "base/synchronization/lock.h"
 #include "base/test/metrics/histogram_tester.h"
 #include "base/test/scoped_feature_list.h"

components/discardable_memory/common/discardable_shared_memory_heap.cc

@@ -14,6 +14,7 @@
 #include "base/format_macros.h"
 #include "base/memory/aligned_memory.h"
 #include "base/memory/discardable_shared_memory.h"
+#include "base/memory/page_size.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/stl_util.h"

components/discardable_memory/common/discardable_shared_memory_heap_perftest.cc

@@ -14,7 +14,7 @@
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/memory/discardable_shared_memory.h"
-#include "base/process/process_metrics.h"
+#include "base/memory/page_size.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/perf/perf_result_reporter.h"
 

components/discardable_memory/common/discardable_shared_memory_heap_unittest.cc

@@ -11,7 +11,7 @@
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/memory/discardable_shared_memory.h"
-#include "base/process/process_metrics.h"
+#include "base/memory/page_size.h"
 #include "base/strings/stringprintf.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"

components/gwp_asan/client/guarded_page_allocator.cc

@@ -11,8 +11,8 @@
 #include "base/bits.h"
 #include "base/debug/stack_trace.h"
 #include "base/logging.h"
+#include "base/memory/page_size.h"
 #include "base/no_destructor.h"
-#include "base/process/process_metrics.h"
 #include "base/rand_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/synchronization/lock.h"

components/gwp_asan/client/guarded_page_allocator_unittest.cc

@@ -11,7 +11,7 @@
 #include <vector>
 
 #include "base/bits.h"
-#include "base/process/process_metrics.h"
+#include "base/memory/page_size.h"
 #include "base/test/bind.h"
 #include "base/test/gtest_util.h"
 #include "base/threading/simple_thread.h"

components/gwp_asan/client/sampling_malloc_shims_unittest.cc

@@ -11,7 +11,7 @@
 
 #include "base/allocator/allocator_shim.h"
 #include "base/callback_helpers.h"
-#include "base/process/process_metrics.h"
+#include "base/memory/page_size.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/test/gtest_util.h"
 #include "base/test/multiprocess_test.h"

components/gwp_asan/client/sampling_partitionalloc_shims_unittest.cc

@@ -14,8 +14,8 @@
 #include "base/allocator/partition_allocator/partition_root.h"
 #include "base/callback_helpers.h"
 #include "base/logging.h"
+#include "base/memory/page_size.h"
 #include "base/partition_alloc_buildflags.h"
-#include "base/process/process_metrics.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/test/gtest_util.h"
 #include "base/test/multiprocess_test.h"

components/gwp_asan/common/allocator_state.cc

@@ -8,7 +8,7 @@
 
 #include "base/bits.h"
 #include "base/logging.h"
-#include "base/process/process_metrics.h"
+#include "base/memory/page_size.h"
 #include "base/strings/stringprintf.h"
 #include "base/threading/platform_thread.h"
 #include "build/build_config.h"

components/gwp_asan/common/allocator_state_unittest.cc

@@ -6,7 +6,7 @@
 
 #include <limits>
 
-#include "base/process/process_metrics.h"
+#include "base/memory/page_size.h"
 #include "base/test/gtest_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

components/gwp_asan/crash_handler/crash_handler_unittest.cc

@@ -13,9 +13,9 @@
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
+#include "base/memory/page_size.h"
 #include "base/no_destructor.h"
 #include "base/path_service.h"
-#include "base/process/process_metrics.h"
 #include "base/strings/stringprintf.h"
 #include "base/test/gtest_util.h"
 #include "base/test/multiprocess_test.h"

media/fuchsia/common/vmo_buffer.cc

@@ -9,7 +9,7 @@
 
 #include "base/bits.h"
 #include "base/fuchsia/fuchsia_logging.h"
-#include "base/process/process_metrics.h"
+#include "base/memory/page_size.h"
 
 namespace media {
 

media/gpu/v4l2/v4l2_mjpeg_decode_accelerator.cc

@@ -17,8 +17,8 @@
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/files/scoped_file.h"
+#include "base/memory/page_size.h"
 #include "base/numerics/safe_conversions.h"
-#include "base/process/process_metrics.h"
 #include "base/stl_util.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "media/base/bitstream_buffer.h"

media/gpu/vaapi/vaapi_mjpeg_decode_accelerator.cc

@@ -16,11 +16,11 @@
 #include "base/files/scoped_file.h"
 #include "base/location.h"
 #include "base/logging.h"
+#include "base/memory/page_size.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/numerics/checked_math.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/optional.h"
-#include "base/process/process_metrics.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/trace_event/trace_event.h"

mojo/core/channel_linux.cc

@@ -25,13 +25,13 @@
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/macros.h"
+#include "base/memory/page_size.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/shared_memory_security_policy.h"
 #include "base/message_loop/message_pump_for_io.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/posix/eintr_wrapper.h"
-#include "base/process/process_metrics.h"
 #include "base/system/sys_info.h"
 #include "base/task_runner.h"
 #include "base/time/time.h"

mojo/core/channel_unittest.cc

@@ -7,11 +7,11 @@
 #include <atomic>
 
 #include "base/bind.h"
+#include "base/memory/page_size.h"
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_pump_type.h"
 #include "base/optional.h"
 #include "base/process/process_handle.h"
-#include "base/process/process_metrics.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "base/test/bind.h"

sandbox/linux/seccomp-bpf/syscall_unittest.cc

@@ -16,8 +16,8 @@
 
 #include <vector>
 
+#include "base/memory/page_size.h"
 #include "base/posix/eintr_wrapper.h"
-#include "base/process/process_metrics.h"
 #include "base/stl_util.h"
 #include "build/build_config.h"
 #include "sandbox/linux/bpf_dsl/bpf_dsl.h"