[PA] Update DEPS for new include path #cleanup

Before this CL,

- `//DEPS` allows including `base/` headers
- `//base/DEPS` allows including `partition_alloc` headers, while
  banning `base/allocator/partition_alloc`.

This forced us to use

- `#include "partition_alloc/*"` in `//base`
- `#include "base/allocator/partition_alloc/src/partition_alloc/*"`
  elsewhere

and the rule was inconsistent.


This CL applies the DEP include rule in `//base` chrome-wide so that
we can only use `#include "partition_alloc/*"` style includes.


At the same time, all `#include` with the old style are rewritten.
This need to be done in the single CL to avoid DEP rule check errors.

Bug: 40276913
Change-Id: I1410888184df71ec3bd6374d58d876740357272c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5745369
Commit-Queue: Mikihito Matsuura <mikt@google.com>
Reviewed-by: Rick Byers <rbyers@chromium.org>
Reviewed-by: Arthur Sonzogni <arthursonzogni@chromium.org>
Owners-Override: Rick Byers <rbyers@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1334435}

DEPS

@@ -5116,6 +5116,13 @@ include_rules = [
   '+third_party/perfetto/include/perfetto/tracing',
   '+third_party/perfetto/include/perfetto/test',
 
+  # PartitionAlloc is located at `base/allocator/partition_allocator` but
+  # prefers its own include path:
+  # `#include "partition_alloc/..."` is prefered to
+  # `#include "base/allocator/partition_allocator/src/partition_alloc/..."`.
+  "+partition_alloc",
+  "-base/allocator/partition_allocator",
+
   # Everybody can use headers generated by tools/generate_library_loader.
   '+library_loaders',
 

base/DEPS

@@ -1,9 +1,4 @@
 include_rules = [
-  # `#include "partition_alloc/..."` is prefered to
-  # `#include "base/allocator/partition_allocator/src/partition_alloc/..."`.
-  "+partition_alloc",
-  "-base/allocator/partition_allocator",
-
   "+third_party/ashmem",
   "+third_party/apple_apsl",
   "+third_party/boringssl/src/include",

build/rust/tests/test_cpp_including_rust/shared_unittests.cc

@@ -7,14 +7,14 @@
 
 #include <memory>
 
-#include "base/allocator/partition_allocator/src/partition_alloc/buildflags.h"
 #include "build/rust/tests/test_rust_shared_library/src/lib.rs.h"
+#include "partition_alloc/buildflags.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if PA_BUILDFLAG(HAS_64_BIT_POINTERS)
-#include "base/allocator/partition_allocator/src/partition_alloc/partition_address_space.h"
+#include "partition_alloc/partition_address_space.h"
 #else
-#include "base/allocator/partition_allocator/src/partition_alloc/address_pool_manager_bitmap.h"
+#include "partition_alloc/address_pool_manager_bitmap.h"
 #endif
 
 TEST(RustSharedTest, CppCallingIntoRust_BasicFFI) {

build/rust/tests/test_cpp_including_rust/static_unittests.cc

@@ -8,14 +8,14 @@
 #include <limits>
 #include <memory>
 
-#include "base/allocator/partition_allocator/src/partition_alloc/buildflags.h"
 #include "build/rust/tests/test_rust_static_library/src/lib.rs.h"
+#include "partition_alloc/buildflags.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if PA_BUILDFLAG(HAS_64_BIT_POINTERS)
-#include "base/allocator/partition_allocator/src/partition_alloc/partition_address_space.h"
+#include "partition_alloc/partition_address_space.h"
 #else
-#include "base/allocator/partition_allocator/src/partition_alloc/address_pool_manager_bitmap.h"
+#include "partition_alloc/address_pool_manager_bitmap.h"
 #endif
 
 TEST(RustStaticTest, CppCallingIntoRust_BasicFFI) {

chrome/app/chrome_main.cc

@@ -7,7 +7,6 @@
 #include <iostream>
 #include <memory>
 
-#include "base/allocator/partition_allocator/src/partition_alloc/buildflags.h"
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/functional/bind.h"
@@ -25,6 +24,7 @@
 #include "content/public/common/content_switches.h"
 #include "headless/public/headless_shell.h"
 #include "headless/public/switches.h"
+#include "partition_alloc/buildflags.h"
 
 #if BUILDFLAG(IS_MAC)
 #include "chrome/app/chrome_main_mac.h"

chrome/browser/metrics/process_memory_metrics_emitter.cc

@@ -10,7 +10,6 @@
 #include <utility>
 
 #include "base/allocator/buildflags.h"
-#include "base/allocator/partition_allocator/src/partition_alloc/buildflags.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/containers/flat_map.h"
@@ -42,6 +41,7 @@
 #include "content/public/common/content_switches.h"
 #include "extensions/buildflags/buildflags.h"
 #include "media/mojo/mojom/cdm_service.mojom.h"
+#include "partition_alloc/buildflags.h"
 #include "services/metrics/public/cpp/ukm_builders.h"
 #include "services/metrics/public/cpp/ukm_recorder.h"
 #include "services/metrics/public/cpp/ukm_source_id.h"

chrome/browser/metrics/process_memory_metrics_emitter_browsertest.cc

@@ -6,7 +6,6 @@
 
 #include <set>
 
-#include "base/allocator/partition_allocator/src/partition_alloc/buildflags.h"
 #include "base/feature_list.h"
 #include "base/memory/raw_ptr.h"
 #include "base/memory/ref_counted.h"
@@ -33,6 +32,7 @@
 #include "content/public/test/test_utils.h"
 #include "extensions/buildflags/buildflags.h"
 #include "net/dns/mock_host_resolver.h"
+#include "partition_alloc/buildflags.h"
 #include "services/metrics/public/cpp/ukm_builders.h"
 #include "services/metrics/public/cpp/ukm_source.h"
 #include "services/network/public/cpp/features.h"

chrome/browser/profiling_host/memlog_browsertest.cc

@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/allocator/partition_allocator/src/partition_alloc/buildflags.h"
 #include "build/build_config.h"
 #include "chrome/browser/profiling_host/profiling_process_host.h"
 #include "chrome/common/chrome_switches.h"
@@ -10,6 +9,7 @@
 #include "components/services/heap_profiling/public/cpp/settings.h"
 #include "components/services/heap_profiling/public/cpp/switches.h"
 #include "content/public/test/browser_test.h"
+#include "partition_alloc/buildflags.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if BUILDFLAG(IS_ANDROID)

chrome/browser/ui/webui/memory_internals_ui.cc

@@ -10,7 +10,6 @@
 #include <utility>
 #include <vector>
 
-#include "base/allocator/partition_allocator/src/partition_alloc/buildflags.h"
 #include "base/check.h"
 #include "base/functional/bind.h"
 #include "base/functional/callback.h"
@@ -45,6 +44,7 @@
 #include "content/public/browser/web_ui_message_handler.h"
 #include "content/public/common/process_type.h"
 #include "mojo/public/cpp/system/platform_handle.h"
+#include "partition_alloc/buildflags.h"
 #include "ui/shell_dialogs/select_file_dialog.h"
 #include "ui/shell_dialogs/select_file_policy.h"
 #include "ui/shell_dialogs/selected_file_info.h"

chrome/installer/setup/memory_unittest.cc

@@ -8,8 +8,8 @@
 
 #include <limits>
 
-#include "base/allocator/partition_allocator/src/partition_alloc/buildflags.h"
 #include "build/build_config.h"
+#include "partition_alloc/buildflags.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if BUILDFLAG(IS_MAC)

chromeos/ash/components/memory/userspace_swap/userspace_swap.cc

@@ -13,10 +13,6 @@
 #include <set>
 #include <vector>
 
-#include "base/allocator/partition_allocator/src/partition_alloc/address_pool_manager.h"
-#include "base/allocator/partition_allocator/src/partition_alloc/buildflags.h"
-#include "base/allocator/partition_allocator/src/partition_alloc/partition_address_space.h"
-#include "base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h"
 #include "base/feature_list.h"
 #include "base/files/file_util.h"
 #include "base/memory/page_size.h"
@@ -34,6 +30,10 @@
 #include "chromeos/ash/components/memory/userspace_swap/userspace_swap.mojom-forward.h"
 #include "chromeos/ash/components/memory/userspace_swap/userspace_swap.mojom.h"
 #include "mojo/public/cpp/bindings/remote.h"
+#include "partition_alloc/address_pool_manager.h"
+#include "partition_alloc/buildflags.h"
+#include "partition_alloc/partition_address_space.h"
+#include "partition_alloc/partition_alloc_constants.h"
 #include "services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h"
 #include "third_party/abseil-cpp/absl/utility/utility.h"
 

chromeos/ash/components/memory/userspace_swap/userspace_swap_unittest.cc

@@ -7,17 +7,17 @@
 #include <string>
 #include <vector>
 
-#include "base/allocator/partition_allocator/src/partition_alloc/buildflags.h"
-#include "base/allocator/partition_allocator/src/partition_alloc/page_allocator_constants.h"
 #include "base/rand_util.h"
 #include "build/build_config.h"
 #include "chromeos/ash/components/memory/userspace_swap/region.h"
+#include "partition_alloc/buildflags.h"
+#include "partition_alloc/page_allocator_constants.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if PA_BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC)
-#include "base/allocator/partition_allocator/src/partition_alloc/page_allocator.h"
-#include "base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h"
+#include "partition_alloc/page_allocator.h"
+#include "partition_alloc/partition_alloc_constants.h"
 #endif
 
 namespace ash {

components/crash/core/app/breakpad_linux.cc

@@ -26,7 +26,6 @@
 #include <string>
 #include <tuple>
 
-#include "base/allocator/partition_allocator/src/partition_alloc/oom.h"
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/containers/span.h"
@@ -49,6 +48,7 @@
 #include "components/crash/core/app/crash_reporter_client.h"
 #include "components/crash/core/common/crash_keys.h"
 #include "content/public/common/content_descriptors.h"
+#include "partition_alloc/oom.h"
 #include "third_party/breakpad/breakpad/src/client/linux/crash_generation/crash_generation_client.h"
 #include "third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h"
 #include "third_party/breakpad/breakpad/src/client/linux/minidump_writer/directory_reader.h"

components/crash/core/app/crashpad_android.cc

@@ -13,8 +13,6 @@
 #include <algorithm>
 #include <string_view>
 
-#include "base/allocator/partition_allocator/src/partition_alloc/buildflags.h"
-#include "base/allocator/partition_allocator/src/partition_alloc/tagging.h"
 #include "base/android/build_info.h"
 #include "base/android/java_exception_reporter.h"
 #include "base/android/jni_android.h"
@@ -36,6 +34,8 @@
 #include "build/build_config.h"
 #include "components/crash/core/app/crash_reporter_client.h"
 #include "content/public/common/content_descriptors.h"
+#include "partition_alloc/buildflags.h"
+#include "partition_alloc/tagging.h"
 #include "sandbox/linux/services/syscall_wrappers.h"
 #include "third_party/crashpad/crashpad/client/annotation.h"
 #include "third_party/crashpad/crashpad/client/client_argv_handling.h"

components/cronet/native/test/buffer_test.cc

@@ -4,13 +4,13 @@
 
 #include <limits>
 
-#include "base/allocator/partition_allocator/src/partition_alloc/buildflags.h"
 #include "base/check.h"
 #include "base/run_loop.h"
 #include "base/test/task_environment.h"
 #include "build/build_config.h"
 #include "components/cronet/native/test/test_util.h"
 #include "cronet_c.h"
+#include "partition_alloc/buildflags.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {

components/gwp_asan/client/guarded_page_allocator.cc

@@ -11,8 +11,6 @@
 #include <utility>
 
 #include "base/allocator/buildflags.h"
-#include "base/allocator/partition_allocator/src/partition_alloc/buildflags.h"
-#include "base/allocator/partition_allocator/src/partition_alloc/gwp_asan_support.h"
 #include "base/bits.h"
 #include "base/logging.h"
 #include "base/memory/page_size.h"
@@ -27,6 +25,8 @@
 #include "components/gwp_asan/common/allocator_state.h"
 #include "components/gwp_asan/common/crash_key_name.h"
 #include "components/gwp_asan/common/pack_stack_trace.h"
+#include "partition_alloc/buildflags.h"
+#include "partition_alloc/gwp_asan_support.h"
 #include "third_party/boringssl/src/include/openssl/rand.h"
 
 #if BUILDFLAG(IS_ANDROID)

components/gwp_asan/client/gwp_asan.cc

@@ -12,7 +12,6 @@
 #include <string_view>
 
 #include "base/allocator/partition_alloc_support.h"
-#include "base/allocator/partition_allocator/src/partition_alloc/buildflags.h"
 #include "base/containers/flat_set.h"
 #include "base/debug/crash_logging.h"
 #include "base/feature_list.h"
@@ -31,6 +30,7 @@
 #include "components/gwp_asan/client/lightweight_detector/poison_metadata_recorder.h"
 #include "components/gwp_asan/client/sampling_helpers.h"
 #include "components/gwp_asan/common/crash_key_name.h"
+#include "partition_alloc/buildflags.h"
 
 #if PA_BUILDFLAG(USE_ALLOCATOR_SHIM)
 #include "components/gwp_asan/client/lightweight_detector/malloc_shims.h"

components/gwp_asan/client/lightweight_detector/malloc_shims.cc

@@ -7,13 +7,13 @@
 #include <limits>
 #include <optional>
 
-#include "base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim.h"
 #include "base/check_op.h"
 #include "base/compiler_specific.h"
 #include "base/notreached.h"
 #include "base/numerics/checked_math.h"
 #include "components/gwp_asan/client/lightweight_detector/random_eviction_quarantine.h"
 #include "components/gwp_asan/client/sampling_state.h"
+#include "partition_alloc/shim/allocator_shim.h"
 
 namespace gwp_asan::internal::lud {
 

components/gwp_asan/client/lightweight_detector/malloc_shims_unittest.cc

@@ -2,9 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/gwp_asan/client/lightweight_detector/random_eviction_quarantine.h"
-
-#include "base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim.h"
 #include "base/logging.h"
 #include "base/memory/raw_ptr.h"
 #include "base/test/multiprocess_test.h"
@@ -15,7 +12,9 @@
 #include "components/crash/core/common/crash_key.h"
 #include "components/gwp_asan/client/lightweight_detector/partitionalloc_shims.h"
 #include "components/gwp_asan/client/lightweight_detector/poison_metadata_recorder.h"
+#include "components/gwp_asan/client/lightweight_detector/random_eviction_quarantine.h"
 #include "components/gwp_asan/common/lightweight_detector_state.h"
+#include "partition_alloc/shim/allocator_shim.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/multiprocess_func_list.h"
 

components/gwp_asan/client/lightweight_detector/partitionalloc_shims.cc

@@ -4,8 +4,8 @@
 
 #include "components/gwp_asan/client/lightweight_detector/partitionalloc_shims.h"
 
-#include "base/allocator/partition_allocator/src/partition_alloc/partition_alloc.h"
 #include "components/gwp_asan/client/lightweight_detector/poison_metadata_recorder.h"
+#include "partition_alloc/partition_alloc.h"
 
 namespace gwp_asan::internal::lud {
 

components/gwp_asan/client/lightweight_detector/partitionalloc_shims_unittest.cc

@@ -4,8 +4,6 @@
 
 #include "components/gwp_asan/client/lightweight_detector/partitionalloc_shims.h"
 
-#include "base/allocator/partition_allocator/src/partition_alloc/buildflags.h"
-#include "base/allocator/partition_allocator/src/partition_alloc/partition_alloc.h"
 #include "base/logging.h"
 #include "base/memory/raw_ptr.h"
 #include "base/test/multiprocess_test.h"
@@ -13,6 +11,8 @@
 #include "components/crash/core/common/crash_key.h"
 #include "components/gwp_asan/client/lightweight_detector/poison_metadata_recorder.h"
 #include "components/gwp_asan/common/lightweight_detector_state.h"
+#include "partition_alloc/buildflags.h"
+#include "partition_alloc/partition_alloc.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/multiprocess_func_list.h"
 

components/gwp_asan/client/sampling_malloc_shims.cc

@@ -7,7 +7,6 @@
 #include <algorithm>
 #include <utility>
 
-#include "base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim.h"
 #include "base/check_op.h"
 #include "base/compiler_specific.h"
 #include "base/numerics/safe_math.h"
@@ -19,6 +18,7 @@
 #include "components/gwp_asan/client/guarded_page_allocator.h"
 #include "components/gwp_asan/client/sampling_state.h"
 #include "components/gwp_asan/common/crash_key_name.h"
+#include "partition_alloc/shim/allocator_shim.h"
 
 #if BUILDFLAG(IS_APPLE)
 #include <pthread.h>

components/gwp_asan/client/sampling_malloc_shims_unittest.cc

@@ -10,8 +10,6 @@
 #include <memory>
 #include <string>
 
-#include "base/allocator/partition_allocator/src/partition_alloc/buildflags.h"
-#include "base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim.h"
 #include "base/functional/callback_helpers.h"
 #include "base/memory/page_size.h"
 #include "base/strings/string_number_conversions.h"
@@ -23,6 +21,8 @@
 #include "components/gwp_asan/client/guarded_page_allocator.h"
 #include "components/gwp_asan/client/gwp_asan.h"
 #include "components/gwp_asan/common/crash_key_name.h"
+#include "partition_alloc/buildflags.h"
+#include "partition_alloc/shim/allocator_shim.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/multiprocess_func_list.h"
 

components/gwp_asan/client/sampling_partitionalloc_shims.cc

@@ -7,13 +7,13 @@
 #include <algorithm>
 #include <utility>
 
-#include "base/allocator/partition_allocator/src/partition_alloc/flags.h"
-#include "base/allocator/partition_allocator/src/partition_alloc/partition_alloc.h"
 #include "components/crash/core/common/crash_key.h"
 #include "components/gwp_asan/client/export.h"
 #include "components/gwp_asan/client/guarded_page_allocator.h"
 #include "components/gwp_asan/client/sampling_state.h"
 #include "components/gwp_asan/common/crash_key_name.h"
+#include "partition_alloc/flags.h"
+#include "partition_alloc/partition_alloc.h"
 
 namespace gwp_asan {
 namespace internal {

components/gwp_asan/client/sampling_partitionalloc_shims_unittest.cc

@@ -11,8 +11,6 @@
 #include <set>
 #include <string>
 
-#include "base/allocator/partition_allocator/src/partition_alloc/partition_alloc.h"
-#include "base/allocator/partition_allocator/src/partition_alloc/partition_root.h"
 #include "base/functional/callback_helpers.h"
 #include "base/logging.h"
 #include "base/memory/page_size.h"
@@ -25,6 +23,8 @@
 #include "components/gwp_asan/client/guarded_page_allocator.h"
 #include "components/gwp_asan/client/gwp_asan.h"
 #include "components/gwp_asan/common/crash_key_name.h"
+#include "partition_alloc/partition_alloc.h"
+#include "partition_alloc/partition_root.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/multiprocess_func_list.h"
 

components/heap_profiling/multi_process/test_driver.cc

@@ -8,7 +8,6 @@
 #include <optional>
 #include <string>
 
-#include "base/allocator/partition_allocator/src/partition_alloc/partition_root.h"
 #include "base/command_line.h"
 #include "base/containers/contains.h"
 #include "base/files/file_path.h"
@@ -31,6 +30,7 @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/tracing_controller.h"
+#include "partition_alloc/partition_root.h"
 
 namespace heap_profiling {
 

components/heap_profiling/multi_process/test_driver.h

@@ -7,13 +7,13 @@
 
 #include <vector>
 
-#include "base/allocator/partition_allocator/src/partition_alloc/partition_alloc_for_testing.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/process/process_handle.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/values.h"
 #include "components/services/heap_profiling/public/cpp/settings.h"
 #include "components/services/heap_profiling/public/mojom/heap_profiling_client.mojom.h"
+#include "partition_alloc/partition_alloc_for_testing.h"
 
 namespace heap_profiling {
 

components/memory_system/memory_system.cc

@@ -6,7 +6,6 @@
 
 #include "base/allocator/dispatcher/dispatcher.h"
 #include "base/allocator/dispatcher/initializer.h"
-#include "base/allocator/partition_allocator/src/partition_alloc/buildflags.h"
 #include "base/debug/crash_logging.h"
 #include "base/debug/debugging_buildflags.h"
 #include "build/build_config.h"
@@ -14,6 +13,7 @@
 #include "components/memory_system/buildflags.h"
 #include "components/memory_system/memory_system_features.h"
 #include "components/memory_system/parameters.h"
+#include "partition_alloc/buildflags.h"
 #include "third_party/abseil-cpp/absl/base/attributes.h"
 
 #if BUILDFLAG(ENABLE_GWP_ASAN)
@@ -24,10 +24,10 @@
 #endif
 
 #if BUILDFLAG(IS_IOS) && PA_BUILDFLAG(USE_ALLOCATOR_SHIM)
-#include "base/allocator/partition_allocator/src/partition_alloc/shim/allocator_interception_apple.h"
-#include "base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim.h"
 #include "base/ios/ios_util.h"
 #include "base/metrics/histogram_functions.h"
+#include "partition_alloc/shim/allocator_interception_apple.h"
+#include "partition_alloc/shim/allocator_shim.h"
 #endif
 
 // HeapProfilerController's dependencies are not compiled on iOS unless

components/memory_system/memory_system_tests.cc

@@ -2,11 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/allocator/partition_allocator/src/partition_alloc/tagging.h"
 #include "base/cpu.h"
+#include "partition_alloc/tagging.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-
 namespace memory_system {
 
 // This test suite contains a check that components_browsertests starts up under

components/services/heap_profiling/public/cpp/profiling_client.cc

@@ -9,7 +9,6 @@
 #include <utility>
 #include <vector>
 
-#include "base/allocator/partition_allocator/src/partition_alloc/buildflags.h"
 #include "base/debug/stack_trace.h"
 #include "base/no_destructor.h"
 #include "base/notreached.h"
@@ -19,6 +18,7 @@
 #include "base/trace_event/malloc_dump_provider.h"
 #include "base/trace_event/memory_dump_manager.h"
 #include "build/build_config.h"
+#include "partition_alloc/buildflags.h"
 
 #if !BUILDFLAG(IS_IOS)
 #include "components/services/heap_profiling/public/cpp/heap_profiling_trace_source.h"
@@ -26,7 +26,7 @@
 
 #if BUILDFLAG(IS_APPLE) && !PA_BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && \
     PA_BUILDFLAG(USE_ALLOCATOR_SHIM)
-#include "base/allocator/partition_allocator/src/partition_alloc/shim/allocator_interception_apple.h"
+#include "partition_alloc/shim/allocator_interception_apple.h"
 #endif  // BUILDFLAG(IS_APPLE) && !PA_BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC)
         // && PA_BUILDFLAG(USE_ALLOCATOR_SHIM)
 

components/services/heap_profiling/public/cpp/settings.cc

@@ -4,13 +4,13 @@
 
 #include "components/services/heap_profiling/public/cpp/settings.h"
 
-#include "base/allocator/partition_allocator/src/partition_alloc/buildflags.h"
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/feature_list.h"
 #include "base/metrics/field_trial_params.h"
 #include "base/strings/string_number_conversions.h"
 #include "components/services/heap_profiling/public/cpp/switches.h"
+#include "partition_alloc/buildflags.h"
 
 namespace heap_profiling {
 

components/services/heap_profiling/public/cpp/switches_unittest.cc

@@ -4,11 +4,11 @@
 
 #include "components/services/heap_profiling/public/cpp/switches.h"
 
-#include "base/allocator/partition_allocator/src/partition_alloc/buildflags.h"
 #include "base/command_line.h"
 #include "base/test/scoped_command_line.h"
 #include "base/test/scoped_feature_list.h"
 #include "components/services/heap_profiling/public/cpp/settings.h"
+#include "partition_alloc/buildflags.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace heap_profiling {

content/app/content_main.cc

@@ -5,7 +5,6 @@
 #include "content/public/app/content_main.h"
 
 #include "base/allocator/partition_alloc_support.h"
-#include "base/allocator/partition_allocator/src/partition_alloc/buildflags.h"
 #include "base/at_exit.h"
 #include "base/base_switches.h"
 #include "base/command_line.h"
@@ -42,6 +41,7 @@
 #include "mojo/core/embedder/scoped_ipc_support.h"
 #include "mojo/public/cpp/platform/platform_channel.h"
 #include "mojo/public/cpp/system/dynamic_library_support.h"
+#include "partition_alloc/buildflags.h"
 #include "sandbox/policy/sandbox_type.h"
 #include "ui/base/ui_base_paths.h"
 #include "ui/base/ui_base_switches.h"
@@ -74,7 +74,7 @@
 
 #if BUILDFLAG(IS_APPLE)
 #if PA_BUILDFLAG(USE_ALLOCATOR_SHIM)
-#include "base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim.h"
+#include "partition_alloc/shim/allocator_shim.h"
 #endif
 #endif  // BUILDFLAG(IS_MAC)
 

content/browser/file_system_access/file_system_access_file_delegate_host_impl.cc

@@ -11,7 +11,6 @@
 
 #include <cstdint>
 
-#include "base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h"
 #include "base/functional/bind.h"
 #include "base/functional/callback_forward.h"
 #include "base/functional/callback_helpers.h"
@@ -25,6 +24,7 @@
 #include "content/public/browser/browser_thread.h"
 #include "mojo/public/cpp/base/big_buffer.h"
 #include "net/base/io_buffer.h"
+#include "partition_alloc/partition_alloc_constants.h"
 #include "storage/browser/file_system/file_system_context.h"
 #include "storage/browser/file_system/file_system_operation_runner.h"
 #include "storage/browser/file_system/file_system_url.h"

content/browser/web_contents/web_contents_impl.cc

@@ -16,7 +16,6 @@
 #include <utility>
 #include <vector>
 
-#include "base/allocator/partition_allocator/src/partition_alloc/buildflags.h"
 #include "base/check_op.h"
 #include "base/command_line.h"
 #include "base/containers/contains.h"
@@ -166,6 +165,7 @@
 #include "net/base/url_util.h"
 #include "net/http/http_util.h"
 #include "net/traffic_annotation/network_traffic_annotation.h"
+#include "partition_alloc/buildflags.h"
 #include "ppapi/buildflags/buildflags.h"
 #include "services/device/public/mojom/wake_lock.mojom.h"
 #include "services/network/public/cpp/request_destination.h"

content/browser/web_contents/web_contents_impl.h

@@ -16,7 +16,6 @@
 #include <utility>
 #include <vector>
 
-#include "base/allocator/partition_allocator/src/partition_alloc/buildflags.h"
 #include "base/callback_list.h"
 #include "base/containers/flat_map.h"
 #include "base/functional/callback_helpers.h"
@@ -64,6 +63,7 @@
 #include "mojo/public/cpp/bindings/remote.h"
 #include "net/base/load_states.h"
 #include "net/base/network_handle.h"
+#include "partition_alloc/buildflags.h"
 #include "ppapi/buildflags/buildflags.h"
 #include "services/device/public/mojom/geolocation_context.mojom.h"
 #include "services/network/public/mojom/fetch_api.mojom-forward.h"

content/browser/web_contents/web_contents_impl_browsertest.cc

@@ -11,7 +11,6 @@
 #include <vector>
 
 #include "base/allocator/partition_alloc_features.h"
-#include "base/allocator/partition_allocator/src/partition_alloc/buildflags.h"
 #include "base/command_line.h"
 #include "base/containers/contains.h"
 #include "base/feature_list.h"
@@ -101,6 +100,7 @@
 #include "net/dns/mock_host_resolver.h"
 #include "net/test/embedded_test_server/controllable_http_response.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
+#include "partition_alloc/buildflags.h"
 #include "services/metrics/public/cpp/ukm_builders.h"
 #include "services/network/public/cpp/client_hints.h"
 #include "services/network/public/cpp/features.h"

gin/array_buffer.cc

@@ -12,14 +12,14 @@
 #include <stddef.h>
 #include <stdlib.h>
 
-#include "base/allocator/partition_allocator/src/partition_alloc/page_allocator.h"
-#include "base/allocator/partition_allocator/src/partition_alloc/partition_alloc.h"
-#include "base/allocator/partition_allocator/src/partition_alloc/partition_root.h"
 #include "base/bits.h"
 #include "base/check_op.h"
 #include "base/no_destructor.h"
 #include "build/build_config.h"
 #include "gin/per_isolate_data.h"
+#include "partition_alloc/page_allocator.h"
+#include "partition_alloc/partition_alloc.h"
+#include "partition_alloc/partition_root.h"
 #include "v8/include/v8-initialization.h"
 
 #if BUILDFLAG(IS_POSIX)

gin/array_buffer.h

@@ -13,11 +13,11 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include "base/allocator/partition_allocator/src/partition_alloc/partition_alloc.h"
 #include "base/compiler_specific.h"
 #include "base/memory/shared_memory_mapper.h"
 #include "gin/converter.h"
 #include "gin/gin_export.h"
+#include "partition_alloc/partition_alloc.h"
 #include "v8/include/v8-array-buffer.h"
 #include "v8/include/v8-forward.h"
 

gin/public/v8_platform.h

@@ -5,13 +5,13 @@
 #ifndef GIN_PUBLIC_V8_PLATFORM_H_
 #define GIN_PUBLIC_V8_PLATFORM_H_
 
-#include "base/allocator/partition_allocator/src/partition_alloc/buildflags.h"
 #include "base/compiler_specific.h"
 #include "base/lazy_instance.h"
 #include "gin/gin_export.h"
 #include "gin/time_clamper.h"
 #include "gin/v8_platform_page_allocator.h"
 #include "gin/v8_platform_thread_isolated_allocator.h"
+#include "partition_alloc/buildflags.h"
 #include "v8/include/v8-platform.h"
 
 namespace gin {

gin/thread_isolation.cc

@@ -8,14 +8,15 @@
 
 #include <sys/mman.h>
 #include <sys/utsname.h>
+
 #include <cstddef>
 
-#include "base/allocator/partition_allocator/src/partition_alloc/thread_isolation/alignment.h"
 #include "base/check.h"
 #include "base/check_op.h"
 #include "base/memory/page_size.h"
 #include "base/metrics/histogram_functions.h"
 #include "base/no_destructor.h"
+#include "partition_alloc/thread_isolation/alignment.h"
 #include "third_party/abseil-cpp/absl/base/attributes.h"
 
 extern int pkey_alloc(unsigned int flags,

gin/thread_isolation.h

@@ -5,14 +5,14 @@
 #ifndef GIN_THREAD_ISOLATION_H_
 #define GIN_THREAD_ISOLATION_H_
 
-#include "base/allocator/partition_allocator/src/partition_alloc/buildflags.h"
+#include "partition_alloc/buildflags.h"
 
 #if PA_BUILDFLAG(ENABLE_THREAD_ISOLATION)
 
-#include "base/allocator/partition_allocator/src/partition_alloc/thread_isolation/alignment.h"
 #include "base/no_destructor.h"
 #include "gin/gin_export.h"
 #include "gin/v8_platform_thread_isolated_allocator.h"
+#include "partition_alloc/thread_isolation/alignment.h"
 
 namespace gin {
 

gin/v8_initializer.cc

@@ -15,8 +15,6 @@
 #include <utility>
 #include <vector>
 
-#include "base/allocator/partition_allocator/src/partition_alloc/page_allocator.h"
-#include "base/allocator/partition_allocator/src/partition_alloc/partition_address_space.h"
 #include "base/bits.h"
 #include "base/check.h"
 #include "base/check_op.h"
@@ -41,6 +39,8 @@
 #include "build/build_config.h"
 #include "gin/array_buffer.h"
 #include "gin/gin_features.h"
+#include "partition_alloc/page_allocator.h"
+#include "partition_alloc/partition_address_space.h"
 #include "tools/v8_context_snapshot/buildflags.h"
 #include "v8/include/v8-initialization.h"
 #include "v8/include/v8-snapshot.h"

gin/v8_platform.cc

@@ -6,7 +6,6 @@
 
 #include <algorithm>
 
-#include "base/allocator/partition_allocator/src/partition_alloc/buildflags.h"
 #include "base/bit_cast.h"
 #include "base/check_op.h"
 #include "base/debug/stack_trace.h"
@@ -29,6 +28,7 @@
 #include "gin/per_isolate_data.h"
 #include "gin/thread_isolation.h"
 #include "gin/v8_platform_thread_isolated_allocator.h"
+#include "partition_alloc/buildflags.h"
 #include "v8_platform_page_allocator.h"
 
 namespace gin {

gin/v8_platform_page_allocator.cc

@@ -9,13 +9,13 @@
 
 #include "v8_platform_page_allocator.h"
 
-#include "base/allocator/partition_allocator/src/partition_alloc/address_space_randomization.h"
-#include "base/allocator/partition_allocator/src/partition_alloc/page_allocator_constants.h"
-#include "base/allocator/partition_allocator/src/partition_alloc/random.h"
 #include "base/check_op.h"
 #include "base/cpu.h"
 #include "base/memory/page_size.h"
 #include "build/build_config.h"
+#include "partition_alloc/address_space_randomization.h"
+#include "partition_alloc/page_allocator_constants.h"
+#include "partition_alloc/random.h"
 
 namespace {
 

gin/v8_platform_page_allocator.h

@@ -5,14 +5,14 @@
 #ifndef GIN_V8_PLATFORM_PAGE_ALLOCATOR_H_
 #define GIN_V8_PLATFORM_PAGE_ALLOCATOR_H_
 
-#include "base/allocator/partition_allocator/src/partition_alloc/buildflags.h"
 #include "build/build_config.h"
 #include "build/buildflag.h"
+#include "partition_alloc/buildflags.h"
 
 #if PA_BUILDFLAG(USE_PARTITION_ALLOC)
 
-#include "base/allocator/partition_allocator/src/partition_alloc/page_allocator.h"
 #include "gin/gin_export.h"
+#include "partition_alloc/page_allocator.h"
 #include "v8/include/v8-platform.h"
 
 namespace gin {

gin/v8_platform_page_allocator_unittest.cc

@@ -13,8 +13,8 @@
 #if defined(ARCH_CPU_ARM64) && (OS_LINUX || OS_ANDROID)
 // BTI is only available for AArch64, relevant platform are Android and Linux
 
-#include "base/allocator/partition_allocator/src/partition_alloc/arm_bti_test_functions.h"
-#include "base/allocator/partition_allocator/src/partition_alloc/page_allocator_constants.h"
+#include "partition_alloc/arm_bti_test_functions.h"
+#include "partition_alloc/page_allocator_constants.h"
 #if BUILDFLAG(IS_POSIX)
 #include <signal.h>
 #include "testing/gtest/include/gtest/gtest-death-test.h"

gin/v8_platform_thread_isolated_allocator.cc

@@ -3,16 +3,17 @@
 // found in the LICENSE file.
 
 #include "gin/v8_platform_thread_isolated_allocator.h"
-#include "base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h"
-#include "base/allocator/partition_allocator/src/partition_alloc/partition_root.h"
+
+#include "partition_alloc/partition_alloc_constants.h"
+#include "partition_alloc/partition_root.h"
 
 #if PA_BUILDFLAG(ENABLE_THREAD_ISOLATION)
 
 #include <sys/mman.h>
 #include <sys/syscall.h>
 
-#include "base/allocator/partition_allocator/src/partition_alloc/thread_isolation/pkey.h"
 #include "gin/thread_isolation.h"
+#include "partition_alloc/thread_isolation/pkey.h"
 
 #if PA_BUILDFLAG(ENABLE_PKEYS)
 #else  // PA_BUILDFLAG(ENABLE_PKEYS)

gin/v8_platform_thread_isolated_allocator.h

@@ -5,7 +5,7 @@
 #ifndef GIN_V8_PLATFORM_THREAD_ISOLATED_ALLOCATOR_H_
 #define GIN_V8_PLATFORM_THREAD_ISOLATED_ALLOCATOR_H_
 
-#include "base/allocator/partition_allocator/src/partition_alloc/buildflags.h"
+#include "partition_alloc/buildflags.h"
 
 #if PA_BUILDFLAG(ENABLE_THREAD_ISOLATION)
 
@@ -13,8 +13,8 @@
 #error Not implemented for non-pkey thread isolation
 #endif  // PA_BUILDFLAG(ENABLE_PKEYS)
 
-#include "base/allocator/partition_allocator/src/partition_alloc/partition_alloc.h"
 #include "gin/gin_export.h"
+#include "partition_alloc/partition_alloc.h"
 #include "v8/include/v8-platform.h"
 
 namespace gin {

ios/chrome/app/early_pa_registration.cc

@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/allocator/early_zone_registration_apple.h"
-#include "base/allocator/partition_allocator/src/partition_alloc/buildflags.h"
+#include "partition_alloc/buildflags.h"
 
 __attribute__((constructor(0))) void InitializePartitionAlloc() {
 #if PA_BUILDFLAG(USE_PARTITION_ALLOC)

media/base/media.cc

@@ -8,7 +8,6 @@
 
 #include <limits>
 
-#include "base/allocator/partition_allocator/src/partition_alloc/buildflags.h"
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "base/no_destructor.h"
@@ -17,6 +16,7 @@
 #include "media/base/libvpx_thread_wrapper.h"
 #include "media/base/media_switches.h"
 #include "media/media_buildflags.h"
+#include "partition_alloc/buildflags.h"
 #include "third_party/libyuv/include/libyuv.h"
 
 #if BUILDFLAG(ENABLE_FFMPEG)

storage/browser/file_system/obfuscated_file_util_memory_delegate.cc

@@ -12,7 +12,6 @@
 #include <algorithm>
 #include <utility>
 
-#include "base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h"
 #include "base/files/file_util.h"
 #include "base/memory/raw_ptr.h"
 #include "base/numerics/checked_math.h"
@@ -22,6 +21,7 @@
 #include "build/build_config.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
+#include "partition_alloc/partition_alloc_constants.h"
 
 namespace {
 

third_party/DEPS

@@ -5,6 +5,7 @@ include_rules = [
   '-ipc',
   '-third_party/perfetto/include/perfetto/tracing',
   '-third_party/perfetto/include/perfetto/test',
+  '-partition_alloc',
   '-library_loaders',
   '-testing',
   '-third_party/icu/source/common/unicode',

third_party/blink/renderer/DEPS

@@ -1,6 +1,4 @@
 include_rules = [
-    "+base/allocator/partition_allocator/src/partition_alloc/oom.h",
-    "+base/allocator/partition_allocator/src/partition_alloc/partition_alloc.h",
     "+base/auto_reset.h",
     "+base/big_endian.h",
     "+base/bit_cast.h",
@@ -92,6 +90,8 @@ include_rules = [
     "+net/cookies",
     "+net/http/structured_headers.h",
     "+net/storage_access_api/status.h",
+    "+partition_alloc/oom.h",
+    "+partition_alloc/partition_alloc.h",
     "+services/network/public/mojom",
     "+skia/ext",
     "+testing/gmock/include/gmock",

third_party/blink/renderer/controller/DEPS

@@ -9,4 +9,9 @@ include_rules = [
     "+third_party/blink/renderer/modules",
     "+third_party/blink/renderer/platform",
     "+web",
+
+    # `#include "partition_alloc/..."` is prefered to
+    # `#include "base/allocator/partition_allocator/src/partition_alloc/..."`.
+    "+partition_alloc",
+    "-base/allocator/partition_allocator",
 ]

third_party/blink/renderer/controller/blink_initializer.cc

@@ -33,12 +33,12 @@
 #include <memory>
 #include <utility>
 
-#include "base/allocator/partition_allocator/src/partition_alloc/page_allocator.h"
 #include "base/command_line.h"
 #include "base/ranges/algorithm.h"
 #include "base/task/single_thread_task_runner.h"
 #include "build/build_config.h"
 #include "mojo/public/cpp/bindings/binder_map.h"
+#include "partition_alloc/page_allocator.h"
 #include "third_party/blink/public/common/features.h"
 #include "third_party/blink/public/common/switches.h"
 #include "third_party/blink/public/platform/interface_registry.h"

third_party/blink/renderer/controller/crash_memory_metrics_reporter_impl.cc

@@ -6,9 +6,9 @@
 
 #include <utility>
 
-#include "base/allocator/partition_allocator/src/partition_alloc/oom_callback.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/process/memory.h"
+#include "partition_alloc/oom_callback.h"
 #include "third_party/blink/public/platform/platform.h"
 #include "third_party/blink/renderer/platform/bindings/v8_per_isolate_data.h"
 #include "third_party/blink/renderer/platform/wtf/allocator/partitions.h"

third_party/blink/renderer/core/layout/layout_object.cc

@@ -32,7 +32,7 @@
 #include <memory>
 #include <utility>
 
-#include "base/allocator/partition_allocator/src/partition_alloc/partition_alloc.h"
+#include "partition_alloc/partition_alloc.h"
 #include "third_party/blink/public/mojom/scroll/scroll_into_view_params.mojom-blink.h"
 #include "third_party/blink/renderer/core/accessibility/ax_object_cache.h"
 #include "third_party/blink/renderer/core/animation/element_animations.h"

third_party/blink/renderer/core/paint/paint_layer.cc

@@ -46,10 +46,10 @@
 
 #include <limits>
 
-#include "base/allocator/partition_allocator/src/partition_alloc/partition_alloc.h"
 #include "base/containers/adapters.h"
 #include "build/build_config.h"
 #include "cc/input/scroll_snap_data.h"
+#include "partition_alloc/partition_alloc.h"
 #include "third_party/blink/public/platform/task_type.h"
 #include "third_party/blink/renderer/core/animation/scroll_timeline.h"
 #include "third_party/blink/renderer/core/css/css_property_names.h"

third_party/blink/renderer/core/typed_arrays/array_buffer/DEPS

@@ -1,7 +1,7 @@
 include_rules = [
-    "+base/allocator/partition_allocator/src/partition_alloc/page_allocator.h",
-    "+base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h",
     "+base/memory/page_size.h",
     "+base/memory/platform_shared_memory_region.h",
+    "+partition_alloc/page_allocator.h",
+    "+partition_alloc/partition_alloc_constants.h",
     "+gin/array_buffer.h"
 ]

third_party/blink/renderer/core/typed_arrays/array_buffer/array_buffer_contents.cc

@@ -33,10 +33,10 @@
 
 #include <cstring>
 
-#include "base/allocator/partition_allocator/src/partition_alloc/partition_alloc.h"
 #include "base/bits.h"
 #include "base/system/sys_info.h"
 #include "gin/array_buffer.h"
+#include "partition_alloc/partition_alloc.h"
 #include "third_party/blink/renderer/platform/instrumentation/instance_counters.h"
 #include "third_party/blink/renderer/platform/wtf/allocator/partitions.h"
 

third_party/blink/renderer/core/typed_arrays/array_buffer/array_buffer_contents.h

@@ -27,11 +27,11 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_TYPED_ARRAYS_ARRAY_BUFFER_ARRAY_BUFFER_CONTENTS_H_
 #define THIRD_PARTY_BLINK_RENDERER_CORE_TYPED_ARRAYS_ARRAY_BUFFER_ARRAY_BUFFER_CONTENTS_H_
 
-#include "base/allocator/partition_allocator/src/partition_alloc/page_allocator.h"
-#include "base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h"
 #include "base/containers/span.h"
 #include "base/memory/platform_shared_memory_region.h"
 #include "base/memory/scoped_refptr.h"
+#include "partition_alloc/page_allocator.h"
+#include "partition_alloc/partition_alloc_constants.h"
 #include "third_party/blink/renderer/core/core_export.h"
 #include "third_party/blink/renderer/platform/wtf/allocator/allocator.h"
 #include "third_party/blink/renderer/platform/wtf/cross_thread_copier.h"

third_party/blink/renderer/core/typed_arrays/dom_array_buffer.h

@@ -7,9 +7,9 @@
 
 #include <algorithm>
 
-#include "base/allocator/partition_allocator/src/partition_alloc/oom.h"
 #include "base/compiler_specific.h"
 #include "base/containers/span.h"
+#include "partition_alloc/oom.h"
 #include "third_party/blink/renderer/core/core_export.h"
 #include "third_party/blink/renderer/core/typed_arrays/array_buffer/array_buffer_contents.h"
 #include "third_party/blink/renderer/core/typed_arrays/dom_array_buffer_base.h"

third_party/blink/renderer/core/typed_arrays/dom_shared_array_buffer.h

@@ -5,7 +5,7 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_TYPED_ARRAYS_DOM_SHARED_ARRAY_BUFFER_H_
 #define THIRD_PARTY_BLINK_RENDERER_CORE_TYPED_ARRAYS_DOM_SHARED_ARRAY_BUFFER_H_
 
-#include "base/allocator/partition_allocator/src/partition_alloc/oom.h"
+#include "partition_alloc/oom.h"
 #include "third_party/blink/renderer/core/core_export.h"
 #include "third_party/blink/renderer/core/typed_arrays/array_buffer/array_buffer_contents.h"
 #include "third_party/blink/renderer/core/typed_arrays/dom_array_buffer_base.h"

third_party/blink/renderer/modules/DEPS

@@ -65,7 +65,7 @@ specific_include_rules = {
     ],
 
     "tcp_writable_stream_wrapper.h": [
-        "+base/allocator/partition_allocator/src/partition_alloc/partition_root.h",
+        "+partition_alloc/partition_root.h",
     ],
     ".*_stream_wrapper.cc": [
         "+net/base/ip_endpoint.h",

third_party/blink/renderer/modules/direct_sockets/tcp_writable_stream_wrapper.h

@@ -5,10 +5,10 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_MODULES_DIRECT_SOCKETS_TCP_WRITABLE_STREAM_WRAPPER_H_
 #define THIRD_PARTY_BLINK_RENDERER_MODULES_DIRECT_SOCKETS_TCP_WRITABLE_STREAM_WRAPPER_H_
 
-#include "base/allocator/partition_allocator/src/partition_alloc/partition_root.h"
 #include "base/notreached.h"
 #include "mojo/public/cpp/system/data_pipe.h"
 #include "mojo/public/cpp/system/simple_watcher.h"
+#include "partition_alloc/partition_root.h"
 #include "third_party/blink/renderer/bindings/core/v8/active_script_wrappable.h"
 #include "third_party/blink/renderer/bindings/core/v8/script_promise.h"
 #include "third_party/blink/renderer/bindings/core/v8/script_promise_resolver.h"

third_party/blink/renderer/modules/mediasource/source_buffer.cc

@@ -36,10 +36,10 @@
 #include <tuple>
 #include <utility>
 
-#include "base/allocator/partition_allocator/src/partition_alloc/partition_alloc.h"
 #include "base/numerics/checked_math.h"
 #include "media/base/logging_override_if_enabled.h"
 #include "media/base/stream_parser_buffer.h"
+#include "partition_alloc/partition_alloc.h"
 #include "third_party/blink/public/platform/task_type.h"
 #include "third_party/blink/public/platform/web_source_buffer.h"
 #include "third_party/blink/renderer/bindings/core/v8/script_promise_resolver.h"

third_party/blink/renderer/modules/webgl/DEPS

@@ -1,5 +1,4 @@
 include_rules = [
-    "+base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h",
     "+device/vr/buildflags/buildflags.h",
     "+device/vr/public/mojom/vr_service.mojom-blink.h",
     "+gpu/GLES2/gl2extchromium.h",
@@ -13,6 +12,7 @@ include_rules = [
     "+media/base/wait_and_replace_sync_token_client.h",
     "+media/renderers/paint_canvas_video_renderer.h",
     "+media/video/gpu_memory_buffer_video_frame_pool.h",
+    "+partition_alloc/partition_alloc_constants.h",
     "+skia/ext",
     "+third_party/blink/renderer/modules/webcodecs",
     "+ui/gl/gpu_preference.h",

third_party/blink/renderer/modules/webtransport/outgoing_stream.cc

@@ -12,9 +12,9 @@
 #include <cstring>
 #include <utility>
 
-#include "base/allocator/partition_allocator/src/partition_alloc/partition_alloc.h"
 #include "base/numerics/safe_conversions.h"
 #include "mojo/public/cpp/system/simple_watcher.h"
+#include "partition_alloc/partition_alloc.h"
 #include "third_party/blink/renderer/bindings/core/v8/script_promise_resolver.h"
 #include "third_party/blink/renderer/bindings/core/v8/v8_binding_for_core.h"
 #include "third_party/blink/renderer/bindings/core/v8/v8_throw_dom_exception.h"

third_party/blink/renderer/platform/DEPS

@@ -2,7 +2,6 @@ include_rules = [
     # To only allow a subset of base/ in Blink, we explicitly list all
     # directories and files instead of writing 'base/'.
     "+base/allocator/buildflags.h",
-    "+base/allocator/partition_allocator",
     "+base/android/build_info.h",
     "+base/android/sys_utils.h",
     "+base/atomic_ref_count.h",
@@ -60,6 +59,7 @@ include_rules = [
     "+net/http/http_util.h",
     "+net/http/http_request_headers.h",
     "+net/http/http_response_headers.h",
+    "+partition_alloc",
     "+services/metrics/public/cpp/metrics_utils.h",
     "+services/metrics/public/cpp/ukm_builders.h",
     "+services/metrics/public/cpp/ukm_entry_builder.h",

third_party/blink/renderer/platform/bindings/parkable_string.cc

@@ -12,8 +12,6 @@
 #include <array>
 #include <string_view>
 
-#include "base/allocator/partition_allocator/src/partition_alloc/oom.h"
-#include "base/allocator/partition_allocator/src/partition_alloc/partition_alloc.h"
 #include "base/check_op.h"
 #include "base/feature_list.h"
 #include "base/functional/bind.h"
@@ -28,6 +26,8 @@
 #include "base/time/time.h"
 #include "base/timer/elapsed_timer.h"
 #include "base/trace_event/typed_macros.h"
+#include "partition_alloc/oom.h"
+#include "partition_alloc/partition_alloc.h"
 #include "third_party/blink/public/common/features.h"
 #include "third_party/blink/public/platform/platform.h"
 #include "third_party/blink/renderer/platform/bindings/buildflags.h"

third_party/blink/renderer/platform/bindings/v8_per_isolate_data.cc

@@ -33,7 +33,6 @@
 #include <memory>
 #include <utility>
 
-#include "base/allocator/partition_allocator/src/partition_alloc/oom.h"
 #include "base/debug/crash_logging.h"
 #include "base/feature_list.h"
 #include "base/metrics/histogram_macros.h"
@@ -42,6 +41,7 @@
 #include "base/time/default_tick_clock.h"
 #include "base/trace_event/trace_event.h"
 #include "gin/public/v8_idle_task_runner.h"
+#include "partition_alloc/oom.h"
 #include "third_party/blink/public/platform/platform.h"
 #include "third_party/blink/public/web/blink.h"
 #include "third_party/blink/renderer/platform/bindings/active_script_wrappable_base.h"

third_party/blink/renderer/platform/graphics/skia/skia_utils.cc

@@ -30,19 +30,19 @@
 
 #include "third_party/blink/renderer/platform/graphics/skia/skia_utils.h"
 
-#include "base/allocator/partition_allocator/src/partition_alloc/partition_alloc.h"
+#include <algorithm>
+#include <cmath>
+
 #include "base/numerics/safe_conversions.h"
 #include "build/build_config.h"
 #include "cc/paint/paint_flags.h"
+#include "partition_alloc/partition_alloc.h"
 #include "third_party/blink/renderer/platform/graphics/graphics_context.h"
 #include "third_party/blink/renderer/platform/wtf/allocator/partitions.h"
 #include "third_party/skia/include/core/SkColorSpace.h"
 #include "third_party/skia/modules/skcms/skcms.h"
 #include "ui/base/ui_base_features.h"
 
-#include <algorithm>
-#include <cmath>
-
 namespace blink {
 
 SkBlendMode WebCoreCompositeToSkiaComposite(CompositeOperator op,

third_party/blink/renderer/platform/instrumentation/memory_pressure_listener.cc

@@ -4,12 +4,12 @@
 
 #include "third_party/blink/renderer/platform/instrumentation/memory_pressure_listener.h"
 
-#include "base/allocator/partition_allocator/src/partition_alloc/memory_reclaimer.h"
 #include "base/feature_list.h"
 #include "base/synchronization/lock.h"
 #include "base/system/sys_info.h"
 #include "base/trace_event/common/trace_event_common.h"
 #include "build/build_config.h"
+#include "partition_alloc/memory_reclaimer.h"
 #include "third_party/blink/public/common/device_memory/approximated_device_memory.h"
 #include "third_party/blink/public/common/features.h"
 #include "third_party/blink/public/web/blink.h"

third_party/blink/renderer/platform/instrumentation/partition_alloc_memory_dump_provider.cc

@@ -4,11 +4,11 @@
 
 #include "third_party/blink/renderer/platform/instrumentation/partition_alloc_memory_dump_provider.h"
 
-#include "base/allocator/partition_allocator/src/partition_alloc/partition_alloc.h"
 #include "base/format_macros.h"
 #include "base/strings/stringprintf.h"
 #include "base/trace_event/malloc_dump_provider.h"
 #include "base/trace_event/process_memory_dump.h"
+#include "partition_alloc/partition_alloc.h"
 #include "third_party/blink/renderer/platform/wtf/allocator/partitions.h"
 #include "third_party/blink/renderer/platform/wtf/text/wtf_string.h"
 

third_party/blink/renderer/platform/text/icu_error.cc

@@ -6,7 +6,7 @@
 
 #include <ostream>
 
-#include "base/allocator/partition_allocator/src/partition_alloc/oom.h"
+#include "partition_alloc/oom.h"
 
 namespace blink {
 

third_party/blink/renderer/platform/wtf/allocator/partition_allocator.cc

@@ -4,7 +4,7 @@
 
 #include "third_party/blink/renderer/platform/wtf/allocator/partition_allocator.h"
 
-#include "base/allocator/partition_allocator/src/partition_alloc/partition_alloc.h"
+#include "partition_alloc/partition_alloc.h"
 #include "third_party/blink/renderer/platform/wtf/allocator/partitions.h"
 
 namespace WTF {

third_party/blink/renderer/platform/wtf/allocator/partition_allocator.h

@@ -11,8 +11,8 @@
 
 #include <string.h>
 
-#include "base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h"
 #include "base/check_op.h"
+#include "partition_alloc/partition_alloc_constants.h"
 #include "third_party/blink/renderer/platform/wtf/allocator/allocator.h"
 #include "third_party/blink/renderer/platform/wtf/type_traits.h"
 #include "third_party/blink/renderer/platform/wtf/wtf_export.h"

third_party/blink/renderer/platform/wtf/allocator/partitions.cc

@@ -32,12 +32,6 @@
 
 #include "base/allocator/partition_alloc_features.h"
 #include "base/allocator/partition_alloc_support.h"
-#include "base/allocator/partition_allocator/src/partition_alloc/buildflags.h"
-#include "base/allocator/partition_allocator/src/partition_alloc/oom.h"
-#include "base/allocator/partition_allocator/src/partition_alloc/page_allocator.h"
-#include "base/allocator/partition_allocator/src/partition_alloc/partition_alloc.h"
-#include "base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h"
-#include "base/allocator/partition_allocator/src/partition_alloc/partition_root.h"
 #include "base/debug/alias.h"
 #include "base/feature_list.h"
 #include "base/no_destructor.h"
@@ -46,6 +40,12 @@
 #include "base/thread_annotations.h"
 #include "build/build_config.h"
 #include "components/crash/core/common/crash_key.h"
+#include "partition_alloc/buildflags.h"
+#include "partition_alloc/oom.h"
+#include "partition_alloc/page_allocator.h"
+#include "partition_alloc/partition_alloc.h"
+#include "partition_alloc/partition_alloc_constants.h"
+#include "partition_alloc/partition_root.h"
 #include "third_party/blink/renderer/platform/wtf/wtf.h"
 
 namespace WTF {

third_party/blink/renderer/platform/wtf/allocator/partitions.h

@@ -31,10 +31,10 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_WTF_ALLOCATOR_PARTITIONS_H_
 #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_WTF_ALLOCATOR_PARTITIONS_H_
 
-#include "base/allocator/partition_allocator/src/partition_alloc/partition_alloc_forward.h"
 #include "base/check.h"
 #include "base/memory/scoped_refptr.h"
 #include "base/numerics/checked_math.h"
+#include "partition_alloc/partition_alloc_forward.h"
 #include "third_party/blink/renderer/platform/wtf/wtf_export.h"
 
 namespace base {

third_party/blink/renderer/platform/wtf/allocator/partitions_test.cc

@@ -6,8 +6,8 @@
 
 #include <vector>
 
-#include "base/allocator/partition_allocator/src/partition_alloc/memory_reclaimer.h"
 #include "build/build_config.h"
+#include "partition_alloc/memory_reclaimer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace WTF {

third_party/crashpad/crashpad/test/multiprocess_exec_test.cc

@@ -14,11 +14,11 @@
 
 #include "test/multiprocess_exec.h"
 
-#include "base/allocator/partition_allocator/src/partition_alloc/buildflags.h"
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "gtest/gtest.h"
+#include "partition_alloc/buildflags.h"
 #include "test/test_paths.h"
 #include "util/file/file_io.h"
 

third_party/crashpad/crashpad/util/linux/memory_map_test.cc

@@ -20,11 +20,11 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "base/allocator/partition_allocator/src/partition_alloc/buildflags.h"
 #include "base/files/file_path.h"
 #include "base/strings/stringprintf.h"
 #include "build/build_config.h"
 #include "gtest/gtest.h"
+#include "partition_alloc/buildflags.h"
 #include "test/errors.h"
 #include "test/file.h"
 #include "test/linux/fake_ptrace_connection.h"

tools/clang/plugins/tests/base/memory/raw_ptr.h

@@ -8,6 +8,6 @@
 // Although `raw_ptr` is part of the standalone PA distribution, it is
 // easier to use the shorter path in `//base/memory`. We retain this
 // facade header for ease of typing.
-#include "base/allocator/partition_allocator/src/partition_alloc/pointers/raw_ptr.h"  // IWYU pragma: export
+#include "partition_alloc/pointers/raw_ptr.h"  // IWYU pragma: export
 
 #endif  // TOOLS_CLANG_PLUGINS_TESTS_BASE_MEMORY_RAW_PTR_H_

tools/clang/plugins/tests/base/memory/raw_ptr_cast.h

@@ -8,6 +8,6 @@
 // Although `raw_ptr` is part of the standalone PA distribution, it is
 // easier to use the shorter path in `//base/memory`. We retain this
 // facade header for ease of typing.
-#include "base/allocator/partition_allocator/src/partition_alloc/pointers/raw_ptr_cast.h"  // IWYU pragma: export
+#include "partition_alloc/pointers/raw_ptr_cast.h"  // IWYU pragma: export
 
 #endif  // TOOLS_CLANG_PLUGINS_TESTS_BASE_MEMORY_RAW_PTR_CAST_H_

tools/clang/plugins/tests/base/memory/raw_ptr_exclusion.h

@@ -8,6 +8,6 @@
 // Although `raw_ptr` is part of the standalone PA distribution, it is
 // easier to use the shorter path in `//base/memory`. We retain this
 // facade header for ease of typing.
-#include "base/allocator/partition_allocator/src/partition_alloc/pointers/raw_ptr_exclusion.h"  // IWYU pragma: export
+#include "partition_alloc/pointers/raw_ptr_exclusion.h"  // IWYU pragma: export
 
 #endif  // TOOLS_CLANG_PLUGINS_TESTS_BASE_MEMORY_RAW_PTR_EXCLUSION_H_

tools/clang/raw_ptr_plugin/tests/base/memory/raw_ptr.h

@@ -8,6 +8,6 @@
 // Although `raw_ptr` is part of the standalone PA distribution, it is
 // easier to use the shorter path in `//base/memory`. We retain this
 // facade header for ease of typing.
-#include "base/allocator/partition_allocator/src/partition_alloc/pointers/raw_ptr.h"  // IWYU pragma: export
+#include "partition_alloc/pointers/raw_ptr.h"  // IWYU pragma: export
 
 #endif  // TOOLS_CLANG_RAW_PTR_PLUGIN_TESTS_BASE_MEMORY_RAW_PTR_H_

tools/clang/raw_ptr_plugin/tests/base/memory/raw_ptr_cast.h

@@ -8,6 +8,6 @@
 // Although `raw_ptr` is part of the standalone PA distribution, it is
 // easier to use the shorter path in `//base/memory`. We retain this
 // facade header for ease of typing.
-#include "base/allocator/partition_allocator/src/partition_alloc/pointers/raw_ptr_cast.h"  // IWYU pragma: export
+#include "partition_alloc/pointers/raw_ptr_cast.h"  // IWYU pragma: export
 
 #endif  // TOOLS_CLANG_RAW_PTR_PLUGIN_TESTS_BASE_MEMORY_RAW_PTR_CAST_H_

tools/clang/raw_ptr_plugin/tests/base/memory/raw_ptr_exclusion.h

@@ -8,6 +8,6 @@
 // Although `raw_ptr` is part of the standalone PA distribution, it is
 // easier to use the shorter path in `//base/memory`. We retain this
 // facade header for ease of typing.
-#include "base/allocator/partition_allocator/src/partition_alloc/pointers/raw_ptr_exclusion.h"  // IWYU pragma: export
+#include "partition_alloc/pointers/raw_ptr_exclusion.h"  // IWYU pragma: export
 
 #endif  // TOOLS_CLANG_RAW_PTR_PLUGIN_TESTS_BASE_MEMORY_RAW_PTR_EXCLUSION_H_

tools/memory/partition_allocator/inspect_utils.cc

@@ -6,11 +6,11 @@
 
 #include <sys/mman.h>
 
-#include "base/allocator/partition_allocator/src/partition_alloc/thread_cache.h"
 #include "base/check_op.h"
 #include "base/debug/proc_maps_linux.h"
 #include "base/logging.h"
 #include "base/memory/page_size.h"
+#include "partition_alloc/thread_cache.h"
 
 namespace partition_alloc::tools {
 

tools/memory/partition_allocator/inspect_utils_linux.cc

@@ -6,13 +6,13 @@
 
 #include <sys/mman.h>
 
-#include "base/allocator/partition_allocator/src/partition_alloc/thread_cache.h"
 #include "base/check_op.h"
 #include "base/debug/proc_maps_linux.h"
 #include "base/logging.h"
 #include "base/memory/page_size.h"
 #include "base/posix/eintr_wrapper.h"
 #include "base/strings/stringprintf.h"
+#include "partition_alloc/thread_cache.h"
 
 namespace partition_alloc::tools {
 

tools/memory/partition_allocator/inspect_utils_mac.cc

@@ -9,11 +9,11 @@
 #include <mach/mach_vm.h>
 #include <sys/mman.h>
 
-#include "base/allocator/partition_allocator/src/partition_alloc/thread_cache.h"
 #include "base/check_op.h"
 #include "base/debug/proc_maps_linux.h"
 #include "base/logging.h"
 #include "base/memory/page_size.h"
+#include "partition_alloc/thread_cache.h"
 
 namespace partition_alloc::tools {
 

tools/memory/partition_allocator/pa_buckets_inspect.cc

@@ -18,8 +18,6 @@
 #include <unordered_map>
 #include <vector>
 
-#include "base/allocator/partition_allocator/src/partition_alloc/partition_root.h"
-#include "base/allocator/partition_allocator/src/partition_alloc/thread_cache.h"
 #include "base/check_op.h"
 #include "base/debug/proc_maps_linux.h"
 #include "base/files/file.h"
@@ -31,6 +29,8 @@
 #include "base/threading/platform_thread.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
+#include "partition_alloc/partition_root.h"
+#include "partition_alloc/thread_cache.h"
 #include "tools/memory/partition_allocator/inspect_utils.h"
 
 namespace partition_alloc::tools {

tools/memory/partition_allocator/pa_dump_heap.cc

@@ -13,12 +13,6 @@
 #include <optional>
 #include <string>
 
-#include "base/allocator/partition_allocator/src/partition_alloc/buildflags.h"
-#include "base/allocator/partition_allocator/src/partition_alloc/in_slot_metadata.h"
-#include "base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h"
-#include "base/allocator/partition_allocator/src/partition_alloc/partition_page.h"
-#include "base/allocator/partition_allocator/src/partition_alloc/partition_root.h"
-#include "base/allocator/partition_allocator/src/partition_alloc/thread_cache.h"
 #include "base/bits.h"
 #include "base/check.h"
 #include "base/command_line.h"
@@ -30,6 +24,12 @@
 #include "base/strings/stringprintf.h"
 #include "base/thread_annotations.h"
 #include "base/values.h"
+#include "partition_alloc/buildflags.h"
+#include "partition_alloc/in_slot_metadata.h"
+#include "partition_alloc/partition_alloc_config.h"
+#include "partition_alloc/partition_page.h"
+#include "partition_alloc/partition_root.h"
+#include "partition_alloc/thread_cache.h"
 #include "third_party/snappy/src/snappy.h"
 #include "tools/memory/partition_allocator/inspect_utils.h"
 

tools/memory/partition_allocator/pa_tcache_inspect.cc

@@ -21,9 +21,6 @@
 #include <string_view>
 #include <vector>
 
-#include "base/allocator/partition_allocator/src/partition_alloc/partition_root.h"
-#include "base/allocator/partition_allocator/src/partition_alloc/partition_stats.h"
-#include "base/allocator/partition_allocator/src/partition_alloc/thread_cache.h"
 #include "base/check_op.h"
 #include "base/command_line.h"
 #include "base/debug/proc_maps_linux.h"
@@ -42,6 +39,9 @@
 #include "base/time/time.h"
 #include "base/values.h"
 #include "build/build_config.h"
+#include "partition_alloc/partition_root.h"
+#include "partition_alloc/partition_stats.h"
+#include "partition_alloc/thread_cache.h"
 #include "tools/memory/partition_allocator/inspect_utils.h"
 
 namespace partition_alloc::tools {

tools/memory/simulator/contiguous_memory_holder.cc

@@ -6,10 +6,10 @@
 
 #include <cstdint>
 
-#include "base/allocator/partition_allocator/src/partition_alloc/page_allocator.h"
 #include "base/check_op.h"
 #include "base/debug/alias.h"
 #include "base/memory/page_size.h"
+#include "partition_alloc/page_allocator.h"
 
 namespace memory_simulator {