Update from https://crrev.com/316786

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/config/allocator.gni")
 
 # Only executables and not libraries should depend on the allocator target;
 # only the application (the final executable) knows what allocator makes sense.
 # This "allocator" meta-target will forward to the default allocator according
 # to the build settings.
@@ skipping 28 matching lines @@
       cpu_arch,
     ]
   }
 }
 
 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
+
     sources = [
       # Generated for our configuration from tcmalloc"s build
       # and checked in.
       "$tcmalloc_dir/src/config.h",
       "$tcmalloc_dir/src/config_android.h",
       "$tcmalloc_dir/src/config_linux.h",
       "$tcmalloc_dir/src/config_win.h",
 
       # tcmalloc native and forked files.
       "$tcmalloc_dir/src/base/abort.cc",
@@ skipping 68 matching lines @@
       "$tcmalloc_dir/src/system-alloc.cc",
       "$tcmalloc_dir/src/system-alloc.h",
 
       # #included by debugallocation_shim.cc
       #"$tcmalloc_dir/src/tcmalloc.cc",
       "$tcmalloc_dir/src/thread_cache.cc",
       "$tcmalloc_dir/src/thread_cache.h",
       "$tcmalloc_dir/src/windows/port.cc",
       "$tcmalloc_dir/src/windows/port.h",
       "allocator_shim.cc",
-      "allocator_shim.h",
       "debugallocation_shim.cc",
 
       # These are both #included by allocator_shim for maximal linking.
       #"generic_allocators.cc",
       #"win_allocator.cc",
     ]
 
     # Disable the heap checker in tcmalloc.
     defines = [ "NO_HEAP_CHECK" ]
 
@@ skipping 21 matching lines @@
         "$tcmalloc_dir/src/symbolize.h",
         "$tcmalloc_dir/src/system-alloc.cc",
         "$tcmalloc_dir/src/system-alloc.h",
 
         # included by allocator_shim.cc
         "debugallocation_shim.cc",
 
         # cpuprofiler
         "$tcmalloc_dir/src/base/thread_lister.c",
         "$tcmalloc_dir/src/base/thread_lister.h",
+        "$tcmalloc_dir/src/profile-handler.cc",
+        "$tcmalloc_dir/src/profile-handler.h",
         "$tcmalloc_dir/src/profiledata.cc",
         "$tcmalloc_dir/src/profiledata.h",
-        "$tcmalloc_dir/src/profile-handler.cc",
-        "$tcmalloc_dir/src/profile-handler.h",
         "$tcmalloc_dir/src/profiler.cc",
       ]
       defines += [ "PERFTOOLS_DLL_DECL=" ]
 
       configs -= [
         # Tcmalloc defines this itself, and we don't want duplicate definition
         # warnings.
         "//build/config/win:nominmax",
       ]
 
@@ skipping 53 matching lines @@
   visibility = [ "//base/*" ]
   sources = [
     "allocator_extension_thunks.cc",
     "allocator_extension_thunks.h",
   ]
   if (is_android && !is_debug) {
     configs -= [ "//build/config/compiler:optimize" ]
     configs += [ "//build/config/compiler:optimize_max" ]
   }
 }