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

chrome/app/chrome_exe_main_gtk.cc

Index: chrome/app/chrome_exe_main_gtk.cc
===================================================================
--- chrome/app/chrome_exe_main_gtk.cc	(revision 39977)
+++ chrome/app/chrome_exe_main_gtk.cc	(working copy)
@@ -17,12 +17,11 @@
 extern "C" {
 int ChromeMain(int argc, const char** argv);
 
-#if defined(LINUX_USE_TCMALLOC)
+#if defined(OS_LINUX) && defined(USE_TCMALLOC)
 
 int tc_set_new_mode(int mode);
 
-#endif  // defined(LINUX_USE_TCMALLOC)
-
+#endif  // defined(OS_LINUX) && defined(USE_TCMALLOC)
 }
 
 int main(int argc, const char** argv) {
@@ -35,7 +34,7 @@
   // dependency on TCMalloc.  Really, we ought to have our allocator shim code
   // implement this EnableTerminationOnOutOfMemory() function.  Whateverz.  This
   // works for now.
-#if defined(LINUX_USE_TCMALLOC)
+#if defined(OS_LINUX) && defined(USE_TCMALLOC)
   // For tcmalloc, we need to tell it to behave like new.
   tc_set_new_mode(1);
 #endif
@@ -45,9 +44,5 @@
   // keep it.
   // base::AtExitManager exit_manager;
 
-#if defined(GOOGLE_CHROME_BUILD)
-  // TODO(tc): init crash reporter
-#endif
-
   return ChromeMain(argc, argv);
 }