Index: base/base.gyp |
diff --git a/base/base.gyp b/base/base.gyp |
index 06ad10bfb3c002c8cf60ad42641111d3a104120a..901bbd5653aa881d451682e9eca23d8d4d18d597 100644 |
--- a/base/base.gyp |
+++ b/base/base.gyp |
@@ -143,8 +143,7 @@ |
], |
}, |
'conditions': [ |
- # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554 |
- ['use_allocator!="tcmalloc" and (use_allocator!="see_use_tcmalloc" or linux_use_tcmalloc==0)', { |
+ ['use_allocator!="tcmalloc"', { |
'defines': [ |
'NO_TCMALLOC', |
], |
@@ -700,8 +699,7 @@ |
'message_loop/message_pump_glib_unittest.cc', |
] |
}], |
- # 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': [ |
'allocator/allocator.gyp:allocator', |
], |