allocator/Windows: delete the old non-unified allocator-shim

base/allocator/BUILD.gn

Index: base/allocator/BUILD.gn
diff --git a/base/allocator/BUILD.gn b/base/allocator/BUILD.gn
index 6ebbc1163e5c8269f4a4d045ceac500e3dfda3b9..3aa14cd32ed86267fb59517494bcfabacff3281a 100644
--- a/base/allocator/BUILD.gn
+++ b/base/allocator/BUILD.gn
@@ -13,11 +13,6 @@ declare_args() {
   enable_debugallocation = 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_allocator_shim && !is_asan
-
 # This "allocator" meta-target will forward to the default allocator according
 # to the build settings.
 group("allocator") {
@@ -27,22 +22,6 @@ group("allocator") {
   if (use_allocator == "tcmalloc") {
     deps += [ ":tcmalloc" ]
   }
-
-  if (win_use_allocator_shim) {
-    public_deps += [ ":allocator_shim" ]
-  }
-}
-
-# This config defines ALLOCATOR_SHIM in the same conditions that the allocator
-# shim will be used by the allocator target.
-#
-# TODO(brettw) this is only used in one place and is kind of mess, because it
-# assumes that the library using it will eventually be linked with
-# //base/allocator in the default way. Clean this up and delete this.
-config("allocator_shim_define") {
-  if (win_use_allocator_shim) {
-    defines = [ "ALLOCATOR_SHIM" ]
-  }
 }
 
 config("tcmalloc_flags") {
@@ -86,20 +65,6 @@ config("tcmalloc_flags") {
   }
 }
 
-# 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",

[Primiano Tucci (use gerrit), 2017/05/25 11:50:36]

this file is staying, but is already also included in base/allocator/BUILD.gn 

-      "winheap_stubs_win.h",
-    ]
-    configs += [ ":allocator_shim_define" ]
-  }
-}
-
 if (use_allocator == "tcmalloc") {
   # tcmalloc currently won't compile on Android.
   source_set("tcmalloc") {
@@ -291,10 +256,7 @@ if (use_allocator == "tcmalloc") {
 
 buildflag_header("features") {
   header = "features.h"
-  flags = [
-    "USE_ALLOCATOR_SHIM=$use_allocator_shim",
-    "ENABLE_WIN_ALLOCATOR_SHIM_TESTS=($use_allocator_shim || $win_use_allocator_shim)",
-  ]
+  flags = [ "USE_ALLOCATOR_SHIM=$use_allocator_shim" ]
 }
 
 # Used to shim malloc symbols on Android. see //base/allocator/README.md.