Revert r22080 and re-enable tcmalloc.

chrome/chrome.gyp

 # 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.
 
 {
   'variables': {
     'chromium_code': 1,
     # Define the common dependencies that contain all the actual
     # Chromium functionality.  This list gets pulled in below by
     # the link of the actual chrome (or chromium) executable on
@@ skipping 4537 matching lines @@
             '../third_party/codesighs/codesighs.gyp:*',
             '../third_party/icu38/icu38.gyp:*',
             '../third_party/libjpeg/libjpeg.gyp:*',
             '../third_party/libpng/libpng.gyp:*',
             '../third_party/libxml/libxml.gyp:*',
             '../third_party/libxslt/libxslt.gyp:*',
             '../third_party/lzma_sdk/lzma_sdk.gyp:*',
             '../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:*',
 
             '../build/temp_gyp/googleurl.gyp:*',
 
             '../breakpad/breakpad.gyp:*',
             '../courgette/courgette.gyp:*',
             '../gears/gears.gyp:*',
             '../rlz/rlz.gyp:*',
@@ skipping 18 matching lines @@
             '<@(chromium_dependencies)',
             'chrome_dll_version',
             'chrome_resources',
             'installer/installer.gyp:installer_util_strings',
             'theme_dll',
             'worker',
             '../printing/printing.gyp:printing',
             '../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',
           ],
           'defines': [
             'CHROME_DLL',
             'BROWSER_DLL',
             'RENDERER_DLL',
             'PLUGIN_DLL',
           ],
@@ skipping 602 matching lines @@
               # Use outputs of this action as inputs for the main target build.
               # Seems as a misnomer but makes this happy on Linux (scons).
               'process_outputs_as_sources': 1,
             },
           ],  # 'actions'
         },
       ]
     }],
   ],  # 'conditions'
 }