Index: net/net.gyp |
diff --git a/net/net.gyp b/net/net.gyp |
index 49519d4ac00a8d88af19928be65e6e6335591d44..54186d7b492b9d04da79c567840ca24c6a416dd8 100644 |
--- a/net/net.gyp |
+++ b/net/net.gyp |
@@ -533,8 +533,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', |
], |
@@ -887,8 +886,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', |
], |