Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / wtf / wtf_tests.gyp

diff --git a/src/third_party/WebKit/Source/wtf/wtf_tests.gyp b/src/third_party/WebKit/Source/wtf/wtf_tests.gyp
index 324f623..2410a5a 100644 (file)
--- a/src/third_party/WebKit/Source/wtf/wtf_tests.gyp
+++ b/src/third_party/WebKit/Source/wtf/wtf_tests.gyp
@@ -46,8 +46,7 @@
       # Disable c4267 warnings until we fix size_t to int truncations.
       'msvs_disabled_warnings': [4127, 4510, 4512, 4610, 4706, 4068, 4267],
       'conditions': [
-        # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
-        ['os_posix==1 and OS!="mac" and OS!="android" and OS!="ios" and ((use_allocator!="none" and use_allocator!="see_use_tcmalloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1))', {
+        ['os_posix==1 and OS!="mac" and OS!="android" and OS!="ios" and use_allocator!="none"', {
           'dependencies': [
             '<(DEPTH)/base/base.gyp:base',
             '<(DEPTH)/base/allocator/allocator.gyp:allocator',