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

1 files changed, 5 insertions, 5 deletions

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_;