Add use_allocator instead of linux_use_tcmalloc to switch the allocator.

gpu/gles2_conform_support/gles2_conform_support.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,
     # These are defined here because we want to be able to compile them on
     # the buildbots without needed the OpenGL ES 2.0 conformance tests
     # which are not open source.
@@ skipping 103 matching lines @@
         'egl_native',
         '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../../gpu/gpu.gyp:gles2_c_lib_nocheck',
         '../../third_party/expat/expat.gyp:expat',
       ],
       'conditions': [
         ['toolkit_uses_gtk == 1', {
           'dependencies': ['../../build/linux/system.gyp:gtk'],
         }],
         # See http://crbug.com/162998#c4 for why this is needed.
-        ['OS=="linux" and linux_use_tcmalloc==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))', {
           'dependencies': [
             '../../base/allocator/allocator.gyp:allocator',
           ],
         }],
       ],
       'defines': [
         'GLES2_CONFORM_SUPPORT_ONLY',
         'GTF_GLES20',
         'EGLAPI=',
         'EGLAPIENTRY=',
       ],
       'sources': [
         '<@(bootstrap_sources_native)',
         'gles2_conform_support.c'
       ],
     },
   ],
 }