Removing tcmalloc from gyp so we can build a version of chrome

without tcmalloc for testing purpose. The linker complains about
_set_new_mode so I remove the call from the code for now.

Note this change is different from the change Bradley is working
on which provides an option for building chrome without tcmalloc.
This change simply removes tcmalloc from the build. The plan is
checking it in, keeping it in trunk for 24 hours, and then
reverting it. The benefits are

- Having another round of performance comparison between build
with and w/o tcmalloc.
- Having a full run of UI test under purify with tcmalloc disabled.
- Getting a verified CL in case we'd like to build an alternative
dev build w/o tcmalloc for A/B test.


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

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

3 files changed, 2 insertions, 5 deletions

diff --git a/build/all.gyp b/build/all.gyp
index 8de4152..ff888ad 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -75,7 +75,6 @@
             '../third_party/bsdiff/bsdiff.gyp:*',
             '../third_party/bspatch/bspatch.gyp:*',
             '../third_party/cld/cld.gyp:*',
-            '../third_party/tcmalloc/tcmalloc.gyp:*',
             '../tools/memory_watcher/memory_watcher.gyp:*',
             '../webkit/activex_shim/activex_shim.gyp:*',
             '../webkit/activex_shim_dll/activex_shim_dll.gyp:*',
diff --git a/chrome/app/chrome_dll_main.cc b/chrome/app/chrome_dll_main.cc
index b375474..ddf5b9f 100644
--- a/chrome/app/chrome_dll_main.cc
+++ b/chrome/app/chrome_dll_main.cc
@@ -225,8 +225,8 @@ void RegisterInvalidParamHandler() {
   _set_purecall_handler(PureCall);
   // Gather allocation failure.
   std::set_new_handler(&OnNoMemory);
-  // Also enable the new handler for malloc() based failures.
-  _set_new_mode(1);
+  // TODO: use _set_new_mode to enable the new handler for malloc() based
+  // failures.
 #endif
 }
 
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 930c848..7285d5b 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -4536,7 +4536,6 @@
             '../third_party/modp_b64/modp_b64.gyp:*',
             '../third_party/npapi/npapi.gyp:*',
             '../third_party/sqlite/sqlite.gyp:*',
-            '../third_party/tcmalloc/tcmalloc.gyp:*',
             '../third_party/zlib/zlib.gyp:*',
             '../webkit/tools/test_shell/test_shell.gyp:*',
             '../webkit/webkit.gyp:*',
@@ -4575,7 +4574,6 @@
             '../net/net.gyp:net_resources',
             '../build/util/support/support.gyp:*',
             '../third_party/cld/cld.gyp:cld',
-            '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc',
             '../views/views.gyp:views',
             '../webkit/webkit.gyp:webkit_resources',
             '../gears/gears.gyp:gears',