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

base/process_util_unittest.cc

 // 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.
 
 #define _CRT_SECURE_NO_WARNINGS
 
 #include <limits>
 
 #include "base/command_line.h"
 #include "base/eintr_wrapper.h"
@@ skipping 232 matching lines @@
 
   return 0;
 }
 
 int ProcessUtilTest::CountOpenFDsInChild() {
   int fds[2];
   if (pipe(fds) < 0)
     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);
   CHECK(handle);
   int ret = HANDLE_EINTR(close(fds[1]));
   DPCHECK(ret == 0);
 
   // Read number of open files in client process from pipe;
   int num_open_files = -1;
   ssize_t bytes_read =
@@ skipping 137 matching lines @@
 
   EXPECT_EQ(0, ParseProcStatCPU(kSelfStat));
 }
 #endif
 
 #endif  // defined(OS_POSIX)
 
 // 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:
   OutOfMemoryTest()
       : value_(NULL),
         // Make test size as large as possible minus a few pages so
         // that alignment or other rounding doesn't make it wrap.
         test_size_(std::numeric_limits<std::size_t>::max() - 8192) {
   }
 
   virtual void SetUp() {
     // 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_;
   size_t test_size_;
 };
 
 TEST_F(OutOfMemoryTest, New) {
   ASSERT_DEATH(value_ = new char[test_size_], "");
 }
 
@@ skipping 34 matching lines @@
 TEST_F(OutOfMemoryTest, Posix_memalign) {
   // Grab the return value of posix_memalign to silence a compiler warning
   // about unused return values. We don't actually care about the return
   // value, since we're asserting death.
   ASSERT_DEATH(EXPECT_EQ(ENOMEM, posix_memalign(&value_, 8, test_size_)), "");
 }
 
 #endif  // defined(OS_LINUX)
 
 }  // namespace base