Add use_allocator instead of linux_use_tcmalloc to switch the allocator.

content/content_tests.gypi

 # Copyright (c) 2013 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.
 
 {
   'targets': [
     {
       'target_name': 'test_support_content',
       'type': 'static_library',
       'dependencies': [
@@ skipping 1293 matching lines @@
                 'sources/': [
                   ['exclude', '^common/gpu/media/android_video_decode_accelerator_unittest.cc'],
                 ],
               }],
               ['OS=="win"', {
                 'dependencies': [
                   '<(angle_path)/src/build_angle.gyp:libEGL',
                   '<(angle_path)/src/build_angle.gyp:libGLESv2',
                 ],
               }],
+              # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
               ['(OS=="win" and win_use_allocator_shim==1) or '
                '(os_posix == 1 and OS != "android" and '
-               ' linux_use_tcmalloc==1)', {
+               ' ((use_allocator!="none" and use_allocator!="see_use_tcmalloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1)))', {
                 'dependencies': [
                   '../base/allocator/allocator.gyp:allocator',
                 ],
               }],
               ['target_arch != "arm" and (OS=="linux" or chromeos == 1)', {
                 'include_dirs': [
                   '<(DEPTH)/third_party/libva',
                 ],
               }],
               ['use_x11==1', {
@@ skipping 376 matching lines @@
                   'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'],
                 },
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }