Hookup the generic heap intercept for Windows.

base/allocator/BUILD.gn

 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/buildflag_header.gni")
 import("//build/config/allocator.gni")
 import("//build/config/compiler/compiler.gni")
 
 declare_args() {
   # Provide a way to force disable debugallocation in Debug builds,
   # e.g. for profiling (it's more rare to profile Debug builds,
   # but people sometimes need to do that).
   enable_debugallocation = is_debug
 }
 
-# Allocator shim is only enabled for Release static builds.
-win_use_allocator_shim = is_win && !is_component_build && !is_debug
+# The Windows-only allocator shim is only enabled for Release static builds, and
+# is mutually exclusive with the generalized shim.
+win_use_allocator_shim = is_win && !is_component_build && !is_debug &&
+                         !use_experimental_allocator_shim
 
 # This "allocator" meta-target will forward to the default allocator according
 # to the build settings.
 group("allocator") {
   public_deps = []
   deps = []
 
   if (use_allocator == "tcmalloc") {
     deps += [ ":tcmalloc" ]
   }
@@ skipping 272 matching lines @@
     # Linux/CrOS/Android. http://crbug.com/550886 .
     configs += [ "//base:base_implementation" ]  # for BASE_EXPORT
     visibility = [ "//base:base" ]
     sources = [
       "allocator_shim.cc",
       "allocator_shim.h",
       "allocator_shim_internals.h",
       "allocator_shim_override_cpp_symbols.h",
       "allocator_shim_override_libc_symbols.h",
     ]
-    if (is_linux && use_allocator == "tcmalloc") {
+    if (is_win) {
+      sources += [
+        "allocator_shim_default_dispatch_to_winheap.cc",
+        "allocator_shim_override_ucrt_symbols_win.h",
+        "winheap_stubs_win.cc",
+        "winheap_stubs_win.h",
+      ]
+    } else if (is_linux && use_allocator == "tcmalloc") {
       sources += [
         "allocator_shim_default_dispatch_to_tcmalloc.cc",
         "allocator_shim_override_glibc_weak_symbols.h",
       ]
       deps = [
         ":tcmalloc",
       ]
     } else if (is_linux && use_allocator == "none") {
       sources += [ "allocator_shim_default_dispatch_to_glibc.cc" ]
     } else if (is_android && use_allocator == "none") {
       sources += [
         "allocator_shim_default_dispatch_to_linker_wrapped_symbols.cc",
         "allocator_shim_override_linker_wrapped_symbols.h",
       ]
       all_dependent_configs = [ ":wrap_malloc_symbols" ]
     }
   }
 }