Add use_allocator instead of linux_use_tcmalloc to switch the allocator.

components/nacl.gyp

 # Copyright 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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'includes': [
     'nacl/nacl_defines.gypi',
@@ skipping 215 matching lines @@
                     '../build/linux/system.gyp:gtk',
                   ],
                 }],
                 ['use_glib == 1', {
                   'dependencies': [
                     '../build/linux/system.gyp:glib',
                   ],
                 }],
                 ['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',
                       ],
                     }],
                   ],
                 }],
                 ['use_seccomp_bpf == 0', {
                   'sources!': [
                     '../content/common/sandbox_linux/sandbox_bpf_base_policy_linux.cc',
                     '../content/common/sandbox_linux/sandbox_init_linux.cc',
@@ skipping 147 matching lines @@
         'nacl/common/nacl_types.h',
         'nacl/common/pnacl_types.cc',
         'nacl/common/pnacl_types.h',
       ],
       'include_dirs': [
         '..',
       ],
     },
   ]
 }