Index: chrome/chrome_tests.gypi |
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi |
index 8fd2444c82d63d2aad5c3271c46ca761ffcf9907..c2126809804a636c10374b20c2d57fb86c1b4f92 100644 |
--- a/chrome/chrome_tests.gypi |
+++ b/chrome/chrome_tests.gypi |
@@ -1865,8 +1865,7 @@ |
}], |
['os_posix == 1 and OS != "mac" and OS != "android"', { |
'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', |
], |
@@ -2133,8 +2132,7 @@ |
}], |
['os_posix == 1 and OS != "mac" and OS != "android"', { |
'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', |
], |
@@ -2642,8 +2640,7 @@ |
}], |
['os_posix == 1 and OS != "mac" and OS != "android"', { |
'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', |
], |