diff --git a/build_config.h b/build_config.h
index 97b0b5aa9..7784bb628 100644
--- a/build_config.h
+++ b/build_config.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -71,11 +71,6 @@
 #define USE_TCMALLOC 1
 #endif
 
-// Use heapchecker.
-#if defined(OS_LINUX) && !defined(NO_HEAPCHECKER)
-#define USE_HEAPCHECKER 1
-#endif
-
 // Compiler detection.
 #if defined(__GNUC__)
 #define COMPILER_GCC 1
diff --git a/common.gypi b/common.gypi
index 183e5a05c..04344b642 100644
--- a/common.gypi
+++ b/common.gypi
@@ -2046,13 +2046,11 @@
           }],
           ['linux_use_heapchecker==1', {
             'variables': {'linux_use_tcmalloc%': 1},
+            'defines': ['USE_HEAPCHECKER'],
           }],
           ['linux_use_tcmalloc==0', {
             'defines': ['NO_TCMALLOC'],
           }],
-          ['linux_use_heapchecker==0', {
-            'defines': ['NO_HEAPCHECKER'],
-          }],
           ['linux_keep_shadow_stacks==1', {
             'defines': ['KEEP_SHADOW_STACKS'],
             'cflags': ['-finstrument-functions'],