Merge the LINUX_TC_MALLOC #define with the existing TC_MALLOC #define.

BUG=36687
TEST=about:tcmalloc, etc, works when tcmalloc is enabled on Linux.
Review URL: http://codereview.chromium.org/660118

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

4 files changed, 14 insertions, 13 deletions

diff --git a/base/base.gypi b/base/base.gypi
index 1d4b3e0..3948fe4 100644
--- a/base/base.gypi
+++ b/base/base.gypi
@@ -366,13 +366,13 @@
                 'sources/': [ ['include', '_chromeos\\.cc$'] ]
               },
             ],
-            [ 'linux_use_tcmalloc==1', {
+            [ 'linux_use_tcmalloc==0', {
                 'defines': [
-                  'LINUX_USE_TCMALLOC',
+                  'NO_TCMALLOC',
                 ],
                 'direct_dependent_settings': {
                   'defines': [
-                    'LINUX_USE_TCMALLOC',
+                    'NO_TCMALLOC',
                   ],
                 },
               },
diff --git a/base/leak_annotations.h b/base/leak_annotations.h
index f3d3677..8b5c2ad 100644
--- a/base/leak_annotations.h
+++ b/base/leak_annotations.h
@@ -5,7 +5,9 @@
 #ifndef BASE_LEAK_ANNOTATIONS_H_
 #define BASE_LEAK_ANNOTATIONS_H_
 
-#if defined(LINUX_USE_TCMALLOC)
+#include "build/build_config.h"
+
+#if defined(OS_LINUX) && defined(USE_TCMALLOC)
 
 #include "third_party/tcmalloc/chromium/src/google/heap-checker.h"
 
diff --git a/base/process_util_linux.cc b/base/process_util_linux.cc
index 29147f1..45e719c 100644
--- a/base/process_util_linux.cc
+++ b/base/process_util_linux.cc
@@ -513,8 +513,7 @@ void OnNoMemory() {
 }  // namespace
 
 extern "C" {
-
-#if !defined(LINUX_USE_TCMALLOC)
+#if !defined(USE_TCMALLOC)
 
 extern "C" {
 void* __libc_malloc(size_t size);
@@ -539,7 +538,7 @@ void* __libc_memalign(size_t alignment, size_t size);
 // for this in process_util_unittest.cc.
 //
 // If we are using tcmalloc, then the problem is moot since tcmalloc handles
-// this for us. Thus this code is in a !defined(LINUX_USE_TCMALLOC) block.
+// this for us. Thus this code is in a !defined(USE_TCMALLOC) block.
 //
 // We call the real libc functions in this code by using __libc_malloc etc.
 // Previously we tried using dlsym(RTLD_NEXT, ...) but that failed depending on
@@ -590,7 +589,7 @@ int posix_memalign(void** ptr, size_t alignment, size_t size) {
   return 0;
 }
 
-#endif  // !defined(LINUX_USE_TCMALLOC)
+#endif  // !defined(USE_TCMALLOC)
 }  // extern C
 
 void EnableTerminationOnOutOfMemory() {
diff --git a/base/process_util_unittest.cc b/base/process_util_unittest.cc
index 6ab081e..f9c0b50 100644
--- a/base/process_util_unittest.cc
+++ b/base/process_util_unittest.cc
@@ -250,7 +250,7 @@ int ProcessUtilTest::CountOpenFDsInChild() {
     NOTREACHED();
 
   file_handle_mapping_vector fd_mapping_vec;
-  fd_mapping_vec.push_back(std::pair<int,int>(fds[1], kChildPipe));
+  fd_mapping_vec.push_back(std::pair<int, int>(fds[1], kChildPipe));
   ProcessHandle handle = this->SpawnChild(L"ProcessUtilsLeakFDChildProcess",
                                           fd_mapping_vec,
                                           false);
@@ -408,11 +408,11 @@ TEST_F(ProcessUtilTest, ParseProcStatCPU) {
 // TODO(vandebo) make this work on Windows and Mac too.
 #if defined(OS_LINUX)
 
-#if defined(LINUX_USE_TCMALLOC)
+#if defined(USE_TCMALLOC)
 extern "C" {
 int tc_set_new_mode(int mode);
 }
-#endif  // defined(LINUX_USE_TCMALLOC)
+#endif  // defined(USE_TCMALLOC)
 
 class OutOfMemoryTest : public testing::Test {
  public:
@@ -427,13 +427,13 @@ class OutOfMemoryTest : public testing::Test {
     // Must call EnableTerminationOnOutOfMemory() because that is called from
     // chrome's main function and therefore hasn't been called yet.
     EnableTerminationOnOutOfMemory();
-#if defined(LINUX_USE_TCMALLOC)
+#if defined(USE_TCMALLOC)
     tc_set_new_mode(1);
   }
 
   virtual void TearDown() {
     tc_set_new_mode(0);
-#endif  // defined(LINUX_USE_TCMALLOC)
+#endif  // defined(USE_TCMALLOC)
   }
 
   void* value_;