| Index: ui/keyboard/keyboard.gyp
|
| diff --git a/ui/keyboard/keyboard.gyp b/ui/keyboard/keyboard.gyp
|
| index c4ca71451ef1d2a68bc7976f0c1e71eeda677ee9..e780048b3ecb4f48509782c8b0ca0931dc66de24 100644
|
| --- a/ui/keyboard/keyboard.gyp
|
| +++ b/ui/keyboard/keyboard.gyp
|
| @@ -99,8 +99,7 @@
|
| 'keyboard_controller_unittest.cc',
|
| ],
|
| 'conditions': [
|
| - # 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': [
|
| '<(DEPTH)/base/allocator/allocator.gyp:allocator',
|
| ],
|
|
|