Revert 31765 - Experiment: enable TCMalloc on Linux by default....

base/base.gyp

Index: base/base.gyp
===================================================================
--- base/base.gyp	(revision 31768)
+++ base/base.gyp	(working copy)
@@ -379,13 +379,31 @@
         [ 'OS == "linux" or OS == "freebsd"', {
             'sources/': [ ['exclude', '_(mac|win|chromeos)\\.cc$'],
                           ['exclude', '\\.mm?$' ] ],
+            'variables' : {
+              'linux_use_heapchecker%' : 0,
+            },
             'conditions': [
               [ 'chromeos==1 or toolkit_views==1', {
                   'sources/': [ ['include', '_chromeos\\.cc$'] ]
                 },
               ],
-              [ 'linux_use_tcmalloc==1', {
+              [ 'linux_use_heapchecker==1', {
                   'defines': [
+                    'LINUX_USE_HEAPCHECKER',
+                  ],
+                  'direct_dependent_settings': {
+                    'defines': [
+                      'LINUX_USE_HEAPCHECKER',
+                    ],
+                  },
+                },
+              ],
+              # linux_use_heapchecker==1 implies linux_use_tcmalloc=1.
+              [ 'linux_use_tcmalloc==1 or linux_use_heapchecker==1', {
+                  'dependencies': [
+                    '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc',
+                  ],
+                  'defines': [
                     'LINUX_USE_TCMALLOC',
                   ],
                   'direct_dependent_settings': {
@@ -666,14 +684,6 @@
             'file_version_info_unittest.cc',
             'worker_pool_linux_unittest.cc',
           ],
-          'conditions': [
-            [ 'linux_use_tcmalloc==1', {
-                'dependencies': [
-                  '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc',
-                ],
-              },
-            ],
-          ],
           'dependencies': [
             '../build/linux/system.gyp:gtk',
             '../build/linux/system.gyp:nss',