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

Will revert after looking at the Linux memory bot and perf cycler.
TBR=willchan

Review URL: http://codereview.chromium.org/386016

TBR=willchan@chromium.org
Review URL: http://codereview.chromium.org/384074

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31769 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 21 insertions, 27 deletions

diff --git a/base/base.gyp b/base/base.gyp
index 37ce60b..bcb88f6 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -379,12 +379,30 @@
         [ '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',
                   ],
@@ -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',
diff --git a/base/leak_annotations.h b/base/leak_annotations.h
index 7e652a5..aa57dff 100644
--- a/base/leak_annotations.h
+++ b/base/leak_annotations.h
@@ -5,7 +5,7 @@
 #ifndef BASE_LEAK_ANNOTATIONS_H_
 #define BASE_LEAK_ANNOTATIONS_H_
 
-#if defined(LINUX_USE_TCMALLOC)
+#if defined(LINUX_USE_TCMALLOC) && defined(LINUX_USE_HEAPCHECKER)
 
 #include "third_party/tcmalloc/heap-checker.h"
 
diff --git a/build/common.gypi b/build/common.gypi
index 2a3ab0e..1cc8cca 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -177,7 +177,7 @@
     'linux_strip_binary%': 0,
 
     # Enable TCMalloc.
-    'linux_use_tcmalloc%': 1,
+    'linux_use_tcmalloc%': 0,
 
     # Set to select the Title Case versions of strings in GRD files.
     'use_titlecase_in_grd_files%': 0,
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 77999f5..17fb8db 100755
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -3573,14 +3573,6 @@
               'message': 'Generating manpage'
             },
           ],
-          'conditions': [
-            [ 'linux_use_tcmalloc==1', {
-                'dependencies': [
-                  '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc',
-                ],
-              },
-            ],
-          ],
           'dependencies': [
             # On Linux, link the dependencies (libraries) that make up actual
             # Chromium functionality directly into the executable.
diff --git a/webkit/tools/test_shell/test_shell.gyp b/webkit/tools/test_shell/test_shell.gyp
index 316f9af..44a6ecb 100644
--- a/webkit/tools/test_shell/test_shell.gyp
+++ b/webkit/tools/test_shell/test_shell.gyp
@@ -290,14 +290,6 @@
           ],
         }],
         ['OS=="linux"', {
-          'conditions': [
-            [ 'linux_use_tcmalloc==1', {
-                'dependencies': [
-                  '../../../third_party/tcmalloc/tcmalloc.gyp:tcmalloc',
-                ],
-              },
-            ],
-          ],
           'dependencies': [
             '../../../build/linux/system.gyp:gtk',
             'test_shell_resources',