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

base/base.gyp

 # Copyright (c) 2009 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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'targets': [
     {
@@ skipping 361 matching lines @@
       'msvs_disabled_warnings': [
         4244, 4554, 4018, 4102,
       ],
       'mac_framework_dirs': [
         '$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framework/Frameworks',
       ],
       'conditions': [
         [ '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': {
                     'defines': [
                       'LINUX_USE_TCMALLOC',
                     ],
                   },
                 },
               ],
@@ skipping 261 matching lines @@
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
       ],
       'conditions': [
         ['OS == "linux" or OS == "freebsd"', {
           'sources/': [ ['exclude', '\\.mm?$' ] ],
           'sources!': [
             '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',
             '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
           ],
         }, {  # OS != "linux" and OS != "freebsd"
           'sources!': [
             'message_pump_glib_unittest.cc',
           ]
         }],
@@ skipping 164 matching lines @@
       ],
     }],
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: