Add use_allocator instead of linux_use_tcmalloc to switch the allocator.

media/media.gyp

 # 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.
 
 {
   'variables': {
     'chromium_code': 1,
     # Override to dynamically link the cras (ChromeOS audio) library.
     'use_cras%': 0,
     # Option e.g. for Linux distributions to link pulseaudio directly
@@ skipping 1056 matching lines @@
             'USE_ALSA',
           ],
         }],
         ['use_pulseaudio==1', {
           'defines': [
             'USE_PULSEAUDIO',
           ],
         }],
         ['os_posix==1 and OS!="mac"', {
           'conditions': [
-            ['linux_use_tcmalloc==1', {
+            # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
+            ['(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',
               ],
             }],
           ],
         }],
         ['OS=="android"', {
           'sources!': [
             'audio/audio_input_volume_unittest.cc',
             'base/container_names_unittest.cc',
@@ skipping 545 matching lines @@
           'conditions': [
             ['toolkit_uses_gtk==1', {
               'dependencies': [
                 # Needed for the following #include chain:
                 #   base/run_all_unittests.cc
                 #   ../base/test_suite.h
                 #   gtk/gtk.h
                 '../build/linux/system.gyp:gtk',
               ],
               'conditions': [
-                ['linux_use_tcmalloc==1', {
+                # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
+                ['(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_name': 'ffmpeg_regression_tests',
           'type': 'executable',
           'dependencies': [
             '../base/base.gyp:test_support_base',
             '../testing/gmock.gyp:gmock',
             '../testing/gtest.gyp:gtest',
             '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
             'media',
             'media_test_support',
           ],
           'sources': [
             'base/run_all_unittests.cc',
             'ffmpeg/ffmpeg_regression_tests.cc',
             'filters/pipeline_integration_test_base.cc',
           ],
           'conditions': [
             ['os_posix==1 and OS!="mac"', {
               'conditions': [
-                ['linux_use_tcmalloc==1', {
+                # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
+                ['(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',
                   ],
                 }],
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }