Add use_allocator instead of linux_use_tcmalloc to switch the allocator.

build/common.gypi

 # Copyright (c) 2012 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.
 
 # IMPORTANT:
 # Please don't directly include this file if you are building via gyp_chromium,
 # since gyp_chromium is automatically forcing its inclusion.
 {
   # Variables expected to be overriden on the GYP command line (-D) or by
   # ~/.gyp/include.gypi.
@@ skipping 735 matching lines @@
 
         # Do not enable the Settings App on ChromeOS.
         ['enable_app_list==1 and chromeos==0', {
           'enable_settings_app%': 1,
         }, {
           'enable_settings_app%': 0,
         }],
 
         ['OS=="linux" and target_arch=="arm" and chromeos==0', {
           # Set some defaults for arm/linux chrome builds
+          # TODO(dmikurube): Change the default of use_allocator to "none".
+          # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
           'linux_use_tcmalloc%': 0,
+          'use_allocator%': 'see_use_tcmalloc',
           # sysroot needs to be an absolute path otherwise it generates
           # incorrect results when passed to pkg-config
           'sysroot%': '<!(cd <(DEPTH) && pwd -P)/arm-sysroot',
         }], # OS=="linux" and target_arch=="arm" and chromeos==0
 
         ['OS=="linux" and branding=="Chrome" and buildtype=="Official" and chromeos==0', {
           'conditions': [
             ['target_arch=="x64"', {
               'sysroot%': '<!(cd <(DEPTH) && pwd -P)/chrome/installer/linux/debian_wheezy_amd64-sysroot',
             }],
@@ skipping 359 matching lines @@
     'linux_dump_symbols%': 0,
     # And if we want to strip the binary after dumping symbols.
     'linux_strip_binary%': 0,
     # Strip the test binaries needed for Linux reliability tests.
     'linux_strip_reliability_tests%': 0,
     # If we want stack unwind support for backtrace().
     'debug_unwind_tables%': 1,
     'release_unwind_tables%': 1,
 
     # Enable TCMalloc.
+    # TODO(dmikurube): Change the default of use_allocator to "tcmalloc".
+    # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
+    # {linux|android}_use_tcmalloc are to be replaced with use_allocator.
+    # They are now used only if use_allocator=="see_use_tcmalloc" (default).
+    # TODO(dmikurube): Assert when linux_use_tcmalloc is explicitly specified.
     'linux_use_tcmalloc%': 1,
     'android_use_tcmalloc%': 0,
+    'use_allocator%': 'see_use_tcmalloc',
 
     # Set to 1 to link against libgnome-keyring instead of using dlopen().
     'linux_link_gnome_keyring%': 0,
     # Set to 1 to link against gsettings APIs instead of using dlopen().
     'linux_link_gsettings%': 0,
 
     # Default arch variant for MIPS.
     'mips_arch_variant%': 'mips32r1',
 
     # Enable use of OpenMAX DL FFT routines.
@@ skipping 161 matching lines @@
       ['OS=="win"', {
         'windows_driver_kit_path%': '$(WDK_DIR)',
         'icu_use_data_file_flag%': 1,
       }],
       ['os_posix==1 and OS!="mac" and OS!="ios"', {
         'conditions': [
           ['target_arch=="mipsel"', {
             'werror%': '',
             'disable_nacl%': 1,
             'nacl_untrusted_build%': 0,
+            # TODO(dmikurube): Change the default of use_allocator to "none".
+            # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
             'linux_use_tcmalloc%': 0,
+            'use_allocator%': 'see_use_tcmalloc',
           }],
           ['OS=="linux" and target_arch=="mipsel"', {
             'sysroot%': '<(sysroot)',
             'CXX%': '<(CXX)',
           }],
           # All Chrome builds have breakpad symbols, but only process the
           # symbols from official builds.
           ['(branding=="Chrome" and buildtype=="Official")', {
             'linux_dump_symbols%': 1,
 
@@ skipping 144 matching lines @@
 
         # Always uses openssl.
         'use_openssl%': 1,
 
         'proprietary_codecs%': '<(proprietary_codecs)',
         'safe_browsing%': 2,
         'input_speech%': 0,
         'enable_automation%': 0,
         'java_bridge%': 1,
         'build_ffmpegsumo%': 0,
+        # TODO(dmikurube): Change the default of use_allocator to "none".
+        # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
         'linux_use_tcmalloc%': 0,
+        'use_allocator%': 'see_use_tcmalloc',
 
         # Disable Native Client.
         'disable_nacl%': 1,
 
         # Android does not support background apps.
         'enable_background%': 0,
 
         # Sessions are store separately in the Java side.
         'enable_session_service%': 0,
 
@@ skipping 374 matching lines @@
                                 '-fno-builtin -fno-optimize-sibling-calls',
 
         # MSVS flags for TSan on Pin and Windows.
         'win_debug_RuntimeChecks': '0',
         'win_debug_disable_iterator_debugging': '1',
         'win_debug_Optimization': '1',
         'win_debug_InlineFunctionExpansion': '0',
         'win_release_InlineFunctionExpansion': '0',
         'win_release_OmitFramePointers': '0',
 
-        'linux_use_tcmalloc': 1,
+        # TODO(dmikurube): Change the default of use_allocator to "tcmalloc".
+        # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
+        'linux_use_tcmalloc%': 1,
+        'use_allocator': 'see_use_tcmalloc',
         'release_valgrind_build': 1,
         'werror': '',
         'component': 'static_library',
         'use_system_zlib': 0,
       }],
 
       # Build tweaks for DrMemory.
       # TODO(rnk): Combine with tsan config to share the builder.
       # http://crbug.com/108155
       ['build_for_tool=="drmemory"', {
@@ skipping 226 matching lines @@
     'defines': [
       # Don't use deprecated V8 APIs anywhere.
       'V8_DEPRECATION_WARNINGS',
     ],
     'conditions': [
       ['(OS=="mac" or OS=="ios") and asan==1', {
         'dependencies': [
           '<(DEPTH)/build/mac/asan.gyp:asan_dynamic_runtime',
         ],
       }],
-      ['OS=="linux" and linux_use_tcmalloc==1 and clang_type_profiler==1', {
+      # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
+      ['OS=="linux" and ((use_allocator!="none" and use_allocator!="see_use_tcmalloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1)) and clang_type_profiler==1', {
         'cflags_cc!': ['-fno-rtti'],
         'cflags_cc+': [
           '-frtti',
           '-gline-tables-only',
           '-fintercept-allocation-functions',
         ],
         'defines': ['TYPE_PROFILING'],
         'dependencies': [
           '<(DEPTH)/base/allocator/allocator.gyp:type_profiler',
         ],
@@ skipping 1520 matching lines @@
                   ['_toolset=="target"', {
                     'ldflags': [
                       # Workaround for linker OOM.
                       '-Wl,--no-keep-memory',
                     ],
                   }],
                 ],
               }],
             ],
           }],
-          ['linux_use_tcmalloc==0 and android_use_tcmalloc==0', {
+          # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
+          ['(use_allocator!="tcmalloc" and (use_allocator!="see_use_tcmalloc" or linux_use_tcmalloc==0)) and android_use_tcmalloc==0', {
             'defines': ['NO_TCMALLOC'],
           }],
           ['linux_use_gold_flags==1', {
             'target_conditions': [
               ['_toolset=="target"', {
                 'ldflags': [
                   # Experimentation found that using four linking threads
                   # saved ~20% of link time.
                   # https://groups.google.com/a/chromium.org/group/chromium-dev/browse_thread/thread/281527606915bb36
                   # Only apply this to the target linker, since the host
@@ skipping 1355 matching lines @@
     # settings in target dicts.  SYMROOT is a special case, because many other
     # Xcode variables depend on it, including variables such as
     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something
     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
     # files to appear (when present) in the UI as actual files and not red
     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
     # and therefore SYMROOT, needs to be set at the project level.
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }