Hookup the generic heap intercept for Windows.

build/config/allocator.gni

 # Copyright 2014 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/config/sanitizers/sanitizers.gni")
 
 # Temporarily disable tcmalloc on arm64 linux to get rid of compilation errors.
 if (is_android || current_cpu == "mipsel" || is_mac || is_ios || is_asan ||
     is_lsan || is_tsan || is_msan || is_win || is_syzyasan ||
     (is_linux && target_cpu == "arm64")) {
@@ skipping 14 matching lines @@
 
   # TODO(primiano): this should just become the default without having a flag,
   # but we need to get there first. http://crbug.com/550886 .
   # Causes all the allocations to be routed via allocator_shim.cc.
   use_experimental_allocator_shim = _default_use_experimental_allocator_shim
 }
 
 assert(use_allocator == "none" || use_allocator == "tcmalloc")
 
 assert(!is_win || use_allocator == "none", "Tcmalloc doesn't work on Windows.")
-assert(
-    !use_experimental_allocator_shim || is_linux || is_android,
-    "use_experimental_allocator_shim supported only on Linux and Android targets")
+
+# NaCL doesn't obey any of this configuration.
+if (!(is_win && is_nacl)) {

[Primiano Tucci (use gerrit), 2016/07/15 14:02:10]

out of cusiosity why do you need this if?

If is_win=true and is_nacl=true, the assert will succeed both when:
use_experimental_shim = false
then
use_experimental_shim = true (by virtue of having is_win == true)

[Sigurður Ásgeirsson, 2016/07/18 19:27:07]

Yeah, this is messed up. I was under the impression that is_nacl was not
mutually exclusive to is_win. This is simply not true, however there's a wrinkle
when use_experimental_shim is set with an explicit GN argument.
In that case the flag is set both for is_nacl, and is_win, which is what
confused me.
This requires either using a different variables for the argument and modulate
it's value depending whether is_win or is_nacl, or else ignoring the flag
settings when is_nacl.

+  assert(
+      !use_experimental_allocator_shim || is_linux || is_android || is_win,
+      "use_experimental_allocator_shim supported only on Linux, Android and Windows targets")
+}
+# TODO(siggi): assert that the experimental allocator is only enabled for
+#     non-component builds on Windows.