| Index: ppapi/ppapi_tests.gypi
|
| diff --git a/ppapi/ppapi_tests.gypi b/ppapi/ppapi_tests.gypi
|
| index e6d41562f76a6bc9e13699e594147122ef704884..ab73b53870bf5be5e501675f11747d8b87af22d0 100644
|
| --- a/ppapi/ppapi_tests.gypi
|
| +++ b/ppapi/ppapi_tests.gypi
|
| @@ -126,8 +126,7 @@
|
| ],
|
| 'conditions': [
|
| # 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',
|
| ],
|
| @@ -191,8 +190,7 @@
|
| 'conditions': [
|
| [ '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',
|
| ],
|
|
|