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

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
 }
 
-# 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") {
   public_deps = []
   deps = []
 
   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") {
   defines = []
   if (enable_debugallocation) {
     defines += [
       # Use debugallocation for Debug builds to catch problems early
       # and cleanly, http://crbug.com/30715 .
       "TCMALLOC_FOR_DEBUGALLOCATION",
     ]
@@ skipping 23 matching lines @@
     # We enable all warnings by default, but upstream disables a few.
     # Keep "-Wno-*" flags in sync with upstream by comparing against:
     # http://code.google.com/p/google-perftools/source/browse/trunk/Makefile.am
     cflags += [
       "-Wno-sign-compare",
       "-Wno-unused-result",
     ]
   }
 }
 
-# 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") {
     tcmalloc_dir = "//third_party/tcmalloc/chromium"
 
     # Don't check tcmalloc's includes. These files include various files like
     # base/foo.h and they actually refer to tcmalloc's forked copy of base
     # rather than the regular one, which confuses the header checker.
     check_includes = false
 
@@ 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_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.
 config("wrap_malloc_symbols") {
   ldflags = [
     "-Wl,-wrap,calloc",
     "-Wl,-wrap,free",
     "-Wl,-wrap,malloc",
     "-Wl,-wrap,memalign",
     "-Wl,-wrap,posix_memalign",
     "-Wl,-wrap,pvalloc",
     "-Wl,-wrap,realloc",
     "-Wl,-wrap,valloc",
   ]
 }