| Index: cc/cc_tests.gyp
|
| diff --git a/cc/cc_tests.gyp b/cc/cc_tests.gyp
|
| index be7145eeb49328755245032685b1f5eb4400b5e5..25fb7606924ac4b7623a1f4f68469f12d0a6a7fb 100644
|
| --- a/cc/cc_tests.gyp
|
| +++ b/cc/cc_tests.gyp
|
| @@ -268,8 +268,7 @@
|
| [ 'os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"',
|
| {
|
| 'conditions': [
|
| - # 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)',
|
| + [ 'use_allocator!="none"',
|
| {
|
| 'dependencies': [
|
| '../base/allocator/allocator.gyp:allocator',
|
| @@ -328,8 +327,7 @@
|
| }
|
| ],
|
| # See http://crbug.com/162998#c4 for why this is needed.
|
| - # 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': [
|
| '../base/allocator/allocator.gyp:allocator',
|
|
|