diff --git a/ash/ash.gyp b/ash/ash.gyp index 3592dbbeee5e01..1cd7748532d7b2 100644 --- a/ash/ash.gyp +++ b/ash/ash.gyp @@ -1063,8 +1063,7 @@ ['exclude', 'display/resolution_notification_controller_unittest.cc'], ], }], - # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554 - ['OS=="linux" and component=="shared_library" and ((use_allocator!="none" and use_allocator!="see_use_tcmalloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1))', { + ['OS=="linux" and component=="shared_library" and use_allocator!="none"', { 'dependencies': [ '<(DEPTH)/base/allocator/allocator.gyp:allocator', ], diff --git a/base/base.gyp b/base/base.gyp index e8b7d305ba4c1c..85f0a947db2bcb 100644 --- a/base/base.gyp +++ b/base/base.gyp @@ -143,8 +143,7 @@ ], }, 'conditions': [ - # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554 - ['use_allocator!="tcmalloc" and (use_allocator!="see_use_tcmalloc" or linux_use_tcmalloc==0)', { + ['use_allocator!="tcmalloc"', { 'defines': [ 'NO_TCMALLOC', ], @@ -700,8 +699,7 @@ 'message_loop/message_pump_glib_unittest.cc', ] }], - # 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))', { + ['OS == "linux" and use_allocator!="none"', { 'dependencies': [ 'allocator/allocator.gyp:allocator', ], diff --git a/build/common.gypi b/build/common.gypi index efb80636622667..def3eaf76e2355 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -820,10 +820,7 @@ ['OS=="linux" and target_arch=="arm" and chromeos==0', { # Set some defaults for arm/linux chrome builds - # TODO(dmikurube): Change the default of use_allocator to "none". - # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554 - 'linux_use_tcmalloc%': 0, - 'use_allocator%': 'see_use_tcmalloc', + 'use_allocator%': 'none', # sysroot needs to be an absolute path otherwise it generates # incorrect results when passed to pkg-config 'sysroot%': '