Add use_allocator instead of linux_use_tcmalloc to switch the allocator.

chromeos/chromeos.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,
   },
   'includes': [
     'chromeos_memory.gypi',
@@ skipping 509 matching lines @@
         'network/shill_property_handler_unittest.cc',
         'network/shill_property_util_unittest.cc',
         'process_proxy/process_output_watcher_unittest.cc',
         'process_proxy/process_proxy_unittest.cc',
         'system/name_value_pairs_parser_unittest.cc',
       ],
       'include_dirs': [
         '..',
       ],
       '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',
             ],
           },
         ],
       ],
     },
     {
       # Protobuf compiler/generator for power-manager related protocol buffers.
       'target_name': 'power_manager_proto',
       'type': 'static_library',
       'sources': [
         '../third_party/cros_system_api/dbus/power_manager/input_event.proto',
         '../third_party/cros_system_api/dbus/power_manager/peripheral_battery_status.proto',
         '../third_party/cros_system_api/dbus/power_manager/policy.proto',
         '../third_party/cros_system_api/dbus/power_manager/power_supply_properties.proto',
         '../third_party/cros_system_api/dbus/power_manager/suspend.proto',
       ],
       'variables': {
         'proto_in_dir': '../third_party/cros_system_api/dbus/power_manager',
         'proto_out_dir': 'chromeos/dbus/power_manager',
       },
       'includes': ['../build/protoc.gypi'],
     },
   ],
 }