Start refactoring Windows allocator shim in prep for hooking in generic allocator shim on 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,
@@ skipping 63 matching lines @@
   }
 }
 
 # This config is only used on Windows static release builds for the
 # allocator shim.
 if (win_use_allocator_shim) {
   source_set("allocator_shim") {
     sources = [
       "allocator_shim_win.cc",
       "allocator_shim_win.h",
+      "winheap_stubs_win.cc",
+      "winheap_stubs_win.h",
     ]
     configs += [ ":allocator_shim_define" ]
   }
 }
 
 if (use_allocator == "tcmalloc") {
   # tcmalloc currently won't compile on Android.
   source_set("tcmalloc") {
     tcmalloc_dir = "//third_party/tcmalloc/chromium"
 
@@ skipping 171 matching lines @@
       configs -= [ "//build/config/compiler:default_optimization" ]
       configs += [ "//build/config/compiler:optimize_max" ]
     }
 
     deps += [ "//base/third_party/dynamic_annotations" ]
   }
 }  # use_allocator == "tcmalloc"
 
 buildflag_header("features") {
   header = "features.h"
-  flags = [ "USE_EXPERIMENTAL_ALLOCATOR_SHIM=$use_experimental_allocator_shim" ]
+  flags = [
+    "USE_EXPERIMENTAL_ALLOCATOR_SHIM=$use_experimental_allocator_shim",
+    "ENABLE_WIN_ALLOCATOR_SHIM_TESTS=($use_experimental_allocator_shim || $win_use_allocator_shim)",
+  ]
 }
 
 if (use_experimental_allocator_shim) {
   # Used to shim malloc symbols on Android. see //base/allocator/README.md.
   config("wrap_malloc_symbols") {
     ldflags = [
       "-Wl,-wrap,calloc",
       "-Wl,-wrap,free",
       "-Wl,-wrap,malloc",
       "-Wl,-wrap,memalign",
@@ skipping 28 matching lines @@
       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" ]
     }
   }
 }