| Index: media/media.gyp
|
| diff --git a/media/media.gyp b/media/media.gyp
|
| index 557ebaa51550666b4105b4a5804210701cc87cde..2ae5d654da790fdc65067718ec8a315ffc84c0c0 100644
|
| --- a/media/media.gyp
|
| +++ b/media/media.gyp
|
| @@ -1104,8 +1104,7 @@
|
| }],
|
| ['os_posix==1 and OS!="mac"', {
|
| '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',
|
| ],
|
| @@ -1691,8 +1690,7 @@
|
| 'conditions': [
|
| ['os_posix==1 and OS!="mac"', {
|
| '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',
|
| ],
|
|
|